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

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

@@ -27,8 +27,8 @@
               <el-table-column label="序号" width="60">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
-              <el-table-column prop="type" label="年份" width="200" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="招标数量（个）" align="right" :formatter="formatStatus" sortable width="200" />
+              <el-table-column prop="type" label="年份" width="220" :formatter="formatStatus"/>
+              <el-table-column prop="count" label="招标数量（个）" align="right" :formatter="formatStatus" sortable width="220" />
             </el-table>
           </div>
         </div>
@@ -64,7 +64,7 @@
               <el-table-column label="序号" width="60">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
-              <el-table-column prop="province" label="地区" width="200" :formatter="formatStatus"/>
+              <el-table-column prop="province" label="地区" width="120" :formatter="formatStatus"/>
               <el-table-column prop="count" label="招标数量 (个)" align="right" :formatter="formatStatus" sortable width="160" />
               <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
             </el-table>
@@ -103,7 +103,7 @@
               <el-table-column label="序号" width="60">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
-              <el-table-column prop="label" label="时间" width="200" :formatter="formatStatus"/>
+              <el-table-column prop="label" label="时间" width="120" :formatter="formatStatus"/>
               <el-table-column prop="count" label="招标数量（个）" align="right" :formatter="formatStatus" sortable width="160" />
               <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
             </el-table>
@@ -151,8 +151,6 @@
       this.dataRegion()
       this.yearsData()
       this.getcountNewsBidByYear()
-      this.getCountNewsBidByProvince()
-      this.getCountNewsBidByMonth()
     },
     mounted() {
     },
@@ -168,6 +166,8 @@
           this.$nextTick(() => {
             this.initChart1(res.data.provinceDate)
           })
+          this.getCountNewsBidByProvince()
+          this.getCountNewsBidByMonth()
         })
       },
       getCountNewsBidByProvince(){
@@ -203,7 +203,8 @@
           let myChart = echarts.init(document.getElementById("echarts1"))
           let seriesData=[]
           let color=['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'];
-          let typeNameList=data[0].typeList.map(item => item.type);
+          // let typeNameList=data[0].typeList.map(item => item.type);
+          let typeNameList=[ '房建工程', '市政工程', '水利工程', '机电工程', '公路工程', '电力工程', '石油化工工程', '冶金工程', '矿山工程', '通信工程', '铁路工程', '港口与航道工程','其他','空白'];
           let item={}
           for(var i=0; i<data.length; i++){
             for(var j=0; j<data[i].typeList.length; j++){
@@ -271,12 +272,6 @@
             });
           }
           let option ={
-            // legend: {
-            //   left: "center",
-            //   bottom: 0,
-            //   itemHeight:8,
-            //   itemWidth:16,
-            // },
             tooltip: {
               trigger: 'axis',
               axisPointer: {
@@ -300,8 +295,8 @@
             },
             grid: {
               top:30,
-              left:100,
-              right:20,
+              left:80,
+              right:40,
               bottom:30,
             },
             color:['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'],
@@ -319,7 +314,8 @@
           let myChart = echarts.init(document.getElementById("echarts2"))
           let seriesData=[]
           let color=['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'];
-          let typeNameList=data[0].typeList.map(item => item.type);
+          // let typeNameList=data[0].typeList.map(item => item.type);
+          let typeNameList=[ '房建工程', '市政工程', '水利工程', '机电工程', '公路工程', '电力工程', '石油化工工程', '冶金工程', '矿山工程', '通信工程', '铁路工程', '港口与航道工程','其他','空白'];
           let item={}
           for(var i=0; i<data.length; i++){
             for(var j=0; j<data[i].typeList.length; j++){
@@ -387,12 +383,6 @@
             });
           }
           let option ={
-            // legend: {
-            //   left: "center",
-            //   bottom: 0,
-            //   itemHeight:8,
-            //   itemWidth:16,
-            // },
             tooltip: {
               trigger: 'axis',
               axisPointer: {
@@ -416,8 +406,8 @@
             },
             grid: {
               top:30,
-              left:100,
-              right:20,
+              left:80,
+              right:40,
               bottom:30,
             },
             color:['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'],
@@ -434,7 +424,8 @@
           let myChart = echarts.init(document.getElementById("echarts3"))
           let seriesData=[]
           let color=['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'];
-          let typeNameList=data[0].typeList.map(item => item.type);
+          let typeNameList=[ '房建工程', '市政工程', '水利工程', '机电工程', '公路工程', '电力工程', '石油化工工程', '冶金工程', '矿山工程', '通信工程', '铁路工程', '港口与航道工程','其他','空白'];
+          // let typeNameList=data[0].typeList.map(item => item.type);
           let item={}
           for(var i=0; i<data.length; i++){
             for(var j=0; j<data[i].typeList.length; j++){
@@ -502,12 +493,6 @@
             });
           }
           let option ={
-            // legend: {
-            //   left: "center",
-            //   bottom: 0,
-            //   itemHeight:8,
-            //   itemWidth:16,
-            // },
             tooltip: {
               trigger: 'axis',
               axisPointer: {

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

@@ -28,7 +28,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'second'
+      activeName: 'first'
     }
   },
   created() {

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

 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">数字化经营履约全生命链路管理系统 </h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -169,13 +169,13 @@
 
     <select id="selectTotal" resultType="com.dsk.system.domain.business.vo.BusinessBrowseVo">
         SELECT
-            count(DISTINCT c.id) contactsCount,
+            count(DISTINCT ci.id) contactsCount,
             count(DISTINCT f.id) followRecordCount,
             count(DISTINCT b.id) backlogCount,
             count(DISTINCT r.id) relateCompanyCount
         FROM
             business_info i
-                LEFT JOIN business_contacts c on c.business_id = i.id
+                LEFT JOIN contact_info ci on ci.business_id = i.id
                 LEFT JOIN business_follow_record f on f.business_id = i.id
                 LEFT JOIN business_backlog b on b.business_id = i.id
                 LEFT JOIN business_relate_company r on r.business_id = i.id