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

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

@@ -229,15 +229,15 @@ li {
 .app-main {
   position: relative;
   background-color: #f5f5f5;
-  // >div{
-  //   width: calc(100% - 48px);
-  // }
+   >div{
+     width: calc(100% - 48px);
+   }
 }
 .app-container {
-  padding: 16px 24px;
+  margin: 16px 24px;
   background-color: #f5f5f5;
   box-sizing: border-box;
-  width: 100%;
+  //width: 100%;
   .el-input__inner {
     border-color: #d9d9d9;
     color: #232323;

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

@@ -320,16 +320,16 @@
       this.dataRegion()
       this.yearsData()
       this.getCountBidByType()
-      setTimeout(() => {
-
-      }, 1000);
     },
     mounted() {
       this.getCountBidGroupByProvince()
       this.getRangeBidMoney()
       this.getRangeBidFiveYears()
       this.getLowerRateByYear()
+      setTimeout(() => {
         this.getLowerRangeTenderType()
+      }, 1000);
+
     },
     beforeDestroy(){
 

dsk-operate-ui/vue.config.js

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