소스 검색

Merge branch '3.3.3-AnQuanJianCha' into web-v2-temp

dedsudiyu 1 년 전
부모
커밋
101d0d9ce6
3개의 변경된 파일11개의 추가작업 그리고 0개의 파일을 삭제
  1. 9 0
      src/assets/styles/ZDelement.scss
  2. 1 0
      src/views/safetyCheck/components/addPage/addPage.vue
  3. 1 0
      src/views/safetyCheck/startInspection/index.vue

+ 9 - 0
src/assets/styles/ZDelement.scss

@@ -503,3 +503,12 @@
   height:30px;
   padding:0;
 }
+/************ cascader内容过长 ***********/
+.cascader-filterable-hazardCheckPro{
+  width:898px;
+  span{
+    height:34px;
+    line-height: 34px;
+    overflow: hidden;
+  }
+}

+ 1 - 0
src/views/safetyCheck/components/addPage/addPage.vue

@@ -95,6 +95,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">

+ 1 - 0
src/views/safetyCheck/startInspection/index.vue

@@ -148,6 +148,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">