Merge branch 'master' of http://39.108.216.210:3000/web/saber into master

src/api/certificate/list.js

@@ -107,3 +107,11 @@ export const findPfxType = (params) => {
     params
   })
 }
+
+export const getPriwbsPdf = (pkeyId) => {
+  return request({
+    url: '/api/blade-manager/exceltab/get-priwbs-pdf',
+    method: 'get',
+    params: {pkeyId}
+  })
+}

src/views/certificate/list.vue

@@ -1,28 +1,40 @@
 <template>
   <basic-container class="list">
     <div class="flexBetween">
+      <div class="flex">
+          <el-select
+          v-model="value"
+          filterable
+          style="width:300px;"
+          placeholder="请选择项目"
+          clearable
+          @change="projectChange"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.projectName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      <div class="header-box-center">
+          <el-input v-model="searchinput" style="width: 240px;margin-right: 10px;" placeholder="请输入"  clearable @clear="searchClick"/>
+          <el-button
+            type="primary"
+        
+            class="el-icon-search"
+            @click="searchClick"
+          >搜索</el-button>
+      </div>
+      </div>
+ 
       <el-button
         type="primary"
         size="mini"
         class="el-icon-plus"
         @click="pushRouter(0)"
       >新增</el-button>
-      <el-select
-        v-model="value"
-        filterable
-        style="width:300px;"
-        placeholder="请选择"
-        clearable
-        @change="projectChange"
-      >
-        <el-option
-          v-for="item in options"
-          :key="item.id"
-          :label="item.projectName"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
     </div>
 
     <el-table
@@ -112,6 +124,7 @@ import { queryProjectList, listpage, goRegister, remove } from "@/api/certificat
 export default {
   data () {
     return {
+      searchinput:'',
       value: '',
       options: [],
       tableData: [],
@@ -196,6 +209,7 @@ export default {
         current: this.pageindex,
         size: this.pagesize,
         projectId: this.value,
+        certificateUserName:this.searchinput
       })
      
       if (res.code == 200) {
@@ -214,13 +228,13 @@ export default {
         this.listpage()
       }
     },
+    searchClick(){
+      this.listpage()
+    }
     //#endregion
   },
   created () {
     this.queryProjectList()
-
-   
-   
     
   },
 }
@@ -233,4 +247,7 @@ export default {
     font-size: 16px !important;
   }
 }
+.header-box-center{
+    margin-left: 40px;
+  }
 </style>

src/views/formula/edit.vue

@@ -103,7 +103,7 @@
             <div class="flex" style="justify-content: space-between;width:100%">
                <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表" style="width:45%">
                 <el-option v-if="paramDataList.length" label="选择节点参数2" value="选择节点参数"></el-option>
-                <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
+                <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)?item.pkeyId:item.id"></el-option>
               </el-select>
               <!-- 搜索元素下拉框 -->
               <el-select v-model="input3" filterable clearable placeholder="搜索元素字段1"  @change="getInput" style="width:45%">
@@ -228,7 +228,7 @@
                   <div  class="flex" style="justify-content: space-between;width:100%">
                         <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
                         <el-option v-if="paramDataList.length" label="选择节点参数1" value="选择节点参数"></el-option>
-                        <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
+                        <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
                       </el-select>
                       <!-- 搜索元素下拉框 -->
                       <el-select v-model="input3" filterable placeholder="搜索元素字段2"  @change="getInput1" style="width:45%">
@@ -287,7 +287,7 @@
            <div  class="flex" style="justify-content: space-between;width:100%">
                 <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
                 <el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
-                <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName"  :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
+                <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
               </el-select>
            <!-- 搜索元素下拉框 -->
               <el-select v-model="input3" filterable clearable placeholder="搜索元素字段3"  @change="getInput1" style="width:45%">
@@ -357,7 +357,7 @@
                <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表">
                 <el-option v-if="paramDataList.length" label="选择节点参数3" value="选择节点参数"></el-option>
                 <template v-if="pid">
-                    <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.pkeyId!==-1?item.pkeyId:item.id"></el-option>
+                    <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
                 </template>
                 <template v-else>
                     <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="item.id"></el-option>
@@ -1540,7 +1540,7 @@ export default {
     },
 
     getTableEle(tableId){
-      console.log("getTableEle");
+      console.log("getTableEle",tableId);
       this.input3=''
       if(tableId === '选择节点参数'){
         this.eleList = this.paramDataList;

src/views/manager/archivetree.vue

@@ -20,7 +20,7 @@
                       >
                     </el-input>  
                     <div  style="height:100%;overflow-y: auto;" class="scrollClass ">
-                      <el-scrollbar style="height:90%">
+                      <el-scrollbar style="height:75%">
                         <el-tree
                           style="box-sizing: border-box;"
                           v-show="!filterText"
@@ -58,7 +58,7 @@
                                       <el-link :underline="false">
                                         <i
                                           class="el-icon-menu "
-                                          @click="showMenu($event,data, node)"
+                                          @click.stop="showMenu($event,data, node)"
                                           v-if="node.level != 1"
                                         
                                         ></i>
@@ -121,7 +121,7 @@
                                       <el-link :underline="false">
                                         <i
                                           class="el-icon-menu "
-                                          @click="showMenu($event,data, node)"
+                                          @click.stop="showMenu($event,data, node)"
                                           v-if="node.level != 1"
                                         
                                         ></i>
@@ -532,7 +532,7 @@
       width="800px"
       @close="pushFileClose"
     >
-      <div>
+    <div style="width: 100%;overflow-x: auto;">
         <el-tree
           :props="dialogProps"
           show-checkbox
@@ -1787,7 +1787,7 @@ export default {
     console.log(e,'e');
     var x = e.pageX; //这个应该是相对于整个浏览器页面的x坐标，左上角为坐标原点（0,0）
     var y = e.pageY; //这个应该是相对于整个浏览器页面的y坐标，左上角为坐标原点（0,0）
-    this.menutop = y;
+    this.menutop = y-70;
     this.menuleft = x;
     this.menuvisible=true
 

src/views/manager/projectinfo/archivetreeRule.vue

@@ -22,7 +22,7 @@
                     >
                     </el-input>
                   <div  style="height:100%;overflow-y: auto;" class="scrollClass ">
-                    <el-scrollbar style="height:90%">
+                    <el-scrollbar style="height:75%">
                       <el-tree
                         style="box-sizing: border-box;"
                         v-show="!filterText"
@@ -62,7 +62,7 @@
                                     <el-link :underline="false">
                                       <i
                                         class="el-icon-menu "
-                                        @click="showMenu($event,data, node)"
+                                        @click.stop="showMenu($event,data, node)"
                                         v-if="node.level != 1"
                                       
                                       ></i>
@@ -137,7 +137,7 @@
                                     <el-link :underline="false">
                                       <i
                                         class="el-icon-menu "
-                                        @click="showMenu($event,data, node)"
+                                        @click.stop="showMenu($event,data, node)"
                                         v-if="node.level != 1"
                                       
                                       ></i>
@@ -534,7 +534,7 @@
       width="800px"
       @close="pushFileClose"
     >
-      <div>
+      <div style="width: 100%;overflow-x: auto;">
         <el-tree
           :props="dialogProps"
           show-checkbox
@@ -1807,7 +1807,7 @@ export default {
     console.log(e,'e');
     var x = e.pageX; //这个应该是相对于整个浏览器页面的x坐标，左上角为坐标原点（0,0）
     var y = e.pageY; //这个应该是相对于整个浏览器页面的y坐标，左上角为坐标原点（0,0）
-    this.menutop = y;
+    this.menutop = y-70;
     this.menuleft = x;
     this.menuvisible=true
 

src/views/manager/projectinfo/tree.vue

@@ -99,7 +99,7 @@
         </el-row>
       <el-row :gutter="20" class="h-100p" style="padding:10px">
        
-        <el-col :span="10" class="h-100p">
+        <el-col :span="10" style="height: 85%;">
           <div class="h-100p flex flex-d-c">
             <p style="margin-top:2px">工程节点信息</p>
             <div class="flex " style="align-items: center;justify-content: space-between;">
@@ -151,7 +151,7 @@
                           <el-link :underline="false">
                             <i
                               class="el-icon-menu "
-                              @click="showMenu($event,data, node)"
+                              @click.stop="showMenu($event,data, node)"
                               v-if="node.level != 1"
                             
                             ></i>
@@ -2683,9 +2683,9 @@ export default {
       });
     },
     getMajorDataTypeList() {
-      if (this.majorDataTypeList.length > 1) {
-        return;
-      }
+      // if (this.majorDataTypeList.length > 1) {
+      //   return;
+      // }
       getDictionary({
         code: "major_data_type",
       }).then((res) => {

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

@@ -57,9 +57,9 @@
           偏移位X：
         </el-col>
         <el-col :span="16">
-        
+
             <avue-input v-model="pyzbx" placeholder="横坐标，负代表左移，正代表右移，偏移量50大概等于一厘米"  type="number"></avue-input>
- 
+
         </el-col>
       </el-row>
 
@@ -68,13 +68,17 @@
           偏移位Y：
         </el-col>
         <el-col :span="16">
-        
+
             <avue-input v-model="pyzby" placeholder="纵坐标，负代表下移，正代表上移，偏移量50大概等于一厘米"  type="number"></avue-input>
-      
+
         </el-col>
       </el-row>
 
       <el-row :span="24" style="text-align: center">
+        <el-button type="warning"
+                   size="small"
+                   icon="el-icon-view"
+                   @click="previewClick()">预览</el-button> &nbsp;&nbsp;
         <el-button type="primary"
                    size="small"
                    icon="el-icon-circle-plus-outline"
@@ -117,9 +121,9 @@
           <td align="center">
             <span style="color:#409EFF;;cursor: pointer;margin-right: 5px;" @click="editClick(item)" v-if="item.show===false">编辑</span>
             <span style="color:green;;cursor: pointer;margin-right: 5px;" @click="saveClick(item)" v-else v-loading="isEditLoaing">保存</span>
-     
+
             <span style="color:red;cursor: pointer;" v-on:click="deleteTableSig(key,item.id,item)">删除</span>
-           
+
           </td>
         </tr>
         </tbody>
@@ -140,7 +144,7 @@
 <script>
 
 import {getRoleInfoByParentId, getRoleType, getSigList, saveSig,remove,updateDetail,getSignDetail} from "../../../../../api/manager/AdjustForm";
-import {findPfxType} from "../../../../../api/certificate/list";
+import {findPfxType, getPriwbsPdf} from "../../../../../api/certificate/list";
 
 
 export default {
@@ -176,7 +180,7 @@ export default {
       isEditLoaing:false,
       sigRoleName:'',
       saveLoaing:false
-   
+
     }
   },
   watch: {
@@ -191,14 +195,14 @@ export default {
           this.pyzby=obj.pyzby
           this.sigRoleId=obj.sigRoleId
           this.colKey=obj.colKey
-    
+
           this.colName=obj.colName
           this.signId=obj.id
           this.isDeleted=obj.isDeleted
           if(obj.type==2){
             this.radio=obj.parentRoleId
              await this.roleTypeChang()
-         
+
           }else{
             this.radio=''
             await this.signTypeChang()
@@ -208,7 +212,7 @@ export default {
                     this.sigRoleName=ele.dictValue
                 }
              })
-          
+
           }
         }else{
         let isEdit= this.setsignaTable.some(element => element.show === true);
@@ -220,12 +224,12 @@ export default {
           this.pyzbx=0
           this.pyzby=0
         }
-         
+
           this.colKey=val.keyname
         }
        }, 1000);
-   
-        
+
+
         // todo
       },
       deep: true
@@ -239,7 +243,7 @@ export default {
             }
           })
         }
-        
+
       }
     }
   },
@@ -290,7 +294,22 @@ export default {
     changeRole(e){
       this.sigRoleName=e.label
       this.sigRoleId=e.value
- 
+
+    },
+    //预览
+    previewClick() {
+      let _this = this
+      console.log('预览', this.pkeyId1)
+      getPriwbsPdf(this.pkeyId1).then(({data}) => {
+        if (data.code === 200 && data.data) {
+          window.open(data.data, '_blank')
+        } else {
+          _this.$message({
+            type: "error",
+            message: data.msg || "预览失败"
+          });
+        }
+      })
     },
     async addRoleInfo(){
       var isadd = true;
@@ -385,7 +404,7 @@ export default {
     },
     async editClick (item){
       console.log(item,'item');
-  
+
       this.setsignaTable.forEach((ele)=>{
         ele.show=false
       })
@@ -407,7 +426,7 @@ export default {
                 this.sigRoleName=obj.sigRoleName
                 this.colKey=obj.colKey
 
-            
+
                 this.colName=obj.colName
                 this.signId=obj.id
                 this.isDeleted=obj.isDeleted
@@ -415,7 +434,7 @@ export default {
                 if(obj.type==2){
                   this.radio=obj.parentRoleId
                   await this.roleTypeChang()
-              
+
                 }else{
                   this.radio=''
                   await this.signTypeChang()
@@ -425,8 +444,8 @@ export default {
                         this.sigRoleName=ele.dictValue
                     }
                   })
-               
-                
+
+
                 }
             }else{
               this.radio=''
@@ -436,16 +455,16 @@ export default {
               this.pyzbx=0
               this.pyzby=0
             }
-              
+
        }
        console.log( this.htmlData1,' this.htmlData1111');
-     
+
     },
     saveClick(item){
       console.log('保存');
       this.editRoleInfo(item)
-    
-  
+
+
     },
    async editRoleInfo(){
       let obj={}
@@ -462,7 +481,7 @@ export default {
       if(this.signType==2){
         obj.parentRoleId=this.radio
         obj.sigRoleId=this.sigRoleId
-        
+
       }else{
         obj.sigRoleId=this.signInfo
       }
@@ -479,7 +498,7 @@ export default {
             ele.tabId=obj.tabId
             ele.show=false
             ele.colName=this.htmlData1.name
-           
+
           }
         })
         this.$nextTick(()=>{
@@ -488,8 +507,8 @@ export default {
         this.$forceUpdate()
         console.log(this.setsignaTable,'this.setsignaTable');
         // this.saveSingInfo()
-       
-      
+
+
     },
    async deleteTableSig (key,id,item) {//删除数据
    console.log(item,'item');
@@ -510,7 +529,7 @@ export default {
               });
             }
         }
-      
+
     },
     async saveSingInfo() {
       console.log(this.setsignaTable,'this.setsignaTable');
@@ -533,7 +552,7 @@ export default {
           message: "操作成功"
         });
       }
-   
+
     },
     async getSingInfo() {
       console.log(this.excelId,'this.excelId1111111');

src/views/manager/wbsinfo/edit.vue

@@ -16,7 +16,7 @@
           </el-col>
       </el-row>
     <el-row :gutter="20" class="h-100p">
-      <el-col :span="10" class="h-100p">
+      <el-col :span="10" style="height: 85%;">
         <div class="h-100p flex flex-d-c">
           <p>工程节点信息</p>
           <div class="flex " style="align-items: center;justify-content: space-between;">
@@ -72,7 +72,7 @@
                             <el-link :underline="false">
                               <i
                                 class="el-icon-menu "
-                                @click="showMenu($event,data, node)"
+                                @click.stop="showMenu($event,data, node)"
                                
                               
                               ></i>
@@ -120,7 +120,7 @@
                               <el-link :underline="false">
                                 <i
                                   class="el-icon-menu "
-                                  @click="showMenu($event,data, node)"
+                                  @click.stop="showMenu($event,data, node)"
                                   v-if="node.level != 1"
                                 
                                 ></i>
@@ -2074,7 +2074,6 @@ export default {
       return val ? String(val).split(',') : '';
     },
     setLeftType (type, data, node) {
-      //console.log(type)
       this.jiedianId = data.id
       if (type == 4 || type == 5) {
         this.leftType = type;
@@ -2650,9 +2649,6 @@ export default {
       })
     },
     getMajorDataTypeList () {
-      if (this.majorDataTypeList.length > 1) {
-        return;
-      }
       getDictionary({
         code: 'major_data_type'
       }).then((res) => {

src/views/measure/systemUnit.vue

@@ -3,7 +3,7 @@
   <div style="height: 100%" class="flexStar">
     <div class="boxswai" style="width: 26%; padding-left: 0px">
       <div class="boxnei" style="display: flex; flex-direction: column">
-        <div style="overflow: auto; flex: 1;height:500px">
+        <div style="overflow: auto; flex: 1;height:500px;width:400px">
           <el-tree 
           v-if="ishowTree"
           lazy :props="defaultProps" @node-click="getNodeDetail"  :load="loadNode" :expand-on-click-node="false"
@@ -25,7 +25,7 @@
                             <el-link :underline="false">
                               <i
                                 class="el-icon-menu "
-                                @click="showMenu($event,data, node)"
+                                @click.stop="showMenu($event,data, node)"
                               ></i>
                             </el-link>
                               <ul
@@ -331,7 +331,7 @@ import { getStore, setStore } from "@/util/store";
     console.log(e,'e');
     var x = e.pageX; //这个应该是相对于整个浏览器页面的x坐标，左上角为坐标原点（0,0）
     var y = e.pageY; //这个应该是相对于整个浏览器页面的y坐标，左上角为坐标原点（0,0）
-    this.menutop = y;
+    this.menutop = y-100;
     this.menuleft = x;
     this.menuvisible=true