Merge branch 'main' of http://192.168.0.80:3000/aexiaoliou/project-manager

.gitignore

@@ -1 +1,2 @@
-.vscode/settings.json
+.vscode/settings.json
+h5/.env

Jenkinsfile

@@ -0,0 +1,110 @@
+/**
+* Jenkinsfile 示例代码
+* 拷贝使用要记得修改agent和steps内执行项目
+*/
+pipeline {
+    agent none
+    stages {
+        // 生产
+        // stage('prod build') {
+        //     // 当分支为master的时候执行
+        //     when {
+        //         branch 'master'
+        //         beforeAgent true // 设置 beforeAgent 为 true 来避免直接运行 docker 容器
+        //     }
+
+        //     // 自动构建项目根目录下的 Dockerfile 文件，并使用其为运行容器
+        //     agent { dockerfile true } 
+
+        //     // 一些额外的选项
+        //     options {
+        //         // 失败则重试三次
+        //         retry(3)
+        //     }
+            
+        //     steps {
+        //         // 在容器中执行 shell
+        //         sh 'composer'
+        //         // 在jenkins输出中打印信息
+        //         echo '一些有用的信息'
+        //     }
+        // }
+       
+        // 开发环境
+        stage('main build') {
+            when {
+                branch 'main'
+                beforeAgent true
+            }
+
+            // 在标签为 'test80' 的服务器上执行
+            agent { label 'devPhp80' }
+            // 复杂参数 docker
+            // agent {
+            //     docker {
+            //         label 'test80' // 使用 label 为 test80 的节点为宿主机运行docker
+            //         image 'php:7.4-cli' 
+            //         args '-d -p 13333:8080 -d -w /usr/src/app -v $PWD:/usr/src/app' // 参数
+            //     }
+            // }
+
+            steps {
+                echo 'master step执行完了'
+            }
+        }
+        //测试环境
+        stage('test build') {
+            when {
+                branch 'test'
+                beforeAgent true
+            }
+
+            // 在标签为 'test80' 的服务器上执行
+            agent { label 'devPhp80' }
+            // 复杂参数 docker
+            // agent {
+            //     docker {
+            //         label 'test80' // 使用 label 为 test80 的节点为宿主机运行docker
+            //         image 'php:7.4-cli' 
+            //         args '-d -p 13333:8080 -d -w /usr/src/app -v $PWD:/usr/src/app' // 参数
+            //     }
+            // }
+
+            steps {
+                echo '拷贝后端测试环境变量'
+                sh '''
+                    cd api 
+                    cp ./dotenv/.test.env .env
+                    cd ..
+                '''
+                echo '拷贝后台测试环境变量'
+                sh '''
+                    cd h5 
+                    cp ./dotenv/.test-on-server.env .env
+                    cd ..
+                '''
+                echo '构建前端'
+                echo 'test step执行完了'
+            }
+        }
+        // 没有when也就是任意时候都会执行
+        stage('after build') {
+            agent any // 在任何可用的代理上执行流水线或阶段，没有多节点的情况下其实就是直接执行shell啦。。
+
+            steps {
+                echo '结束了Always excecute after other stages.'
+            }
+        }
+    }
+    // 根据执行结果执行
+    post {
+        // 失败
+        failure {
+            echo 'FAILURE MESSAGE'
+        }
+        // 成功
+        success {
+            echo 'SUCCESS MESSAGE'
+        }
+    }
+}

api/app/common.php

@@ -45,7 +45,7 @@ if (!function_exists('getVirRootDir')) {
     {
         if (isset($_SERVER['HTTP_X_ORIGINAL_URI'])) {
             $url = $_SERVER['HTTP_X_ORIGINAL_URI'];
-            return preg_replace('/\\\\index\.php.*/m', '', $url);
+            return preg_replace('/\/index\.php.*/m', '', $url);
         } elseif (isset($_SERVER['SCRIPT_NAME'])) {
             $url = $_SERVER['SCRIPT_NAME'];
             $url = substr($url, 0, strripos($url, "/"));

api/app/common/service/ProjectService.php

@@ -18,12 +18,10 @@ class ProjectService extends Service
         $responsibility_person_id = $this->pg('responsibility_person_id');
         
         $create_time_begin_time = $this->pg('create_time_begin_time');
-        $create_time_end_time = $this->pg('create_time_begin_time');
-        $corret_create_end_time = $create_time_end_time ? Carbon::createFromTimeString($create_time_end_time)->endOfDay()->toDateTimeString() : null;
+        $create_time_end_time = $this->pg('create_time_end_time');
 
         $update_time_begin_time = $this->pg('update_time_begin_time');
-        $update_time_end_time = $this->pg('update_time_begin_time');
-        $corret_update_end_time = $update_time_end_time ? Carbon::createFromTimeString($update_time_end_time)->endOfDay()->toDateTimeString() : null;
+        $update_time_end_time = $this->pg('update_time_end_time');
 
         $min_amount = $this->pg('min_amount');
         $max_amount = $this->pg('max_amount');
@@ -38,8 +36,8 @@ class ProjectService extends Service
             ->like('p.name|p.source', $keyword)
             ->in('p.status', $status)
             ->eq('p.responsibility_person_id', $responsibility_person_id)
-            ->between('p.create_time', $create_time_begin_time, $corret_create_end_time)
-            ->between('p.update_time', $update_time_begin_time, $corret_update_end_time)
+            ->between('p.create_time', $create_time_begin_time, $create_time_end_time)
+            ->between('p.update_time', $update_time_begin_time, $update_time_end_time)
             ->between('p.pre_dev_time', $min_dev_time_days, $max_dev_time_days)
             ->between('p.pre_maintain_time', $min_maintain_time_days, $max_maintain_time_days)
             ->between('p.estimated_amount', $min_amount, $max_amount)

build/test/assets/Setting.e6ae2a91.css

@@ -0,0 +1 @@
+.cfg-btn{margin-right:10px}

build/test/assets/apiConfig.ff24e5e4.css

@@ -0,0 +1 @@
+.demo-date-picker[data-v-948053da]{display:flex}

build/test/assets/auth.33e842a0.js

@@ -0,0 +1,2 @@
+import{M as t,s as u,p,O as c,X as f}from"./vue.aade88c7.js";import{n as m}from"./index.f6b6c69f.js";const l=t({name:"auth"}),h=t({...l,props:{value:{type:String,default:()=>""}},setup(s){const o=s,r=m(),{userInfos:n}=u(r),a=p(()=>n.value.authBtnList.some(e=>e===o.value));return(e,d)=>a.value?c(e.$slots,"default",{key:0}):f("",!0)}});export{h as default};
+//# sourceMappingURL=auth.33e842a0.js.map

build/test/assets/authAll.831e1220.js

@@ -0,0 +1,2 @@
+import{M as e,s as u,p,O as l,X as m}from"./vue.aade88c7.js";import{n as c,p as f}from"./index.f6b6c69f.js";const d=e({name:"authAll"}),v=e({...d,props:{value:{type:Array,default:()=>[]}},setup(t){const s=t,r=c(),{userInfos:o}=u(r),a=p(()=>f(s.value,o.value.authBtnList));return(n,_)=>a.value?l(n.$slots,"default",{key:0}):m("",!0)}});export{v as default};
+//# sourceMappingURL=authAll.831e1220.js.map

build/test/assets/auths.6a9828b6.js

@@ -0,0 +1,2 @@
+import{M as s,s as p,p as l,O as m,X as c}from"./vue.aade88c7.js";import{n as d}from"./index.f6b6c69f.js";const i=s({name:"auths"}),v=s({...i,props:{value:{type:Array,default:()=>[]}},setup(a){const o=a,r=d(),{userInfos:n}=p(r),u=l(()=>{let e=!1;return n.value.authBtnList.map(t=>{o.value.map(f=>{t===f&&(e=!0)})}),e});return(e,t)=>u.value?m(e.$slots,"default",{key:0}):c("",!0)}});export{v as default};
+//# sourceMappingURL=auths.6a9828b6.js.map

build/test/assets/contextmenu.e68deed5.css

@@ -0,0 +1 @@
+.custom-contextmenu[data-v-b988030b]{transform-origin:center top;z-index:2190;position:fixed}.custom-contextmenu .el-dropdown-menu__item[data-v-b988030b]{font-size:12px!important;white-space:nowrap}.custom-contextmenu .el-dropdown-menu__item i[data-v-b988030b]{font-size:12px!important}

build/test/assets/detail.0330eef5.css

@@ -0,0 +1 @@
+.avatar-uploader .avatar[data-v-c5351a5e]{width:178px;height:178px;display:block}.avatar-uploader .el-upload[data-v-c5351a5e]{border:1px dashed var(--el-border-color);border-radius:6px;cursor:pointer;position:relative;overflow:hidden;transition:var(--el-transition-duration-fast)}.avatar-uploader .el-upload[data-v-c5351a5e]:hover{border-color:var(--el-color-primary)}.el-icon.avatar-uploader-icon[data-v-c5351a5e]{font-size:28px;color:#8c939d;width:178px;height:178px;text-align:center}

build/test/assets/details.9fff7565.js

@@ -0,0 +1,2 @@
+import{M as a,o as s,a as t,b as e}from"./vue.aade88c7.js";const o={class:"layout-padding"},i=e("div",{class:"layout-padding-auto layout-padding-view"},[e("div",{class:"w100 h100 flex"},[e("div",{class:"flex-margin color-primary"},"filtering-details 测试界面")])],-1),n=[i],l=a({name:"pagesFilteringDetails"}),p=a({...l,setup(c){return(d,r)=>(s(),t("div",o,n))}});export{p as default};
+//# sourceMappingURL=details.9fff7565.js.map

build/test/assets/details1.c054395a.js

@@ -0,0 +1,2 @@
+import{M as e,o as s,a as t,b as a}from"./vue.aade88c7.js";const o={class:"layout-padding"},i=a("div",{class:"layout-padding-auto layout-padding-view"},[a("div",{class:"w100 h100 flex"},[a("div",{class:"flex-margin color-primary"},"测试界面")])],-1),n=[i],c=e({name:"pagesFilteringDetails1"}),p=e({...c,setup(d){return(l,_)=>(s(),t("div",o,n))}});export{p as default};
+//# sourceMappingURL=details1.c054395a.js.map

build/test/assets/dialog.5926acda.css

@@ -0,0 +1 @@
+.system-role-dialog-container .menu-data-tree[data-v-f0f1c2e8]{width:100%;border:1px solid var(--el-border-color);border-radius:var(--el-input-border-radius, var(--el-border-radius-base));padding:5px}

build/test/assets/echarts.54995fe1.js

@@ -0,0 +1,2 @@
+import{E as a,aj as l,ak as s,al as t}from"./echarts.d7bccfd5.js";a([l,s]);a(t);
+//# sourceMappingURL=echarts.54995fe1.js.map