项目概览

dsk-operate-ui/src/views/detail/party-a/dealings/component/customDetail.vue

@@ -14,7 +14,9 @@
         :amountTotal="amountTotal"
         @handle-search="handleSearch"
       />
+      <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
+        v-else
         :indexFixed="true"
         :tableLoading="tableLoading"
         :tableData="tableData"
@@ -39,6 +41,7 @@
 import mixin from '../../mixins/mixin'
 import {clientProjectPage,getSelect,bidWinMergeDetail} from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
+import skeleton from '@/views/project/projectList/component/skeleton'
 
 export default {
   props: [
@@ -47,12 +50,13 @@ export default {
     'title'
   ],
   components: {
-    HeadDetailForm
+    HeadDetailForm,skeleton
   },
   mixins: [mixin],
   data() {
     return {
       drawer: false,
+      isSkeleton:true,
       queryParams: {
         cid: this.companyId,
         companyId: this.data.companyId,
@@ -113,6 +117,7 @@ export default {
       if(res.code==200){
         this.tableData = res.rows
       }
+      this.isSkeleton = false;
       this.tableDataTotal = res.total
       this.amountTotal = res.totalAmount
     },

dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue

@@ -14,7 +14,9 @@
         :amountTotal="amountTotal"
         @handle-search="handleSearch"
       />
+      <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
+        v-else
         :indexFixed="true"
         :tableLoading="tableLoading"
         :tableData="tableData"
@@ -39,6 +41,7 @@
 import mixin from '../../mixins/mixin'
 import { supplierProjectPage,getSelect,bidWinMergeDetail } from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
+import skeleton from '@/views/project/projectList/component/skeleton'
 
 export default {
   props: [
@@ -47,11 +50,12 @@ export default {
     'title'
   ],
   components: {
-    HeadDetailForm
+    HeadDetailForm,skeleton
   },
   mixins: [mixin],
   data() {
     return {
+      isSkeleton:true,
       drawer: false,
       queryParams: {
         companyId: this.data.companyId,
@@ -113,6 +117,7 @@ export default {
       if(res.code==200){
         this.tableData = res.rows
       }
+      this.isSkeleton = false;
       this.tableDataTotal = res.total
       this.amountTotal = res.totalAmount
     },

dsk-operate-ui/src/views/detail/party-a/dealings/custom.vue

@@ -130,7 +130,7 @@ export default {
     handleClick(e, data) {
       this.rowData = data
       this.isDetails = true;
-      this.title = '与客户'+data.companyName+'合作记录'
+      this.title = '与客户'+data.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,'')+'合作记录'
     },
     handleDetail(row){
       if(row.sourceUrl){

dsk-operate-ui/src/views/detail/party-a/dealings/supplier.vue

@@ -124,7 +124,7 @@ export default {
     handleClick(e, data) {
       this.rowData = data
       this.isDetails = true
-      this.title = '与供应商'+data.companyName+'合作记录'
+      this.title = '与供应商'+data.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,'')+'合作记录'
     },
     handleDetail(row){
       if(row.sourceUrl){

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

@@ -342,6 +342,7 @@
   import * as echarts from 'echarts'
   import addproject from '../projectList/component/addProject'
   import NoData from '../../component/noData'
+  import '@/assets/lib/china.js'
 
 export default {
   name: 'Overview',
@@ -473,9 +474,11 @@ export default {
       countGroupByProvince(data).then(res=>{
         if(res.code==200){
           this.viewData4 = res.data;
-          console.log(this.viewData4)
+          
           if(this.viewData4.length>0){
-            res.data.map(item=>{
+            this.viewData4.map(item=>{
+              item.name = item.type
+              item.value = {count:item.count}
               item.select = {
                 itemStyle:{
                   areaColor: '#0081FF',
@@ -486,9 +489,11 @@ export default {
                   }
                 }
             })
-            let chartDom1 = document.getElementById("drawChinese")
-              this.myChart4 = echarts.init(chartDom1)
+            this.$nextTick(()=>{
+          console.log(this.viewData4)
+
               this.initChart4()
+            })
           }
         }
       })
@@ -722,15 +727,18 @@ export default {
     },
     //中国地图
     initChart4(){
+      let chartDom1 = document.getElementById("drawChinese")
+      this.myChart4 = echarts.init(chartDom1)
       let _this = this
       // 指定图表的配置项和数据
       // 绘制图表
       let options = {
         tooltip: {
           trigger: 'item',
-          show: false,
+          show: true,
           formatter: function(params) {
-            return params.type + '：' + params.count
+            console.dir(params )
+            return `${params.value}`
           }
         },
         // 左侧小导航图标
@@ -749,6 +757,7 @@ export default {
           mapType: 'china',
           roam: false,
           zoom: 1.2,
+          
           label: {
             normal: {
               show: false, // 省份名称
@@ -1183,6 +1192,7 @@ export default {
         height: 360px;
         margin-top: -30px;
         position: relative;
+        margin: 0 auto;
         .nhzd{
           width: 50px;
           height: auto;

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

@@ -282,15 +282,7 @@
 							<img src="@/assets/images/addree.png" alt="">
 							<p class="list-content-text"  v-if="item.province||item.city||item.area">
 								<span>行政区划：</span>
-								<span >
-									 {{item.province}}
-								   <template v-if="item.city">
-									  -{{item.city}}
-								   </template>
-								   <template v-if="item.area">
-								   	  -{{item.area}}
-								   </template>
-								</span>
+								<span >{{item.province}}<template v-if="item.city">-{{item.city}}</template><template v-if="item.area">-{{item.area}}</template></span>
 							</p>
 							<p class="list-content-text"  v-if="item.landAddr">
 								<span>土地坐落：</span>