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

dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue

@@ -166,7 +166,7 @@ export default {
           }
         },
         grid:{
-          left:'1',
+          left:'1%',
           top:'8%',
           right:'5%',
           bottom:'8%',

dsk-operate-ui/src/views/detail/party-a/overview/execuinfo.vue

@@ -10,6 +10,7 @@
     <tables
       :tableLoading="tableLoading"
       :tableData="tableData"
+      :tableDataTotal="tableDataTotal"
       :forData="forData"
       :isIndex="false"
       :queryParams="queryParams"

dsk-operate-ui/src/views/macro/component/skeleton.vue

+<template>
+  <el-skeleton  animated>
+    <template slot="template">
+      <el-skeleton-item variant="text" style="width: 60%;"/>
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 60%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+    </template>
+  </el-skeleton>
+</template>
+
+<script>
+  export default {
+    name: 'skeleton'
+  }
+</script>
+
+<style lang="scss" scoped>
+.el-skeleton__item{
+  height: 20px;
+  border-radius: 0;
+  margin: 9px 0;
+  background: #f0f0f0;
+}
+</style>

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

@@ -164,9 +164,9 @@ export default {
             list.push(item);
           }
           this.data=list;
-          if(list.length > 0){
+          // if(list.length > 0){
             this.initChart()
-          }
+          // }
         }
       })
     },

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

@@ -7,57 +7,57 @@
           <div class="item-title"><i style="background: #4E8EFF;"></i>{{recentlyYear.year}}年GDP</div>
           <div class="item-count">
             <span>{{recentlyYear.gdp}}</span>亿
-            <img v-if="Number(getMoneyNum(recentlyYear.gdpGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.gdpCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsGDP" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(recentlyYear.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowth).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.gdpCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpCompare}}亿</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpCompare).toString().substring(1)}}亿</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div>
           <div class="item-count">
             <span>{{recentlyYear.gdpGrowth}}</span>%
-            <img v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.gdpGrowthCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsZS" style="height: 75px;"></div>
-          <div class="item-text up" v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowthCompare).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.gdpGrowthCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowthCompare).toString().substring(1)}}%</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
           <div class="item-count">
             <span>{{recentlyYear.population}}</span>万
-            <img v-if="Number(getMoneyNum(recentlyYear.populationGrowthRate)) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.populationCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsRK" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(recentlyYear.populationGrowthRate) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationGrowthRate}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.populationGrowthRate).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.populationCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationCompare}}万</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.populationCompare).toString().substring(1)}}万</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div>
           <div class="item-count">
             <span>{{recentlyYear.gbr}}</span>亿
-            <img v-if="Number(getMoneyNum(recentlyYear.gbrGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.gbrCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsSR" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(recentlyYear.gbrGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrGrowth}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrGrowth).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.gbrCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrCompare}}亿</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrCompare).toString().substring(1)}}亿</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div>
           <div class="item-count">
             <span>{{recentlyYear.govDebtBalance}}</span>亿
-            <img v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.govDebtBalanceCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsYE" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))">
-            较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.govDebtBalanceCompare) > 0">
+            较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}亿</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.govDebtBalanceCompare).toString().substring(1)}}亿</span></div>
         </div>
       </div>
     </div>

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

@@ -24,16 +24,16 @@
         </el-input>
         <span class="total">共{{tableDataTotal}}条</span>
       </div>
+      <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
       <div class="table-item">
         <el-table
-          v-loading="tableLoading"
           :data="tableData"
           element-loading-text="Loading"
           border
           fit
           @sort-change="sortChange"
           highlight-current-row
-          v-if="tableDataTotal > 0"
+          v-if="tableDataTotal > 0 && !isSkeleton"
           :default-sort = "{prop: 'skyCount', order: 'descending'}"
         >
           <el-table-column label="序号" width="60" align="left" fixed>
@@ -69,7 +69,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <div class="empty" v-if="tableDataTotal === 0">
+        <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，没找到相关数据</div>
           <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
@@ -92,10 +92,10 @@
   import aptitudeCode from '@/assets/json/aptitudeCode'
   import { enterprise,location,getUipIdByCid } from '@/api/macro/macro'
   import Region from '../component/region'
-
+  import skeleton from '../component/skeleton'
 export default {
   name: 'Enterprises',
-  components: {Region},
+  components: {Region,skeleton},
   data() {
     return {
       encodeStr,
@@ -124,6 +124,7 @@ export default {
       provinceId:'',
       show_page:true,
       MaxPage:500,
+      isSkeleton:true
     }
   },
   created() {
@@ -166,6 +167,7 @@ export default {
       this.aptitudeCodeList=aptitudeCode
     },
     async querySubmit(){
+      this.isSkeleton = true;
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize}
       if(this.queryParams.field){
         params.field=this.queryParams.field
@@ -192,6 +194,7 @@ export default {
         params.aptitudeQueryDto.aptitudeDtoList=aptitudeType
       }
       enterprise(params).then(res => {
+        this.isSkeleton = false
         if(res.code === 200){
           this.tableData=res.data.list;
           this.tableDataTotal=res.data.total;

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

@@ -28,16 +28,16 @@
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
+      <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
       <div class="table-item">
         <el-table
-          v-loading="tableLoading"
           class="fixed-table"
           :data="tableData"
           element-loading-text="Loading"
           @sort-change="sortChange"
           border
           highlight-current-row
-          v-if="tableDataTotal > 0"
+          v-if="tableDataTotal > 0 && !isSkeleton"
           :default-sort = "{prop: 'gdp', order: 'descending'}"
         >
           <el-table-column label="序号" width="60" align="left" fixed>
@@ -96,7 +96,7 @@
           <el-table-column label="社会消费品零售总额（亿元）" prop="trscg" :formatter="formatStatus" width="160" align="right"></el-table-column>
           <el-table-column label="城镇居民人均可支配收入（元）" prop="urbanPcdi" :formatter="formatStatus" width="160" align="right"></el-table-column>
         </el-table>
-        <div class="empty" v-if="tableDataTotal === 0">
+        <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，没找到相关数据</div>
           <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
@@ -117,11 +117,12 @@
   import { nationalPage,getYears } from '@/api/macro/macro'
   import dataRegion from '@/assets/json/dataRegion'
   import economiesDetail from './economies-detail'
+  import skeleton from '../../component/skeleton'
   import axios from 'axios'
   export default {
     name: 'NationalEconomies',
     components: {
-      economiesDetail
+      economiesDetail,skeleton
     },
     data() {
       return {
@@ -142,7 +143,8 @@
         pageSize: 20,
         tableDataTotal: null,
         show_page:true,
-        MaxPage:500
+        MaxPage:500,
+        isSkeleton:true
       }
     },
     created() {
@@ -227,7 +229,7 @@
       },
       // 查询提交
       async querySubmit() {
-        this.tableLoading = true
+        this.isSkeleton = true
         const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:1 }
         if(this.queryParams.address){
           let arr = this.$refs.address.getCheckedNodes();
@@ -272,7 +274,7 @@
         }
 
         nationalPage(params).then(res => {
-          this.tableLoading = false
+          this.isSkeleton = false
           this.tableData = res.data.list;
           this.tableDataTotal = res.data.totalCount
         })

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

@@ -144,8 +144,9 @@
           <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
+      <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
       <div class="table-item">
-        <div v-if="tableDataTotal > 0">
+        <div v-if="tableDataTotal > 0  && !isSkeleton">
           <el-table
             v-loading="tableLoading"
             :data="tableData"
@@ -234,7 +235,7 @@
             <!--<el-table-column prop="bl" label="开发区类别" width="160" />-->
           </el-table>
         </div>
-        <div class="empty" v-if="tableDataTotal === 0">
+        <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，没找到相关数据</div>
           <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
@@ -282,6 +283,7 @@
 
 <script>
   import {encodeStr} from "@/assets/js/common.js"
+  import skeleton from '../component/skeleton'
   import dataRegion from '@/assets/json/dataRegion'
   import api from '@/api/enterpriseData/enterpriseData.js';
   import elementResizeDetectorMaker from "element-resize-detector"
@@ -291,7 +293,7 @@
 export default {
   name: 'Urban',
   components: {
-    Region
+    Region,skeleton
   },
   data() {
     return {
@@ -336,7 +338,7 @@ export default {
       dataQuery:{},
       province:'',
       provinceId:[],
-      fixed: false,
+      isSkeleton:true
     }
   },
   watch:{
@@ -452,7 +454,8 @@ export default {
     },
     // 查询提交
     async querySubmit() {
-      this.tableLoading = true
+      // this.tableLoading = true;
+      this.isSkeleton = true
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize,type:Number(this.queryParams.radio)}
       const param={}
       // if(this.queryParams.address.length > 0){
@@ -529,7 +532,7 @@ export default {
       }
 
       urbanInvestmentPage(params).then(res => {
-        this.tableLoading = false
+        this.isSkeleton = false
         this.tableData = res.data.list;
         this.tableDataTotal = res.data.totalCount
       })

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -359,28 +359,20 @@ export default {
 	      value: "今天",
 	    },
 	    {
-	      label: "近3日",
-	      value: "近3日",
-	    },
-	    {
-	      label: "近7日",
-	      value: "近7日",
-	    },
-	    {
-	      label: "近1个月",
-	      value: "近1个月",
+	      label: "未来3天",
+	      value: "未来3天",
 	    },
 	    {
-	      label: "近3个月",
-	      value: "近3个月",
+	      label: "未来7天",
+	      value: "未来7天",
 	    },
 	    {
-	      label: "近半年",
-	      value: "近半年",
+	      label: "未来1个月",
+	      value: "未来1个月",
 	    },
 	    {
-	      label: "近1年",
-	      value: "近1年",
+	      label: "未来3个月",
+	      value: "未来3个月",
 	    },
 	  ],
 	  PlanTenderDateValue: "",
@@ -746,58 +738,30 @@ export default {
 	        startTime = Year + "-" + Month +"-" + Day;
 	        endTime = Year + "-" + Month + "-" + Day;
 	        break;
-	      case "近3日":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Day > 3) {
-	          startTime = Year + "-" + Month  + "-" +(Day-3);
-	        } else {
-	          let newTime = datetime.getTime()-3*24*60*60*1000
-	          Year = new Date(newTime).getFullYear();
-	          Month = new Date(newTime).getMonth() + 1;
-	          Day = new Date(newTime).getDate();
-	          startTime = Year + "-" + Month +"-" + Day;
-	        }
+	      case "未来3天":
+		  	startTime = Year + "-" + Month + "-" + Day;
+			endTime = this.getDate(3)
 	        break;
-	      case "近7日":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Day > 7) {
-	          startTime = Year + "-" + Month  + "-" +(Day-7);
-	        } else {
-	          let newTime = datetime.getTime()-7*24*60*60*1000
-	          Year = new Date(newTime).getFullYear();
-	          Month = new Date(newTime).getMonth() + 1;
-	          Day = new Date(newTime).getDate();
-	          startTime = Year + "-" + Month +"-" + Day;
-	        }
-	        break;
-	      case "近1个月":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Month > 1) {
-	          startTime = Year + "-" + (Month - 1) + "-1";
-	        } else {
-	          startTime = Year - 1 + "-" + (12 + Month - 1) + "-1";
-	        }
+	      case "未来7天":
+			startTime = Year + "-" + Month + "-" + Day;
+			endTime = this.getDate(7)
 	        break;
-	      case "近3个月":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Month > 3) {
-	          startTime = Year + "-" + (Month - 3) + "-1";
+	      case "未来1个月":
+		  	startTime = Year + "-" + Month + "-" + Day;
+	        if (Month == 12) {
+				endTime = Year+1 + "-01-" +  + Day;
 	        } else {
-	          startTime = Year - 1 + "-" + (12 + Month - 3) + "-1";
+				endTime = Year + "-" + (Month + 1) + "-" + Day;
 	        }
 	        break;
-	      case "近半年":
-	        endTime = Year + "-" + Month + "-" + Day;
-	        if (Month > 6) {
-	          startTime = Year + "-" + (Month - 6) + "-1";
+	      case "未来3个月":
+			startTime = Year + "-" + Month + "-" + Day;
+	        if (Month >9) {
+				endTime = Year+1 + "-" + Month-9 + "-" +  + Day;
 	        } else {
-	          startTime = Year - 1 + "-" + (12 + Month - 6) + "-1";
+				endTime = Year + "-" + (Month + 3) + "-" + Day;
 	        }
 	        break;
-	      case "近1年":
-	        startTime = Year - 1 + "-" + Month + "-" + Day;
-	        endTime = Year + "-" + Month + "-" + Day;
-	        break;
 	      case "自定义":
 	        if (!this.PlanTenderDate) {
 	          this.PlanTenderDateValue = "";
@@ -839,6 +803,13 @@ export default {
 	  }
 	  this.jskBidPlanDto = obj;
 	},
+	getDate(n){
+		let date1 = new Date();
+		let date2 = new Date(date1);
+		date2.setDate(date1.getDate() + n);
+		let time2 = date2.getFullYear() + "-" + ("0" + (date2.getMonth() + 1)).slice(-2) + "-" + ("0" + date2.getDate()).slice(-2);
+		return time2
+	},
 	changeIssueTime(type) {
 	  if(type=='bid'&&this.tenderDate){
 	    this.tenderDateValue = "自定义";