Merge branch 'chenH' into bjxz-dev

src/views/projectFront/configManage/personnelAccess.vue

@@ -57,6 +57,15 @@
             $t("message.videoManage.add")
           }}</el-button>
           <!--          筛选 -->
+          <el-select v-model="screenStr" class="screen" placeholder="请选择筛选模块" @change="handleCommand">
+            <el-option
+              v-for="(item) in screen"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id" 
+            >
+            </el-option>
+          </el-select>
           <!-- <el-dropdown class="screen" size="medium" @command="handleCommand">
             <el-button type="success" plain>  
               {{$t("message.videoManage.screen")}}
@@ -472,6 +481,7 @@ export default {
         externalAccount: "",
       },
       screen:[
+        {id:0,name:" "},
         {id:1,name:"专业分包"},
         {id:2,name:"设备分包"},
         {id:3,name:"材料分包"},
@@ -485,6 +495,7 @@ export default {
         {id:11,name:"设计单位"},
         {id:12,name:"其他"},
       ],
+      screenStr:'',
       formRules: {
         account: [
           {
@@ -935,13 +946,14 @@ export default {
     },
     refresh() {
       this.workerName = "";
+      this.screenStr = ""
       this.getList();
     },
     // 实现筛选
     handleCommand(command){
       getProjectChilderSystemUserListApi({
         projectSn: this.$store.state.projectSn,
-        enterpriseTypeId: command,
+        enterpriseTypeId:command,
       }).then((result)=>{ 
         if(result.success){
           this.List = result.result;

src/views/projectFront/projectSummary/baseInfo.vue

@@ -20,6 +20,7 @@
         >
           上传安全帽项目
         </el-button>
+        <!-- 编辑 -->
         <el-button
           type="primary"
           size="medium"
@@ -869,7 +870,8 @@ export default {
       company: '',
       constructionStageList: [],
       structureTypeList: [],
-      projectTypeList: []
+      projectTypeList: [],
+      // menuList:""
     };
   },
   created() {
@@ -881,6 +883,10 @@ export default {
     this.getDictionaryList();
     this.getDictionaryByStructure();
     this.getDicProjectTypeList();
+    
+  },
+  mounted() {
+    console.log('编辑表示：',this.this.$store.state.userInfo);
   },
 
   methods: {

src/views/projectFront/quality/inspectionLedger.vue

@@ -374,7 +374,7 @@
             >
           </el-radio-group>
           <div
-            v-show="recordType == 1 || (recordType == 1 && type == 'detail')"
+            v-show="recordType == 1 || (recordType == 1 && type == 'detail')" v-cascaderDirect
           >
             <el-form
               ref="addForm1"
@@ -382,11 +382,13 @@
               :rules="addForm1Rules"
               :model="addForm1"
               label-width="120px"
+              
             >
-              <!--              检查部位-->
+              <!--    质量问题   检查部位-->
               <el-form-item
                 :label="$t('message.quality.checkPoint')"
                 prop="regionId"
+                class="el-cascaderDirect"
               >
                 <el-cascader
                   :disabled="type == 'detail'"
@@ -935,6 +937,7 @@
               :model="addForm2"
               label-width="120px"
             >
+            <!-- 检查部位 -->
               <el-form-item
                 :label="$t('message.quality.checkPoint')"
                 prop="regionId"
@@ -3256,6 +3259,20 @@ export default {
 
     handleExceed() {},
   },
+  // 自定义指令
+  directives:{
+    cascaderDirect:{
+      bind(el,binding,vnode){
+        let target = el.getElementByClassName('el-cascaderDirect')
+        el.handler = ()=>{
+          for(let item of target){
+            item.style.display = 'none'
+          }
+        }
+        el.addEventListener('scroll',el.handler)
+      }
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -3538,4 +3555,9 @@ export default {
   overflow: hidden;
   white-space: nowrap;
 }
+
+// 超出部位隐藏
+// .custom-cascader {
+//   overflow: visible;
+// }
 </style>