Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/package.json

@@ -41,6 +41,7 @@
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
     "echarts": "^5.0.0",
+    "el-table-horizontal-scroll": "^1.2.5",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",

dsk-operate-ui/src/assets/styles/index.scss

@@ -407,6 +407,18 @@ ul, li {
         background: #566380;
       }
     }
+    .el-scrollbar{
+      height: 16px;
+      .el-scrollbar__bar.is-horizontal{
+        height: 8px;
+      }
+      .el-scrollbar__thumb{
+        background: rgba(98,110,126,0.4);
+        &:hover{
+          background: #566380;
+        }
+      }
+    }
   }
 
 }

dsk-operate-ui/src/main.js

@@ -13,7 +13,7 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
-
+import horizontalScroll from 'el-table-horizontal-scroll'
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -59,6 +59,7 @@ Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 
+Vue.use(horizontalScroll)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)

dsk-operate-ui/src/views/index.vue

@@ -191,7 +191,7 @@
                 <div class="list-content">
                   <p class="list-content-text">
                     <span>中标企业：</span>
-                    <span><router-link :to="`/enterprise/${encodeStr(item.jskEid)}`" tag="a" class="a-link companyName" v-html="item.ename" ></router-link></span>
+                    <span @click="getUipIdByCid(item.jskEid)" class="a-link companyName">{{item.ename}}</span>
                   </p>
                   <p class="list-content-text">
                     <span>中标金额：</span>

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -111,10 +111,10 @@ export default {
         params.provinceIds=[this.provinceId[0]]
       }
       if(this.provinceId.length > 1){
-        params.cityId=[this.provinceId[1]]
+        params.cityIds=[this.provinceId[1]]
       }
       if(this.provinceId.length > 2){
-        params.areaId=[this.provinceId[2]]
+        params.areaIds=[this.provinceId[2]]
       }
       // params.provinceIds=[this.dataQuery.provinceId]
       // this.isSkeleton = true

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -29,12 +29,14 @@
         </div>
       </div>
       <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+      <!--v-horizontal-scroll="'always'"-->
       <div class="table-item">
         <el-table
           class="fixed-table"
           :data="tableData"
           element-loading-text="Loading"
           @sort-change="sortChange"
+          max-height="640"
           border
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"