From 483dad13078d31501c8c8df18fe6ee0c26e8b85a Mon Sep 17 00:00:00 2001
From: liusiqian <liusiqian0826@163.com>
Date: Tue, 28 Jun 2022 18:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8Cecharts=E5=9B=BE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/BLYiTuoChart.vue        |  4 ++
 src/views/dashboard/BarChart3.vue           |  3 --
 src/views/dashboard/BarLineChart.vue        |  5 +-
 src/views/dashboard/ChinaMap.vue            | 58 +++++++++++++++++----
 src/views/dashboard/DuidieChart.vue         |  6 ++-
 src/views/dashboard/PieChart.vue            | 15 ++++--
 src/views/dashboard/SecretPieChart.vue      |  6 ++-
 src/views/dashboard/TypePieChart.vue        |  7 +--
 src/views/project/infoShow/queryList.vue    | 11 ++--
 src/views/project/instruction/indexShow.vue |  8 +--
 src/views/project/report/copyInport.vue     |  7 +--
 11 files changed, 88 insertions(+), 42 deletions(-)

diff --git a/src/views/dashboard/BLYiTuoChart.vue b/src/views/dashboard/BLYiTuoChart.vue
index 896a7c3..86bf959 100644
--- a/src/views/dashboard/BLYiTuoChart.vue
+++ b/src/views/dashboard/BLYiTuoChart.vue
@@ -179,6 +179,10 @@ export default {
           data: ['项目数', '经费数','实际经费'],
           bottom: "1%",
           itemGap: 40,
+          textStyle: {   
+            fontSize: 14, //图例字体大小
+            color: '#333'
+          },
         },
 
         xAxis: [
diff --git a/src/views/dashboard/BarChart3.vue b/src/views/dashboard/BarChart3.vue
index d79eba1..ee96cc4 100644
--- a/src/views/dashboard/BarChart3.vue
+++ b/src/views/dashboard/BarChart3.vue
@@ -165,10 +165,7 @@ export default {
       });
       const _this = this;
       this.chart.on("click",function (params) {
-        // console.log(params);
         _this.$emit('userNamePage',params.name)
-
-
       });
     }
   }
diff --git a/src/views/dashboard/BarLineChart.vue b/src/views/dashboard/BarLineChart.vue
index 6acc67c..82187db 100644
--- a/src/views/dashboard/BarLineChart.vue
+++ b/src/views/dashboard/BarLineChart.vue
@@ -155,7 +155,10 @@ export default {
           // data: ['项目数', '经费数']
           data: this.blLgData,
           itemGap: 40,
-
+          textStyle: {   
+            fontSize: 14, //图例字体大小
+            color: '#333'
+          },
 
         },
 
diff --git a/src/views/dashboard/ChinaMap.vue b/src/views/dashboard/ChinaMap.vue
index 20d6242..6da066b 100644
--- a/src/views/dashboard/ChinaMap.vue
+++ b/src/views/dashboard/ChinaMap.vue
@@ -1,5 +1,7 @@
 <template>
+
   <div :class="className" :style="{ height: height, width: width }" />
+  
 </template>
 
 <script>
@@ -69,7 +71,7 @@ export default {
         this.$el.innerHTML = html;
         this.$el.removeAttribute('_echarts_instance_')
       }
-      this.chart.setOption({
+      this.chart.setOption({        
         title: {
           text: this.otTitle+"项目地区分布",
           x:'center',
@@ -92,29 +94,65 @@ export default {
         visualMap: {
           min: 0,
           max: 600,
-          range:[1, 600],
+          // range:[1, 600],
           text: ["High", "Low"],
           realtime: false,
           calculable: true,
+          color: "#fff",
           inRange: {
-            color: ["lightskyblue","#3300CC","yellow", "orangered","red"],
+            color: ['#a2cfff', '#7ebdfe', '#3c97fa','#0063f9'],//数据少到多
             symbolSize: [30, 100]
           },
-        },
+        },      
+        // visualMap: {
+        //   // type: "piecewise",
+        //   min: 0,
+        //   max:that.yMax,
+        //   left: 30,
+        //   realtime: false,
+        //   calculable: true,
+        //   color: "#fff",
+        //   inRange: {
+        //    // color: ['#1E62AC', '#2E98CA', '#27bce6'] //数据少到多
+        //       color: ['#4BC0C8', '#C779D0', '#FEAC5E']     
+        //   },
+        //   textStyle: {
+        //     color: '#24CFF4'
+        //   }
+        //   // pieces: [
+        //   //   { gte: 1000, label: "大于等于1000" }, // (10, Infinity]
+        //   //   { gte: 1, lte: 999000, label: "小于1000" }, // (1, 9]
+        //   //   { lt: "", label: "-" }, // (-Infinity, 1)
+        //   // ],
+        // },
         series: [
           {
             name: "项目地区分布",
             type: "map",
             mapType: 'china', // 自定义扩展图表类型
-
+            
             label: {
-              show: true,
+              normal: { show: false },
+              emphasis: { show: true },
+              color: '#fff',
             },
             data: this.mapData,
-            // data: [
-            //   {name:"上海",value:100},
-            //   {name:"新疆",value:200}
-            // ],
+            itemStyle: {
+              normal: {
+                // 地图边界颜色
+                borderColor: '#fff',
+                // 地图区域背景颜色
+                areaColor: '#AAD5FF',
+                // color: '#fff',
+              }
+              },
+              // 鼠标放上去高亮的样式
+              emphasis: {
+                // 鼠标放上去地图区域背景颜色
+                areaColor: '#2d38ff',
+                borderWidth: 0,
+                
+            },
           },
         ],
       });
diff --git a/src/views/dashboard/DuidieChart.vue b/src/views/dashboard/DuidieChart.vue
index 8f83b9a..6519083 100644
--- a/src/views/dashboard/DuidieChart.vue
+++ b/src/views/dashboard/DuidieChart.vue
@@ -113,8 +113,10 @@ export default {
           // data: ['有批示', '无批示'],
           data:this.ddLgData,
           itemGap: 40,
-
-          // left: '10%'
+          textStyle: {   
+            fontSize: 14, //图例字体大小
+            color: '#333'
+          },
         },
         tooltip: {
           trigger: 'axis',
diff --git a/src/views/dashboard/PieChart.vue b/src/views/dashboard/PieChart.vue
index 4f0ab96..39496bc 100644
--- a/src/views/dashboard/PieChart.vue
+++ b/src/views/dashboard/PieChart.vue
@@ -120,6 +120,13 @@ export default {
 
           }
         },
+        grid: {
+          left: -20,
+          // right: -20,
+          bottom: 50,
+          top: 150,
+          containLabel: true
+        },
         // legend: {
         //   left: 'center',
         //   bottom: '10',
@@ -132,7 +139,8 @@ export default {
             name: '项目分布',
             type: 'pie',
             // roseType: 'radius',
-            radius: '55%',
+            // radius: '55%',
+            radius: ['30%', '50%'], //饼形图改成中空的
             center: ['55%', '48%'],
             data:this.pieData,
             // top: "50%"
@@ -144,13 +152,12 @@ export default {
             label: {
               fontSize: 16,
               formatter: function (param) {
-                console.log(param)
                 let text = param.data.name;
                 if (text.length < 6) {
                   // return '{name|{b}}\n{value|{d}%( {c})}'
                   return text 
                 } else {
-                  return text.substring(0, 8) + '...'
+                  return text.substring(0, 6) + '...'
                 }
               },
             }
@@ -167,8 +174,6 @@ export default {
 
 
       this.chart.on("click",function (params) {
-        // alert(params.name)
-
         const deptName = params.name;
         let departmentId = "";
         if(deptName){
diff --git a/src/views/dashboard/SecretPieChart.vue b/src/views/dashboard/SecretPieChart.vue
index 17e1249..a4822ce 100644
--- a/src/views/dashboard/SecretPieChart.vue
+++ b/src/views/dashboard/SecretPieChart.vue
@@ -95,8 +95,10 @@ export default {
           orient: "vertical",
           right: 50,
           bottom: 20,
-
-          // selected: data.selected
+          textStyle: {   
+            fontSize: 14, //图例字体大小
+            color: '#333'
+          },
         },
         textStyle:{
           fontSize:18,
diff --git a/src/views/dashboard/TypePieChart.vue b/src/views/dashboard/TypePieChart.vue
index 888b0e8..a52acfe 100644
--- a/src/views/dashboard/TypePieChart.vue
+++ b/src/views/dashboard/TypePieChart.vue
@@ -96,13 +96,14 @@ export default {
         },
 
         legend: {
-          //left: 'center',
-          // bottom: '10',
           data:this.typelg,
           orient: "vertical",
           right: 50,
           bottom: 20,
-         
+          textStyle: {   
+            fontSize: 14, //图例字体大小
+            color: '#333'
+          },
           // data: ['院士建议', '咨询研究报告', '中央交办', '部委委托', '地方委托','主动报送', '申请', '委托', '交办', '合作']
         },
         series: [
diff --git a/src/views/project/infoShow/queryList.vue b/src/views/project/infoShow/queryList.vue
index 02c6a6e..8fba883 100644
--- a/src/views/project/infoShow/queryList.vue
+++ b/src/views/project/infoShow/queryList.vue
@@ -10,7 +10,6 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label-width="100" prop="name">
-
             <div style="float: left">
               <span slot="label" class="font">咨询项目:</span>
             </div>
@@ -152,7 +151,7 @@
         :header-cell-style="{background:'#fff'}"
         :row-class-name="tableRowClassName"
       >
-        <el-table-column label="序号" align="center" type="index"  width="70">
+        <el-table-column label="序号" align="center" type="index"  width="65">
 
           <template slot-scope="scope">
             {{scope.$index+1}}
@@ -161,7 +160,7 @@
         <el-table-column
           label="项目编号"
           align="left"
-          width="180"
+          width="120"
 
         >
           <template slot-scope="scope">
@@ -173,10 +172,10 @@
           label="项目名称"
           align="left"
           prop="name"
-          width="380"
+          width="400"
 
         />
-        <el-table-column label="类型" align="center" prop="type" width="110" :formatter="typeFormat" />
+        <el-table-column label="类型" align="center" prop="type" width="120" :formatter="typeFormat" />
         <el-table-column
           label="密级"
           align="left"
@@ -199,7 +198,7 @@
           label="状态"
           align="left"
           prop="status"
-          width="110"
+          width="90"
           :formatter="statusFormat"
         />
 
diff --git a/src/views/project/instruction/indexShow.vue b/src/views/project/instruction/indexShow.vue
index 3124321..ed51f2f 100644
--- a/src/views/project/instruction/indexShow.vue
+++ b/src/views/project/instruction/indexShow.vue
@@ -161,11 +161,11 @@
       <el-table v-loading="loading"  :data="instructionList" @selection-change="handleSelectionChange"
                 :header-cell-style="{background:'#fff'}"
                 :row-class-name="tableRowClassName" >
-        <el-table-column label="序号" align="center" type="index" width="70" />
-        <el-table-column label="年度" align="left" prop="year" width="100" />
+        <el-table-column label="序号" align="center" type="index" width="65" />
+        <el-table-column label="年度" align="left" prop="year" width="90" />
         <el-table-column label="期数" align="left" prop="num" width="80" />
-        <el-table-column label="总期数" align="left" prop="totalNum" width="120" />
-        <el-table-column label="标题" align="left" prop="title" width="300" />
+        <el-table-column label="总期数" align="left" prop="totalNum" width="110" />
+        <el-table-column label="标题" align="left" prop="title" width="380" />
         <el-table-column label="密级" align="left" prop="secretLevel" :formatter="secretFormat" width="120"/>
         <el-table-column label="保密期限" align="left" prop="secretYear" width="120" />
         <el-table-column label="建议人" align="left" prop="userName" width="300" />
diff --git a/src/views/project/report/copyInport.vue b/src/views/project/report/copyInport.vue
index 2e533d1..7393228 100644
--- a/src/views/project/report/copyInport.vue
+++ b/src/views/project/report/copyInport.vue
@@ -67,11 +67,9 @@
                  </span>
               </span><span v-for="(item) in typeData" :key="item.id">
                  <span v-if="index<typeData.length-1">
-<!--                   <el-link target="_blank" :underline="false" @click="toTypePage(item.typeId)" class="font"> {{item.name}}</el-link>-->
                    <span class="type">{{item.name}}</span>项目
                    <el-link target="_blank" :underline="false" @click="toTypePage(item.typeId)" class="font"> {{item.value}}</el-link>个、</span>
                  <span v-else>
-<!--                   <el-link target="_blank" :underline="false" @click="toTypePage(item.typeId)" class="font"> {{item.name}}</el-link>项目-->
                       <span class="type">{{item.name}}</span>项目
                    <el-link target="_blank" :underline="false" @click="toTypePage(item.typeId)" class="font"> {{item.value}}</el-link>个。</span>
               </span>
@@ -102,15 +100,12 @@
               {{this.year2}}，<span v-for="(item) in axisCenter7Top4"  :key="item.id">
               <span v-if="index<axisCenter7Top4.length-1">
                 <span>{{item}}、</span></span>
-<!--                <el-link target="_blank" :underline="false" @click="toyituoUnitPage(item)" class="font">{{item}}</el-link>、</span>-->
               <span v-else>
-<!--                <el-link target="_blank" :underline="false" @click="toyituoUnitPage(item)" class="font">{{item}}</el-link>靠前。</span>-->
                   <span>{{item}}。</span></span>
             </span>
               <span v-for="(item,index) in projectCount"  :key="item.id">
                 <span v-if="index<projectCount.length-1">
                   <span>{{item.name}}</span>负责联系
-<!--                  <el-link target="_blank" :underline="false" @click="toDeptPage(item.departmentId)" class="font"> {{item.name}}</el-link>负责联系-->
                   <el-link target="_blank" :underline="false" @click="toDeptPage(item.departmentId)" class="font">{{item.value}}</el-link>个项目，</span>
                 <span v-else>
                   <span>{{item.name}}</span>负责联系
@@ -1136,7 +1131,7 @@
     .type{
       font-size: 30px;
       font-weight: 700;
-      border-bottom:4px solid black;
+      // border-bottom:4px solid black;
       letter-spacing:2px
     }
   }