Merge branch '3.3.7-scxjy' into web-v2

src/assets/styles/ZDelement.scss

@@ -507,3 +507,18 @@
 .el-time-spinner__wrapper{
   margin-top:-16px;
 }
+/************ cascader内容过长 ***********/
+.cascader-filterable-hazardCheckPro{
+  width:898px;
+  .el-cascader-panel{
+    width:898px;
+    .el-scrollbar{
+      width:898px;
+    }
+  }
+  span{
+    height:34px;
+    line-height: 34px;
+    overflow: hidden;
+  }
+}

src/views/safetyCheck/components/addPage/addPage.vue

@@ -98,6 +98,7 @@
                   placeholder="请选择检查项"
                   :options="options"
                   :props="{ checkStrictly: false, value: 'id', label: 'labelName',emitPath:false }"
+                  popper-class="cascader-filterable-hazardCheckPro"
                   filterable>
                   <template slot-scope="{data}">
                     <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">
@@ -183,6 +184,7 @@
                   placeholder="请选择检查项"
                   :options="options"
                   :props="{ checkStrictly: false, value: 'id', label: 'labelName',emitPath:false }"
+                  popper-class="cascader-filterable-hazardCheckPro"
                   filterable>
                   <template slot-scope="{data}">
                     <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -186,6 +186,7 @@
                   placeholder="请选择检查项"
                   :options="options"
                   :props="{ checkStrictly: false, value: 'id', label: 'labelName',emitPath:false }"
+                  popper-class="cascader-filterable-hazardCheckPro"
                   filterable>
                   <template slot-scope="{data}">
                     <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">

src/views/safetyCheck/startInspection/index.vue

@@ -162,6 +162,7 @@
                     placeholder="请选择检查项"
                     :options="options"
                     :props="{ checkStrictly: false, value: 'id', label: 'labelName',emitPath:false }"
+                    popper-class="cascader-filterable-hazardCheckPro"
                     filterable>
                     <template slot-scope="{data}">
                       <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">
@@ -270,6 +271,7 @@
                       placeholder="请选择检查项"
                       :options="options"
                       :props="{ checkStrictly: false, value: 'id', label: 'labelName',emitPath:false }"
+                      popper-class="cascader-filterable-hazardCheckPro"
                       filterable>
                       <template slot-scope="{data}">
                         <el-tooltip :content="data.labelName" v-if="data.labelName.length>22">