修改

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

@@ -13,7 +13,9 @@
         </el-col>
         <el-col :span="8">
           <div class="user" @click="handleChange">
-            <h3>{{nickName}}<span>总经理</span></h3>
+            <h3>{{nickName}}
+              <!--<span>总经理</span>-->
+            </h3>
             <p>您好，祝您工作顺利每一天</p>
           </div>
         </el-col>
@@ -345,7 +347,9 @@
         <el-col :span="6">
           <div class="content-right">
             <div class="user" @click="handleChange">
-              <h3>李婷婷<span>营销员</span></h3>
+              <h3>李婷婷
+                <!--<span>营销员</span>-->
+              </h3>
               <p>您好，祝您工作顺利每一天</p>
             </div>
             <div class="search">

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

@@ -39,6 +39,10 @@
       }
       .el-tabs__header{
         margin: 0;
+        position: sticky;
+        top: 104px;
+        z-index: 999;
+        background: #fff;
         .el-tabs__item{
           padding: 0 16px;
           font-size: 16px;

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

@@ -422,13 +422,13 @@
           overflow:visible;
           .el-table__header-wrapper{
             position: sticky;
-            top:56px;
+            top:104px;
             z-index: 9;
           }
           .el-table__fixed-header-wrapper{
             position: sticky;
             z-index: 9;
-            top: 56px;
+            top: 104px;
           }
           .el-table__fixed{
             overflow-x: clip;

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

@@ -422,20 +422,20 @@
         }
         lowerRangeTenderType(params).then(res => {
           this.xmlxState=false;
-          for (var i=0; i<res.data.length; i++){
-            for (let j=0; j<res.data[i].typeList.length; j++){
-              if(res.data[i].typeList[j].tenderType === '施工'){
-                res.data[i].sgRate=res.data[i].typeList[j].rate.toFixed(2)
+          for (var i=0; i<res.data.result.length; i++){
+            for (let j=0; j<res.data.result[i].typeList.length; j++){
+              if(res.data.result[i].typeList[j].tenderType === '施工'){
+                res.data.result[i].sgRate=res.data.result[i].typeList[j].rate.toFixed(2)
               }
-              if(res.data[i].typeList[j].tenderType === '勘察设计'){
-                res.data[i].kcsjRate=res.data[i].typeList[j].rate.toFixed(2)
+              if(res.data.result[i].typeList[j].tenderType === '勘察设计'){
+                res.data.result[i].kcsjRate=res.data.result[i].typeList[j].rate.toFixed(2)
               }
-              if(res.data[i].typeList[j].tenderType === '监理'){
-                res.data[i].jlRate=res.data[i].typeList[j].rate.toFixed(2)
+              if(res.data.result[i].typeList[j].tenderType === '监理'){
+                res.data.result[i].jlRate=res.data.result[i].typeList[j].rate.toFixed(2)
               }
             }
           }
-          this.xmxflList=res.data;
+          this.xmxflList=res.data.result;
           if(this.xmxflList){
             this.$nextTick(() => {
               this.initChart6(this.xmxflList)

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

@@ -80,6 +80,9 @@ export default {
       background: #FFFFFF;
       border-radius: 4px;
       color: #232323;
+      position: sticky;
+      top: 56px;
+      z-index: 999;
       ::v-deep .el-tabs{
         height: 48px;
         line-height: 48px;

dsk-operate-ui/vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://139.9.157.49:9099/prod-api`,//测试
+        target: `http://47.104.91.229:9099/prod-api`,//测试
         // target: `http://localhost:9099`,//测试
         // target: `http://122.9.160.122:9011`,  //线上
         // target: `http://192.168.0.165:9098`,//施