zhuliu 1 рік тому
батько
коміт
d3b40b36b9

+ 1 - 1
src/App.vue

@@ -183,7 +183,7 @@ html, body, #app {
   }
 }
 .scrollable {-webkit-overflow-scrolling: touch;}
-::-webkit-scrollbar {width: 5px;height: 5px;}
+::-webkit-scrollbar {width: 8px;height: 8px;}
 ::-webkit-scrollbar-thumb {background-color: rgba(50, 50, 50, 0.3);}
 ::-webkit-scrollbar-thumb:hover {background-color: rgba(50, 50, 50, 0.6);}
 ::-webkit-scrollbar-track {background-color: rgba(50, 50, 50, 0.1);}

+ 4 - 3
src/utils/model/tree/index.vue

@@ -11,8 +11,8 @@
               
             >
             <span :style="{visibility:(item[props.children] && item[props.children].length)? '':'hidden'}">
-              <i class="iconfont icon-zhankai-zhijiao" v-if="!openArr.includes(item[nodeKey])"></i>
-                <i class="iconfont icon-shouqi-zhijiao" v-else></i>  
+              <i class="iconfont icon-zhankai-zhijiao " style="background-color: white;" v-if="!openArr.includes(item[nodeKey])"></i>
+                <i class="iconfont icon-shouqi-zhijiao" style="background-color: white;" v-else></i>  
             </span>
             </div>
             <div :id="'right' + item.sort">
@@ -180,7 +180,7 @@
   li {
     list-style-type: none;
     padding: 4px;
-    user-select: none;
+    // user-select: none;
   }
   input[type="checkbox"] {
     position: relative;
@@ -255,6 +255,7 @@
     display: inline-block;
     width: 30px;
     height: 30px;
+    line-height: 30px;
     z-index: 10;
     margin-right: 4px;
     margin-left:-20px;

+ 1 - 1
src/views/project/patentCollection/components/views/Table.vue

@@ -21,7 +21,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column v-for="item in column.filter(item => !item.ifHidden)"
+      <el-table-column v-for="item in column.filter(item => !item.ifHidden)" :width="['abstractStr'].indexOf(item.value)!=-1?'500':'auto'" min-width="200"
         :render-header="$commonJS.renderHeaderMethods" :key="item.value" :prop="item.field" :label="item.name"
         :sortable="item.ifSort?'custom':false" align="center">
         <template slot-scope="scope">

+ 3 - 3
src/views/report/components/patentList/components/customFields/index.vue

@@ -283,9 +283,9 @@ export default {
             this.$set(row, 'nums', nums)
           } else {
             var type = {
-              7: '2',
-              8: '1',
-              9: '3'
+              7: '2',//2产品
+              8: '1',//1产品类别
+              9: '3'// 3技术分类
             }
             const [num,option] = await Promise.allSettled([this.esCountAnalysis(row),this.queryProductCategory(row,type[row.filedKind])])
             var nums = num.status == 'fulfilled' ? num.value.detailDTOS : []