fix: BUG修改

src/assets/js/http.js

@@ -84,7 +84,7 @@ if (process.env.NODE_ENV == "development") {
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
@@ -97,7 +97,7 @@ if (process.env.NODE_ENV == "development") {
   // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
     // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
   // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-//   axios.defaults.baseURL = "http://42.180.188.17:11211/"; //鞍钢测试地址
+  axios.defaults.baseURL = "http://42.180.188.17:11211/"; //鞍钢测试地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
 } else if (process.env.NODE_ENV == "debug") {
   axios.defaults.baseURL = "https://www.ceshi.com";

src/store/index.js

@@ -52,25 +52,25 @@ export default new Vuex.Store({
     // FILEURL:'http://182.90.224.237:51234/image/',
     // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
     // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
-    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
-    WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
+    // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
     // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
     // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
     // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
     // FILEURL:'http://42.180.188.17:11211/image/',//测试
 
-    // BASEURL: baseUrl
+    BASEURL: baseUrl
-    //   ? baseUrl
+      ? baseUrl
-    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
+    UPLOADURL:
-    //   window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
+      window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
     // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
     // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
-    // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
+    WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl

src/views/projectFront/configManage/personnelAccess.vue

@@ -59,9 +59,16 @@
         </el-form-item>
         <el-form-item>
           <!--          查询-->
-          <el-button v-permission="{key: 'personnelAccess_query', menuPath: '/project/configManage/personnelAccess'}" type="primary" plain @click="query">{{
+          <el-button
-            $t("message.alarmWarning.query")
+            v-permission="{
-          }}</el-button>
+              key: 'personnelAccess_query',
+              menuPath: '/project/configManage/personnelAccess',
+            }"
+            type="primary"
+            plain
+            @click="query"
+            >{{ $t("message.alarmWarning.query") }}</el-button
+          >
 
           <!-- <el-button type="primary" info @click="filter">{{
             $t("message.alarmWarning.query")
@@ -71,9 +78,15 @@
             $t("message.alarmValueSet.refresh")
           }}</el-button>
           <!--          新增-->
-          <el-button v-permission="{key: 'personnelAccess_add', menuPath: '/project/configManage/personnelAccess'}" type="primary" @click="add">{{
+          <el-button
-            $t("message.videoManage.add")
+            v-permission="{
-          }}</el-button>
+              key: 'personnelAccess_add',
+              menuPath: '/project/configManage/personnelAccess',
+            }"
+            type="primary"
+            @click="add"
+            >{{ $t("message.videoManage.add") }}</el-button
+          >
           <!-- <el-dropdown class="screen" size="medium" @command="handleCommand">
             <el-button type="success" plain>  
               {{$t("message.videoManage.screen")}}
@@ -134,7 +147,10 @@
                   {{ $t("message.projectInfo.configCompany") }}
                 </el-button> -->
               <el-button
-              v-permission="{key: 'personnelAccess_configEnt', menuPath: '/project/configManage/personnelAccess'}"
+                v-permission="{
+                  key: 'personnelAccess_configEnt',
+                  menuPath: '/project/configManage/personnelAccess',
+                }"
                 size="mini"
                 type="primary"
                 class="operationText"
@@ -144,7 +160,10 @@
                 {{ $t("message.projectInfo.configCompany") }}
               </el-button>
               <el-button
-              v-permission="{key: 'personnelAccess_configEquip', menuPath: '/project/configManage/personnelAccess'}"
+                v-permission="{
+                  key: 'personnelAccess_configEquip',
+                  menuPath: '/project/configManage/personnelAccess',
+                }"
                 size="mini"
                 type="warning"
                 class="operationText"
@@ -154,7 +173,10 @@
                 {{ $t("message.projectInfo.configGate") }}
               </el-button>
               <el-button
-              v-permission="{key: 'personnelAccess_configVideo', menuPath: '/project/configManage/personnelAccess'}"
+                v-permission="{
+                  key: 'personnelAccess_configVideo',
+                  menuPath: '/project/configManage/personnelAccess',
+                }"
                 size="mini"
                 type="success"
                 class="operationText"
@@ -163,7 +185,14 @@
                 <!-- 配置视频 -->
                 {{ $t("message.projectInfo.configVideo") }}
               </el-button>
-              <div v-permission="{key: 'personnelAccess_edit', menuPath: '/project/configManage/personnelAccess'}" @click="edit(scope.row)" class="operationText">
+              <div
+                v-permission="{
+                  key: 'personnelAccess_edit',
+                  menuPath: '/project/configManage/personnelAccess',
+                }"
+                @click="edit(scope.row)"
+                class="operationText"
+              >
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -171,7 +200,14 @@
                 />
                 <span>{{ $t("message.alarmValueSet.edit") }}</span>
               </div>
-              <div v-permission="{key: 'personnelAccess_delete', menuPath: '/project/configManage/personnelAccess'}" @click="deleteDev(scope.row)" class="operationText">
+              <div
+                v-permission="{
+                  key: 'personnelAccess_delete',
+                  menuPath: '/project/configManage/personnelAccess',
+                }"
+                @click="deleteDev(scope.row)"
+                class="operationText"
+              >
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
@@ -362,6 +398,7 @@
             :default-expand-all="false"
             :data="treeDatas"
             show-checkbox
+            check-strictly
             node-key="id"
             :props="defaultTreeProps"
             @check-change="testCheckChange"
@@ -717,11 +754,23 @@ export default {
     //     }
     //   }
     // },
+    handleTreeCheckAllFn(arr) {
+      if (arr.children) {
+        this.handleTreeCheckAllFn(arr.children);
+      } else {
+        arr.map((item) => {
+          this.$refs.treeRef.setChecked(item.id, true, true);
+        });
+      }
+    },
     handleTreeCheckAllChange(val) {
       this.isIndeterminate = false;
       if (this.checkAll == true) {
         for (let i = 0; i < this.treeDatas.length; i++) {
           this.$refs.treeRef.setChecked(this.treeDatas[i].id, true, true);
+          if (this.treeDatas[i].children) {
+            this.handleTreeCheckAllFn(this.treeDatas[i].children);
+          }
         }
       } else {
         this.$refs.treeRef.setCheckedKeys([]);
@@ -815,7 +864,7 @@ export default {
           this.$nextTick(() => {
             this.$refs.treeRef.setCheckedKeys([]);
             arr.map((item) => {
-              this.$refs.treeRef.setChecked(this.findNodeById(item),true);
+              this.$refs.treeRef.setChecked(this.findNodeById(item), true);
             });
           });
         }
@@ -823,9 +872,12 @@ export default {
     },
     findNodeById(id) {
       function findNode(nodes, id) {
-        for(let i = 0;i<nodes.length;i++){
+        for (let i = 0; i < nodes.length; i++) {
-            if (nodes[i].id === id) {
+          if (nodes[i].id === id) {
-            return { node: nodes[i], hasChildren: !!nodes[i].children && nodes[i].children.length > 0 };
+            return {
+              node: nodes[i],
+              hasChildren: !!nodes[i].children && nodes[i].children.length > 0,
+            };
           }
           if (nodes[i].children && nodes[i].children.length > 0) {
             const found = findNode(nodes[i].children, id);
@@ -838,7 +890,7 @@ export default {
       if (!result.hasChildren) {
         return id;
       } else {
-        return ""
+        return "";
       }
     },
     // configFn(item) {

src/views/projectFront/progressManagementAg/ganttChart.vue

@@ -1018,6 +1018,7 @@ export default {
     this.searchSn = this.$store.state.projectSn;
     this.getHierarchyEnterpriseList();
     this.getPositionList();
+    this.getXzMilestoneListData();
   },
   computed: {
     dates() {