修改bug

src/api/AssessmentArea/AssessmentArea.js

@@ -14,7 +14,7 @@ export const cancelAssessment = (data) => {
     return request({
         url: '/api/blade-manager/assessmentUser/cancelAssessment',
         method: 'post',
-        data
+        params: data
     })
 }
 

src/views/AssessmentArea/index.vue

@@ -4,6 +4,7 @@
       <el-select
         v-model="userId"
         placeholder="请选择"
+        clearable
         @change="queryAssessUser"
       >
         <el-option
@@ -15,7 +16,7 @@
         </el-option>
       </el-select>
       <el-date-picker
-        class="marleft20"
+        class="marleft20 marright20"
         v-model="time"
         type="datetimerange"
         align="right"
@@ -27,7 +28,6 @@
       </el-date-picker>
       <el-button
         type="primary"
-        class="marleft20"
         @click="search()"
       >搜索</el-button>
     </div>
@@ -77,7 +77,7 @@
         label="图片"
       >
         <template slot-scope="scope">
-          <el-button>图片</el-button>
+          <el-button v-if="scope.row.fileUrlList.length">图片</el-button>
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -115,7 +115,7 @@ export default {
     }
   },
   methods: {
-    queryAssessUser(){
+    queryAssessUser () {
       this.queryUserAssessmentPage();
     },
     //#region 分页
@@ -135,13 +135,14 @@ export default {
       this.queryUserAssessmentPage()
     },
     CancelAppraisal (row) {//取消考核
+      console.log(row);
       // let _that = this
       this.$confirm('是否确认取消考核', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.cancelAssessment()
+        this.cancelAssessment(row)
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -172,8 +173,7 @@ export default {
     },
     async cancelAssessment (row) {//取消考核
       const { data: res } = await cancelAssessment({
-        id: '',
-        assessmentId: row.assessmentId,
+        id: row.assessmentId,
       })
       console.log(res);
       if (res.code == 200) {
@@ -181,6 +181,7 @@ export default {
           type: 'success',
           message: '取消考核成功!'
         });
+        this.queryUserAssessmentPage()
       }
     },
     async findMaintenanceUser () {//获取所有维护人员

src/views/certificate/list.vue

@@ -10,6 +10,7 @@
       <el-select
         v-model="value"
         filterable
+        style="width:300px;"
         placeholder="请选择"
         @change="projectChange"
       >
@@ -24,7 +25,7 @@
     </div>
 
     <el-table
-      class="martop20"
+      class="martop20 tableList"
       :data="tableData"
       header-color='red'
       style="width: 100%"
@@ -38,7 +39,6 @@
       <el-table-column
         prop="certificateUserName"
         label="证书所有者"
-        width="180"
       >
       </el-table-column>
       <el-table-column
@@ -216,4 +216,9 @@ export default {
 
 
 <style lang="scss" scoped>
+.tableList {
+  /deep/ th.el-table__cell {
+    font-size: 16px !important;
+  }
+}
 </style>

src/views/certificate/management.vue

@@ -1,9 +1,12 @@
 <template>
-  <basic-container class="management">
+  <basic-container
+    class="management"
+    style="margin-bottom:30px;"
+  >
     <el-select
       v-model="value"
       filterable
-      style="float:right"
+      style="float:right;width:300px;"
       placeholder="请选择"
       @change="projectChange"
     >
@@ -47,7 +50,7 @@
     <el-pagination
       style="float:right"
       background
-      class="martop20 marbottom20"
+      class="martop10 marbottom10"
       layout="prev, pager, next"
       :total="total"
       @size-change="handleSizeChange"
@@ -69,7 +72,7 @@ export default {
       tableData: [{}],
       total: 0,
       pageindex: 1,
-      pagesize: 20,
+      pagesize: 10,
     }
   },
   methods: {

src/views/certificate/managements/see.vue

@@ -4,30 +4,29 @@
     style="margin-bottom:50px;"
   >
     <el-row :gutter="20">
-      <el-col
-        :span="6"
-      >
-       <el-select
-      style="width:100%;"
-      v-model="value"
-      placeholder="请选择"
-      @change="changePosition"
-      class="marbottom20"
-      clearable
-    >
-      <el-option
-        v-for="item in options"
-        :key="item.id"
-        :label="item.contractName"
-        :value="item.id"
-      >
-      </el-option>
-    </el-select>
+      <el-col :span="6">
+        <el-select
+          style="width:100%;"
+          v-model="value"
+          placeholder="请选择"
+          @change="changePosition"
+          class="marbottom20"
+          clearable
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.contractName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
         <el-menu
           default-active="2"
           class="el-menu-vertical-demo"
         >
-          <div style="border-right:1px solid #EDEDED;"
+          <div
+            style="border-right:1px solid #EDEDED;"
             v-for="(item,keys) in menuData"
             :key='keys'
           >
@@ -49,21 +48,32 @@
           </div>
         </el-menu>
       </el-col>
-      <el-col :span="18" class="martop20">
+      <el-col
+        :span="18"
+        class="martop20"
+      >
         <div
           class="martop20"
           v-for="(item,key) in rightData"
           :key='key'
         >
-          <div class="flexBetween ">
-            <div class="flexItemsC">姓名:{{item.certificateUserName}}</div>
-            <div class="flexStar flexItemsC">签名图片:
-              <img
-                style="height:40px;"
-                :src="item.signatureFileUrl"
-              />
+          <div class="flexBetween">
+            <div class="flexStar">
+              <div
+                class="flexItemsC"
+                style="width:240px;"
+              >姓名:{{item.certificateUserName}}</div>
+              <div
+                class="flexStar flexItemsC"
+                style="width:240px;"
+              >签名图片:
+                <img
+                  style="height:40px;"
+                  :src="item.signatureFileUrl"
+                />
+              </div>
+              <div class="flexItemsC">证书:{{item.certificateUserName}}- {{item.certificateFileUrl|urlsplice}}</div>
             </div>
-            <div class="flexItemsC">证书:{{item.certificateUserName}}- {{item.certificateFileUrl|urlsplice}}</div>
             <el-button
               size="mini"
               @click="deleteAutograph(item.id)"
@@ -129,8 +139,8 @@ export default {
       }
     },
     async queryContractList (contractId) {
-      const { data: res } = await queryContractList({contractId});
-      if(res.code == 200){
+      const { data: res } = await queryContractList({ contractId });
+      if (res.code == 200) {
         this.options = res.data
       }
       this.value = contractId;

src/views/exctab/excelmodel/excelmodel.vue

@@ -12,6 +12,7 @@
         >
           <!-- 树结构 -->
           <avue-tree
+            ref="trees"
             :style="{width:'100%',height:heightss-20+'px','box-sizing': 'border-box',overflow:'hidden'}"
             :permission="getPermission"
             :loading="loading"
@@ -22,28 +23,33 @@
             <span
               class="el-tree-node__label"
               slot-scope="{ data }"
+              @mouseover="mouseOver(data)"
+              @mouseleave="mouseLeave(data)"
+              style="box-sizing: border-box;width:100%;"
             >
               <div>
                 <span style="text-overflow: ellipsis;width:70%;"> {{ data.name }} </span>
                 <!-- <span> {{ node}} </span> -->
                 <!-- 添加 -->
-                <i
-                  class="el-icon-circle-plus-outline marleft10"
-                  @click.stop="addExcel(data)"
-                  v-if="data.fileType!=3"
-                ></i>
-                <!-- 编辑 -->
-                <i
-                  class="el-icon-edit marleft10"
-                  @click.stop="editExcel(data)"
-                  v-if="data.fileType!=1"
-                ></i>
-                <!-- 删除 -->
-                <i
-                  class="el-icon-delete marleft10"
-                  @click.stop="deleteExcelM(data)"
-                  v-if="!data.hasChildren&&data.fileType!=1"
-                ></i>
+                <span v-show="data.moreShow">
+                  <i
+                    class="el-icon-circle-plus-outline marleft10"
+                    @click.stop="addExcel(data)"
+                    v-if="data.fileType!=3"
+                  ></i>
+                  <!-- 编辑 -->
+                  <i
+                    class="el-icon-edit marleft10"
+                    @click.stop="editExcel(data)"
+                    v-if="data.fileType!=1"
+                  ></i>
+                  <!-- 删除 -->
+                  <i
+                    class="el-icon-delete marleft10"
+                    @click.stop="deleteExcelM(data)"
+                    v-if="!data.hasChildren&&data.fileType!=1"
+                  ></i>
+                </span>
               </div>
             </span>
           </avue-tree>
@@ -146,7 +152,7 @@
       width="800px"
       modal-append-to-body
       append-to-body
-      :before-close="handleClose"
+      @close="handleClose"
     >
       <div class="dialogBox">
         <el-form
@@ -547,6 +553,16 @@ export default {
     //#endregion
 
     //#region  外层左侧事件
+    mouseLeave (data) {
+      if (data.moreShow) {
+        this.$set(data, 'moreShow', false)
+      }
+    },
+    mouseOver (data) {
+      if (!data.moreShow) {
+        this.$set(data, 'moreShow', true)
+      }
+    },
     nodeClick (data) {//外层树结构
       if (data.hasChildren == false || data.fileType == 3) {
         this.from.checkd = true
@@ -727,7 +743,7 @@ export default {
               linkDataInfo: linkDataInfo
             })
           }
-          this.handleClose()
+          this.dialogTap = false
         }
       });
     },

src/views/manager/archivetree.vue

@@ -1,52 +1,69 @@
 <template>
-  <basic-container>
-    <el-row :gutter="20">
+  <basic-container
+    ref="container"
+    style="height:100%;"
+  >
+    <el-row
+      :gutter="20"
+      :style="{'height':heights-80+'px','overflow': 'hidden'}"
+    >
       <el-col
-        span="9"
+        span="12"
         class='marleft20'
       >
-        <h2>归档目录树</h2>
-        <el-tree
-          v-if="leftTree"
-          :props="props"
-          :load="loadNode"
-          :data="data"
-          lazy
-        >
-          <span
-            class=" flexStar"
-            slot-scope="{ node, data }"
+        <div>
+          <h2>归档目录树</h2>
+          <el-tree
+            v-if="leftTree"
+            :props="props"
+            :load="loadNode"
+            :data="data"
+            lazy
           >
-            <span>{{ data.title }}</span>
-            <span class="marleft10">
-              <i
-                @click.stop='addtree(data)'
-                class="el-icon-circle-plus-outline"
-                style="fontSize:18px;"
-                v-if="data.isStorageNode!=1"
-              ></i>
-              <i
-                @click.stop='edittree(data)'
-                class="el-icon-edit-outline marleft5"
-                style="fontSize:18px;"
-                v-if="node.level!=1"
-              ></i>
-              <i
-                @click.stop='deletetree(data)'
-                class="el-icon-delete marleft5"
-                style="fontSize:18px;"
-                v-if="node.level!=1"
-              ></i>
+            <span
+              class=" flexStar"
+              slot-scope="{ node, data }"
+              @mouseover="mouseOver(data)"
+              @mouseleave="mouseLeave(data)"
+              style="box-sizing: border-box;width:100%;"
+            >
+              <span>{{ data.title }}</span>
+              <span
+                class="marleft10"
+                v-show="data.moreShow"
+              >
+                <i
+                  @click.stop='addtree(data)'
+                  class="el-icon-circle-plus-outline"
+                  style="fontSize:18px;"
+                  v-if="data.isStorageNode!=1"
+                ></i>
+                <i
+                  @click.stop='edittree(data)'
+                  class="el-icon-edit-outline marleft5"
+                  style="fontSize:18px;"
+                  v-if="node.level!=1"
+                ></i>
+                <i
+                  @click.stop='deletetree(data)'
+                  class="el-icon-delete marleft5"
+                  style="fontSize:18px;"
+                  v-if="node.level!=1"
+                ></i>
+              </span>
             </span>
-          </span>
-        </el-tree>
+          </el-tree>
+        </div>
       </el-col>
       <el-col
-        span="7"
+        span="9"
         style="padding-top:30px;"
       >
         <h3>上传文件入口显示配置</h3>
-        <div class="peizhi">
+        <div
+          class="peizhi"
+          :style="{'height':heights-210+'px','overflow': 'hidden'}"
+        >
           <div class="flexEnd">
             <i
               @click="rightPushTree"
@@ -416,6 +433,7 @@ export default {
       dialogData: [],
       checkXuan: [],
       //#endregion
+      heights: '',
     }
   },
   methods: {
@@ -423,12 +441,12 @@ export default {
     async loadNode (node, resolve) {
       console.log(node);
       if (node.level === 0) {
-        resolve([{
-          title: '系统级归档模板',
-          hasChildren: false,
-          id: 0,
-          isStorageNode: 0,
-        }])
+        let ks = await this.lazyTree(0)
+        if (ks.length) {
+          resolve(ks)
+        } else {
+          this.archiveTreeInit()
+        }
       } else {
         resolve(await this.lazyTree(node.data.id))
       }
@@ -436,6 +454,14 @@ export default {
     async archiveTreeInit () {//添加根节点
       const { data: res } = await archiveTreeInit()
       console.log(res);
+      if (res.code == 200 && res.msg == '操作成功') {
+        res.data.forEach(val => {
+          val.hasChildren = !val.hasChildren
+        });
+        return res.data
+      } else if (res.code == 200 && res.msg == "未查询到信息") {
+        return []
+      }
     },
     async lazyTree (parentId) {//树节点懒加载
       const { data: res } = await lazyTree({
@@ -452,6 +478,17 @@ export default {
         return []
       }
     },
+    mouseLeave (data) {
+      if (data.moreShow) {
+        console.log(this.$set(data, 'moreShow', false));
+      }
+    },
+    mouseOver (data) {
+      if (!data.moreShow) {
+        console.log(this.$set(data, 'moreShow', true));
+      }
+
+    },
     addtree (data) {//添加树
       if (this.JobTypeList.length == 0) {
         this.roletree()
@@ -745,15 +782,22 @@ export default {
     saveFile () {//保存按钮
       let arr = this.$refs.trees.getCheckedKeys()
       console.log(arr);
-      // this.$refs.trees.setCheckedKeys(this.checkXuan);
-      // let ids = ''
-      // arr.forEach((val, key) => {
-      //   ids += val
-      //   if (key != arr.length - 1) {
-      //     ids += ','
-      //   }
-      // })
-      // this.submitDisplayConfigTree(ids)
+      if (arr.length > 0) {
+        // this.$refs.trees.setCheckedKeys(this.checkXuan);
+        // let ids = ''
+        // arr.forEach((val, key) => {
+        //   ids += val
+        //   if (key != arr.length - 1) {
+        //     ids += ','
+        //   }
+        // })
+        // this.submitDisplayConfigTree(ids)
+      } else {
+        this.$message({
+          type: 'error',
+          message: '请先设置配置文件'
+        })
+      }
     },
     handleCheckChange (data, checked, indeterminate) {
       console.log(data, checked, indeterminate);
@@ -774,6 +818,9 @@ export default {
       nodeType: 2,
     })
   },
+  mounted () {
+    this.heights = this.$refs.container.$el.offsetHeight
+  }
 }
 </script>
 
@@ -782,6 +829,5 @@ export default {
   border: 1px solid #e5e5e5;
   border-radius: 5px;
   padding: 15px 10px;
-  min-height: 600px;
 }
 </style>

src/views/manager/projectinfo/tree.vue

@@ -207,18 +207,20 @@
               icon="el-icon-document-copy"
               class="text-icon"
             ></el-button> -->
-            <i
-              class="el-icon-edit-outline marleft10"
-              size="26"
-              style="color:#409EFF;cursor: pointer;"
+
+            <el-button
+              type="text"
+              style="margin-left:10px;"
+              icon="el-icon-edit-outline"
+              class="text-icon"
               @click="editEditElementForm()"
-            ></i>
-            <i
-              class="el-icon-sort marleft10"
-              size="26"
+            ></el-button>
+            <el-button
+              type="text"
+              icon="el-icon-sort"
+              class="text-icon"
               @click="privateTableSort()"
-              style="color:#409EFF;cursor: pointer;"
-            ></i>
+            ></el-button>
           </p>
           <el-table
             :data="formData"
@@ -309,9 +311,8 @@
                 >编辑元素</el-link>
                 <el-link
                   class="mg-l-10"
-                  type="primary"         
-                  :disabled='scope.row.fileType!=3'
-                  @click="Associationlist(scope)" 
+                  type="primary"
+                  @click="Associationlist(scope)"
                 >关联清表</el-link>
                 <el-link
                   class="mg-l-10"
@@ -1280,7 +1281,7 @@ import {
   saveElement, remove as removeElement, updateBatchElements, getTemplate,
   importWbsElement
 } from "@/api/manager/wbsformelement";
-import { getLazytree, getDetail, update, findNodeTableByCondition as selectByNodeTable, removeTableByCondition as removeTableById ,removePrivateTreeNode,wbsTreePrivateTableSort} from "@/api/manager/wbsprivate";
+import { getLazytree, getDetail, update, findNodeTableByCondition as selectByNodeTable, removeTableByCondition as removeTableById, removePrivateTreeNode, wbsTreePrivateTableSort } from "@/api/manager/wbsprivate";
 import { findProjectTree as getAlltree } from "@/api/manager/projectinfo";
 import { getList as getAttchFromOriginalName } from "@/api/resource/attach";
 import { getDictionary } from "@/api/system/dict";
@@ -1400,9 +1401,9 @@ export default {
 
       infoNameVisible: false,
 
-      excelSortTag:false,
-      excelSortTag2:false,
-      tableSortList:[],
+      excelSortTag: false,
+      excelSortTag2: false,
+      tableSortList: [],
       //#endregion
     };
   },
@@ -1898,26 +1899,26 @@ export default {
       })
     },
     //私有树的元素表修改排序
-    privateTableSort(){
-      if(!this.curTreeData.id){
+    privateTableSort () {
+      if (!this.curTreeData.id) {
         this.$message({
           type: "warning",
           message: "请先选择需要排序的节点"
         })
         return;
       }
-      this.tableSortList = this.formData.map((form,index)=>{
-        return{
-          sort:index+1,
-          deptName:form.tableName,
-          pkeyId:form.pkeyId,
+      this.tableSortList = this.formData.map((form, index) => {
+        return {
+          sort: index + 1,
+          deptName: form.tableName,
+          pkeyId: form.pkeyId,
         }
       })
       this.excelSortTag = true
       this.excelSortTag2 = true
     },
-    editPrivateSort(){
-      wbsTreePrivateTableSort(this.tableSortList).then(()=>{
+    editPrivateSort () {
+      wbsTreePrivateTableSort(this.tableSortList).then(() => {
         this.updateNodeTable();
         this.$message({
           type: "success",

src/views/manager/projectinfo/treeTemplate/template/setInputTPT.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="setInput">
-    <div class="flexBetween ">
+    <div class="flexBetween">
       <el-select
+        style="width:45%;"
         v-model="from.value"
         clearable
         placeholder="请选择"
@@ -15,6 +16,7 @@
         </el-option>
       </el-select>
       <el-select
+        style="width:45%;"
         v-model="from.type"
         clearable
         placeholder="请选择"
@@ -176,7 +178,7 @@ export default {
       }
     },
     async getExcelHtml () {
-      const { data: res } = await getExcelHtml({excelId:this.excelId})
+      const { data: res } = await getExcelHtml({ excelId: this.excelId })
       console.log(res);
       if (res.code === 200) {
         this.from.value = ''

src/views/manager/wbsinfo/edit.vue

@@ -221,18 +221,18 @@
               icon="el-icon-document-copy"
               class="text-icon"
             ></el-button>
-            <i
-              class="el-icon-edit-outline marleft10"
-              size="26"
-              style="color:#409EFF;cursor: pointer;"
+            <el-button
+              type="text"
+              icon="el-icon-edit-outline"
+              class="text-icon"
               @click="editEditElementForm()"
-            ></i>
-            <i
-              class="el-icon-sort marleft10"
-              size="26"
+            ></el-button>
+            <el-button
+              type="text"
+              icon="el-icon-sort"
+              class="text-icon"
               @click="paixucc()"
-              style="color:#409EFF;cursor: pointer;"
-            ></i>
+            ></el-button>
           </p>
           <el-table
             :data="formData"
@@ -1455,7 +1455,7 @@ export default {
       editType: 1,
 
       dialogVisible: false,
-      saveNodeLoading:false,
+      saveNodeLoading: false,
       deptCategorylist: [],
       majorDataTypeList: [],
       rules: {
@@ -1509,14 +1509,14 @@ export default {
       infoNameVisible: false,
 
       //数据类型的默认长度
-      dataTypeDefaultMap:{
-        1:1000,//字符串
-        2:65,//整数
-        3:65,//小数
-        4:0,//日期
-        5:65,//数值
-        6:1000,//签名
-        7:1000,//文件
+      dataTypeDefaultMap: {
+        1: 1000,//字符串
+        2: 65,//整数
+        3: 65,//小数
+        4: 0,//日期
+        5: 65,//数值
+        6: 1000,//签名
+        7: 1000,//文件
       }
     };
   },
@@ -1830,7 +1830,7 @@ export default {
     },
 
     updateTreeNewNode () {
-      let detail = (this.nodeDetail.parentId?this.nodeDetail:this.curTreeData);
+      let detail = (this.nodeDetail.parentId ? this.nodeDetail : this.curTreeData);
       getLazytree(this.id, detail.parentId).then((res) => {
         let node = this.$refs.tree.getNode(detail.parentId);
         node.isLeaf = false;
@@ -1859,8 +1859,8 @@ export default {
       selectFormElements(this.curEleTable.id).then((res) => {
         res.data.data.forEach((element) => {
           this.eleReg.exec(element.eAllowDeviation);
-           //console.log(RegExp.$1)
-           //console.log(RegExp.$2)
+          //console.log(RegExp.$1)
+          //console.log(RegExp.$2)
           element.allow = RegExp.$1 ? RegExp.$1 : '';
           element.deviation = RegExp.$2 ? RegExp.$2 : '';
         })
@@ -2104,10 +2104,10 @@ export default {
           element.eType = Number(element.elementType);
           element.eAllowDeviation = element.elementAllowDeviation;
           element.eInspectionMethod = element.elementInspectionMethod;
-          if(element.eAllowDeviation.indexOf(',')>0){
+          if (element.eAllowDeviation.indexOf(',') > 0) {
             element.allow = '【】';
             element.deviation = element.eAllowDeviation;
-          }else{
+          } else {
             this.eleReg.exec(element.eAllowDeviation);
             // console.log(RegExp.$1)
             // console.log(RegExp.$2)
@@ -2270,8 +2270,8 @@ export default {
     },
 
     //修改数据类型，给个默认值
-    setDefaultLength(row){
-      this.$set(row,'eLength',this.dataTypeDefaultMap[row.eType]);
+    setDefaultLength (row) {
+      this.$set(row, 'eLength', this.dataTypeDefaultMap[row.eType]);
     },
 
     //#endregion
@@ -2371,7 +2371,7 @@ export default {
     async keymap () {//节点参数枚举
       const { data: res } = await keymap()
       //console.log(res);
-      if (res.code  == 200) {
+      if (res.code == 200) {
         this.namelist = res.data
       }
     },
@@ -2530,8 +2530,8 @@ export default {
     padding: 10px 20px !important;
   }
 }
-.filter-tree{
+.filter-tree {
   min-width: 100%;
-  display:inline-block;
+  display: inline-block;
 }
 </style>