Merge remote-tracking branch 'origin/dev20230707' into dev20230707

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

@@ -329,9 +329,9 @@ export default {
         if(this.provinceId.length >= 2){
           item.areaId=this.provinceId[2]
         }
-        if(this.dataQuery.id){
-          item.id=this.dataQuery.id
-        }
+        // if(this.dataQuery.id){
+        //   item.id=this.dataQuery.id
+        // }
         this.compareList.splice(0,1,item);
         this.value1Flag=true
         this.addressValue1=this.dataQuery.province.join('-')
@@ -472,9 +472,9 @@ export default {
           if(code.length >= 3){
             item.areaId=code[2]
           }
-          if(this.dataQuery.id){
-            item.id=this.dataQuery.id
-          }
+          // if(this.dataQuery.id){
+          //   item.id=this.dataQuery.id
+          // }
           this.compareList.splice(index-1,1,item);
 
           let list=[];

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

@@ -74,14 +74,30 @@ export default {
       this.provinceId.push(this.dataQuery.provinceId)
     }else {
       location({}).then(res => {
-        this.province=res.data.province;
+        if(res.data.area){
+          this.province=res.data.area
+        }else {
+          if(res.data.city){
+            this.province=res.data.city
+          }else {
+            this.province=res.data.province
+          }
+        }
         if(!this.dataQuery.provinceId){
-          this.dataQuery.provinceId=res.data.provinceId
+          if(res.data.areaId){
+            this.dataQuery.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
+            this.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
+          }else {
+            if(res.data.cityId){
+              this.provinceId=[res.data.provinceId,res.data.cityId]
+            }else {
+              this.provinceId=[res.data.provinceId]
+            }
+          }
           let arr=[res.data.province]
           this.dataQuery.province=arr;
-          this.provinceId.push(res.data.provinceId)
         }else {
-          this.provinceId.push(this.dataQuery.provinceId)
+          this.provinceId=this.dataQuery.provinceId
         }
       })
     }

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

@@ -3,7 +3,7 @@
     <Region v-if="province" :province="province" :dataQuery="dataQuery" @addressListbtn="addressListbtn"></Region>
     <div class="content">
       <div class="common-title">专项债项目</div>
-      <div class="content-box">
+      <div class="content-box" v-if="!state">
         <div class="box-left">
           <div id="echarts" style="height: 400px"></div>
         </div>
@@ -27,6 +27,12 @@
           </el-table>
         </div>
       </div>
+      <div class="content-box" v-else>
+        <div class="empty">
+          <img class="img" src="@/assets/images/project/empty.png">
+          <div class="p1">抱歉，暂无专项债项目数据</div>
+        </div>
+      </div>
     </div>
     <div class="content">
       <div class="common-title flex-box">
@@ -98,28 +104,45 @@ export default {
       MaxPage:1000,
       dataQuery:{},
       province:'',
-      provinceId:[]
+      provinceId:[],
+      state:false,
     }
   },
   created() {
     location({}).then(res => {
-      this.province=res.data.province;
+      if(res.data.area){
+        this.province=res.data.area
+      }else {
+        if(res.data.city){
+          this.province=res.data.city
+        }else {
+          this.province=res.data.province
+        }
+      }
       if(!this.dataQuery.provinceId){
-        this.dataQuery.provinceId=res.data.provinceId
+        if(res.data.areaId){
+          this.dataQuery.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
+          this.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
+        }else {
+          if(res.data.cityId){
+            this.provinceId=[res.data.provinceId,res.data.cityId]
+          }else {
+            this.provinceId=[res.data.provinceId]
+          }
+        }
         let arr=[res.data.province]
         this.dataQuery.province=arr;
-        this.provinceId.push(res.data.provinceId)
       }else {
-        this.provinceId.push(this.dataQuery.provinceId)
+        this.provinceId=this.dataQuery.provinceId
       }
+      this.$nextTick(() => {
         this.getData()
         this.getStatistics()
       })
+    })
   },
   mounted() {
-    this.$nextTick(() => {
 
-    })
   },
   methods: {
     getData(){
@@ -184,15 +207,27 @@ export default {
           return  New.value - old.value
         })
         let data=[]
+        if(arr.length >= 10){
           for(let i=0; i<10; i++){
             data.push(arr[i])
           }
+        }else {
+          for(let i=0; i<arr.length; i++){
+            data.push(arr[i])
+          }
+        }
+        this.total=this.tableData.length;
+        if(this.tableData.length > 0){
+          this.state=false;
           this.initChart(data)
+        }else {
+          this.state=true;
+        }
       })
     },
     initChart(data) {
+      this.$nextTick(() => {
         let myChart = echarts.init(document.getElementById("echarts"))
-
         let option ={
           tooltip: {
             trigger: 'item',
@@ -235,6 +270,8 @@ export default {
           ]
         }
         myChart.setOption(option);
+      })
+
     },
     formatStatus: function(row, column, cellValue) {
       return cellValue? cellValue : '-'
@@ -396,6 +433,26 @@ export default {
       .box-left{
         width: 55%;
       }
+      .empty{
+        margin: 0 auto;
+        height: 550px;
+        text-align: center;
+        .img{
+          width: 108px;
+          height: 108px;
+          margin-bottom: 24px;
+          margin-top: 150px;
+        }
+        .p1{
+          color: #333333;
+          font-size: 16px;
+        }
+        .p2{
+          color: #999999;
+          font-size: 14px;
+          margin-top: 8px;
+        }
+      }
       .box-right{
         float: right;
         ::v-deep .el-table{

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

@@ -7,7 +7,7 @@
         </div>
       </div>
       <div class="text">{{value}}全国项目招标数量达到{{totalCount}}万个，招标数量前五的地区分别是
-        {{tableData[0].type}}（{{tableData[0].count}}个）、{{tableData[1].type}}（{{tableData[1].count}}个）、{{tableData[2].type}}（{{tableData[2].count}}个）、{{tableData[3].type}}（{{tableData[3].count}}个）、{{tableData[4].type}}（{{tableData[4].count}}个）。</div>
+        {{tableData[1].type}}（{{tableData[1].count}}个）、{{tableData[2].type}}（{{tableData[2].count}}个）、{{tableData[3].type}}（{{tableData[3].count}}个）、{{tableData[4].type}}（{{tableData[4].count}}个）、{{tableData[5].type}}（{{tableData[5].count}}个）。</div>
       <div class="main1">
         <div id="zb-echarts" style="height: 250px"></div>
         <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为{{value}}全国公开的招标项目，未公开的不含在内</p>

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

@@ -247,7 +247,7 @@
       <div>认领成功，是否完善客户信息？</div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="innerVisible = true">
-          <router-link :to="`/enterprise/${encodeStr(companyId)}?customerId=${customerId}`" tag="a" >
+          <router-link :to="`/enterprise/${encodeStr(companyId)}?customerId=${customerId}&path=business`" tag="a" >
             立即完善
           </router-link>
         </el-button>
@@ -359,7 +359,6 @@ export default {
     this.dataRegion()
     this.getType()
     this.dataQuery=this.$route.query;
-    console.log(this.dataQuery)
     if(this.dataQuery.provinceId){
       if(Array.isArray(this.dataQuery.province)){
         this.province=this.dataQuery.province[0];
@@ -372,18 +371,35 @@ export default {
       }else {
         this.provinceId.push(this.dataQuery.provinceId)
       }
-
       this.querySubmit()
     }else {
       location({}).then(res => {
-        this.province=res.data.province;
+        if(res.data.area){
+          this.province=res.data.area
+        }else {
+          if(res.data.city){
+            this.province=res.data.city
+          }else {
+            this.province=res.data.province
+          }
+        }
         if(!this.dataQuery.provinceId){
-          this.dataQuery.provinceId=res.data.provinceId
+          if(res.data.areaId){
+            this.dataQuery.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
+            this.provinceId=[res.data.provinceId,res.data.cityId,res.data.areaId]
+          }else {
+            if(res.data.cityId){
+              this.provinceId=[res.data.provinceId,res.data.cityId]
+            }else {
+              this.provinceId=[res.data.provinceId]
+            }
+          }
+
           let arr=[res.data.province]
           this.dataQuery.province=arr;
-          this.provinceId.push(res.data.provinceId)
+
         }else {
-          this.provinceId.push(this.dataQuery.provinceId)
+          this.provinceId=this.dataQuery.provinceId
         }
       })
       this.querySubmit()
@@ -408,7 +424,6 @@ export default {
     },
     // 查询提交
     async querySubmit() {
-      console.log(this.provinceId,"||||")
       this.tableLoading = true
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize,type:Number(this.queryParams.radio)}
       const param={}
@@ -839,6 +854,9 @@ export default {
           /*::v-deep .el-input{*/
             width: 260px;
             height: 32px;
+            .el-input__inner:focus{
+              border-color: #e0e0e0;
+            }
             .el-input-group__prepend:first-child{
               padding: 0;
               background-color:#ffffff;