Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain

src/assets/js/api/progressManagement.js

@@ -21,6 +21,7 @@ export const editXzTaskProgressApi = data => post('xmgl/xzTaskProgress/edit', da
 export const editProgressBindComponentApi = data => post('xmgl/taskProgress/editBimComponent', data);
 export const getTaskProgressPageApi = data => post('xmgl/taskProgress/getParentChildPage', data);
 export const getXzTaskProgressPageApi = data => post('xmgl/xzTaskProgress/getParentChildPage', data);
+export const importDataApi = data => post('xmgl/xzTaskProgress/importData', data);
 
 //分部分项工程管理--BIMBASE中心进度管理
 export const addTaskProgressRtApi = data => post('xmgl/taskProgressRt/add', data);

src/views/equipmentCenter/videoManage/videoConfig.vue

@@ -1516,6 +1516,10 @@ export default {
         (res) => {
           console.log("获取视频分组列表", res);
           this.videoTreeData = res.result;
+          if (this.videoTreeData.length > 0) {
+            this.currentGroupInfo = this.videoTreeData[0];
+            this.getProjectVideoConfigList();
+          }
           this.getProjectVideoConfigList();
         }
       );
@@ -1990,7 +1994,7 @@ export default {
       // if (this.activeGroupIndex !== '') {
       //   id = this.groupList[parseInt(this.activeGroupIndex)].id
       // }
-      // console.log(id,77777777)
+      console.log(this.currentGroupInfo,77777777)
       let id = this.currentGroupInfo.id;
       this.$nextTick(() => {
         if (this.videoType === 1) {

src/views/home/login_v2.vue

@@ -1224,7 +1224,30 @@ export default {
                 if (!this.$store.state.userInfo.personMail && this.company == 'agjt' && isHaveUserCenterMenu) {
                   this.checkInfoComplete();
                 }
-                this.$router.push("/workSpace");
+                if(window.location.href.indexOf("command") != -1){
+                  // 用 split 方法取出 pathItem 参数
+                  var params = window.location.href.split('?')[1]; // 获取 ? 后面的参数部分
+                  var keyValuePairs = params.split('&'); // 通过 & 符号分割参数
+                  var pathItem;
+                  for (var i = 0; i < keyValuePairs.length; i++) {
+                      var pair = keyValuePairs[i].split('=');
+                      if (pair[0] === 'pathItem') {
+                        pathItem = decodeURIComponent(pair[1]); // 解码参数值
+                        break;
+                      }
+                  }
+
+                  console.log("22222222222222222222222222222222222222222222222222")
+                  console.log(window.location.href)
+                  console.log(pathItem)
+
+                  localStorage.setItem('lageToBackend',pathItem)
+
+                  this.$router.push("projectIndex");
+                }else{
+                  this.$router.push("/workSpace");
+                }
+                // this.$router.push("/workSpace");
               } else {
                 this.$router.push("/supplierIndex");
               }

src/views/projectAdmin/projectIndex.vue

@@ -344,6 +344,25 @@ export default {
             console.log("all111", all);
             // this.list = all;
             this.list = all.filter(item => item.plugin != 'contractors');//承包商模块不需要在后台显示，以此过滤掉该后台模块
+            
+
+            let pathItem = localStorage.getItem('lageToBackend')
+            
+            if(pathItem.length > 0){
+              localStorage.removeItem('lageToBackend')
+              let path = pathItem
+              let moduleList = this.list;
+              moduleList.map((item) => {
+                item.menuList.map((item2) => {
+                  if (item2.path == path) {
+                    this.$store.commit("setMenuList", item.menuList);
+                    this.$store.commit("setIsShowBackIndex", true);
+                  }
+                });
+              });
+              this.$router.push(path);
+            }
+
           }
         });
       } else {

src/views/projectFront/progressManagementAg/progressApproval.vue

@@ -16,7 +16,7 @@
             clearable
             @change="selectChange"
           >
-            <el-option style="height:auto" :value="[]">
+            <el-option style="height: auto" :value="[]">
               <el-tree
                 :data="treeList"
                 node-key="enterpriseId"
@@ -38,7 +38,14 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button v-permission="{key: 'jdsp_query', menuPath: '/project/progressManagementAg/progressApproval'}"  type="primary" plain @click="getWarningListData"
+          <el-button
+            v-permission="{
+              key: 'jdsp_query',
+              menuPath: '/project/progressManagementAg/progressApproval',
+            }"
+            type="primary"
+            plain
+            @click="getWarningListData"
             >查询</el-button
           >
           <el-button type="warning" plain @click="refresh">刷新</el-button>
@@ -46,7 +53,7 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <vue-scroll>
+      <vue-scroll style="height: 90%">
         <el-table class="tables" :data="tableList">
           <el-table-column
             type="index"
@@ -145,29 +152,52 @@
           <el-table-column align="center" label="操作" width="280">
             <template slot-scope="scope">
               <div class="tableBtns">
-                <div v-permission="{key: 'jdsp_edit', menuPath: '/project/progressManagementAg/progressApproval'}" @click="pass(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
+                <div
+                  v-permission="{
+                    key: 'jdsp_edit',
+                    menuPath: '/project/progressManagementAg/progressApproval',
+                  }"
+                  @click="pass(scope.row)"
+                  class="operationText"
+                  v-if="![2, 3].includes(scope.row.auditType)"
+                >
                   <img
                     src="@/assets/images/tableIcon/passIcon.png"
                     width="15px"
                     height="15px"
                   />
-                  <span style="white-space: nowrap;color: #5678E8;">通过</span>
+                  <span style="white-space: nowrap; color: #5678e8">通过</span>
                 </div>
-                <div v-permission="{key: 'jdsp_edit', menuPath: '/project/progressManagementAg/progressApproval'}" @click="openBackDialog(scope.row)" class="operationText" v-if="![2,3].includes(scope.row.auditType)">
+                <div
+                  v-permission="{
+                    key: 'jdsp_edit',
+                    menuPath: '/project/progressManagementAg/progressApproval',
+                  }"
+                  @click="openBackDialog(scope.row)"
+                  class="operationText"
+                  v-if="![2, 3].includes(scope.row.auditType)"
+                >
                   <img
                     src="@/assets/images/tableIcon/backApply.png"
                     width="15px"
                     height="15px"
                   />
-                  <span style="white-space: nowrap;color: #EA3941;">驳回</span>
+                  <span style="white-space: nowrap; color: #ea3941">驳回</span>
                 </div>
-                <div v-permission="{key: 'jdsp_delete', menuPath: '/project/progressManagementAg/progressApproval'}" @click="deleteDev(scope.row)" class="operationText">
+                <div
+                  v-permission="{
+                    key: 'jdsp_delete',
+                    menuPath: '/project/progressManagementAg/progressApproval',
+                  }"
+                  @click="deleteDev(scope.row)"
+                  class="operationText"
+                >
                   <img
                     src="@/assets/images/tableIcon/icon-delete.png"
                     width="15px"
                     height="15px"
                   />
-                  <span style="white-space: nowrap;">删除</span>
+                  <span style="white-space: nowrap">删除</span>
                 </div>
               </div>
             </template>
@@ -203,10 +233,7 @@
           :model="workerInfo"
         >
           <!-- 描述 -->
-          <el-form-item
-            label="驳回原因"
-            prop="description"
-          >
+          <el-form-item label="驳回原因" prop="description">
             <el-input
               type="textarea"
               style="width: 320px"
@@ -418,8 +445,9 @@ export default {
         projectSn: this.projectSn,
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
+        isApprovalList: 1,
         taskName: this.queryInfo.taskName,
-        enterpriseId: this.queryInfo.enterpriseId
+        enterpriseId: this.queryInfo.enterpriseId,
       };
       getProgressContentPageApi(data).then((res) => {
         console.log("返回的值", res);
@@ -431,7 +459,7 @@ export default {
               let dealImageData = JSON.parse(item.image);
               let dealImageArr = [];
               dealImageData.map((item2) => {
-                if(item2.url.indexOf("http") == -1){
+                if (item2.url.indexOf("http") == -1) {
                   dealImageArr.push(this.$store.state.FILEURL + item2.url);
                 } else {
                   dealImageArr.push(item2.url);
@@ -481,6 +509,11 @@ export default {
   margin-right: 15px;
 }
 // 表格样式
+.tables {
+  min-height: 0;
+  max-height: none;
+  height: auto;
+}
 .tableBtns {
   display: flex;
   justify-content: center;
@@ -501,11 +534,13 @@ export default {
   box-sizing: border-box;
 }
 // 下拉框样式修改
-/deep/.el-select-dropdown__item.hover,.el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+/deep/.el-select-dropdown__item.hover,
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
   background-color: transparent;
 }
 // 表格暂无数据样式修改
-/deep/.el-table__empty-text{
+/deep/.el-table__empty-text {
   margin-top: 10%;
 }
 </style>

src/views/projectFront/progressManagementAg/projectProgressDetail.vue

@@ -587,6 +587,10 @@ export default {
             this.itemForm.status = 2;
           }
           data.delayEventType = this.workerInfo.delayEventType.join(",");
+          if(+this.workerInfo.progressRatio <= +this.itemForm.progressRatio){
+            this.$message.error("上报进度必须大于当前进度");
+            return;
+          }
           console.log("新增提交的数据", data);
           addXzTaskProgressContentApi(data).then((res) => {
             if (res.code == 200) {
@@ -876,15 +880,20 @@ export default {
 }
 
 .noData {
-  text-align: center;
+  // text-align: center;
   height: 95%;
-  padding-top: 50%;
+  // padding-top: 50%;
   box-sizing: border-box;
   background: #f7f7f7;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   img {
-    position: absolute;
-    top: 35%;
-    left: 60%;
+    // position: absolute;
+    // top: 35%;
+    // left: 60%;
+    // margin: auto;
+    margin-bottom: 70px;
     width: 15%;
   }
 }