Merge remote-tracking branch 'origin/main'

src/components/Echarts/PieChart.vue

@@ -95,16 +95,20 @@ export default {
     this.chart.dispose();
     this.chart = null;
   },
-  methods: {
-    initChart(data) {
+  methods: {     initChart(data) {
       let that = this;
       this.chart = echarts.init(this.$el, "macarons");
       this.chart.setOption({
         title: that.title,
         tooltip: {
-          trigger: "item",
-          formatter: "{b} : {c} ({d}%)",
-          position:this.$props.position
+          trigger: 'item',
+          position: function (point) {
+            return [point[0] + 10, point[1] + 10];
+          },
+          formatter: function (params) {
+            const name = params.name.replace('业务', '');
+            return `${name}: ${params.percent}% (${params.value})`;
+          }
         },
         legend: that.legend,
         series: [

src/views/pad/data/company.json

@@ -1,7 +1,7 @@
 [
   {
     "value": "10001",
-    "label": "国网山西省电力公司",
+    "label": "国网山西省公司",
     "children": [
       {
         "value": "10001",
@@ -19,7 +19,7 @@
         "value": "1A002",
         "label": "国网超高压变电分公司",
         "poi": [112.555937, 37.785564],
-        "city": "太原市" 
+        "city": "太原市"
       },
       {
         "value": "1A004",
@@ -602,7 +602,7 @@
           {
             "value": "1H00109",
             "label": "国网宁武供电公司",
-            "poi": [112.315447, 39.008705],
+            "poi": [112.425447, 39.008705],
             "city": "忻州市"
           },
           {
@@ -706,13 +706,13 @@
           {
             "value": "1F00100",
             "label": "国网朔州供电公司",
-            "poi": [112.428691, 39.326848],
+            "poi": [112.368691, 39.326848],
             "city": "朔州市"
           },
           {
             "value": "1F00101",
             "label": "国网神头供电公司",
-            "poi": [112.549562, 39.342887],
+            "poi": [112.609562, 39.342887],
             "city": "朔州市"
           },
           {

src/views/pad/engineering/main.vue

@@ -335,7 +335,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省电力公司",
+          "label": "国网山西省公司",
           "children": [
             {
               "value": "10001",

src/views/pad/engineering/unitAccessto.vue

@@ -218,7 +218,7 @@
       handleUnitDataList() {
         let unitDataList = [];
         unitDataList.push({
-          name: "国网山西省电力公司",
+          name: "国网山西省公司",
           num: 56,
           onLineNum: 46
         });

src/views/pad/official/carWarningDialog.vue

@@ -136,7 +136,7 @@ export default {
       // 公务用车资源情况
       dataList: [
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -152,7 +152,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -168,7 +168,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -184,7 +184,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -200,7 +200,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -216,7 +216,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -232,7 +232,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,

src/views/pad/official/main.vue

@@ -231,7 +231,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省电力公司",
+          "label": "国网山西省公司",
           "children": [
             {
               "value": "10001",

src/views/pad/service/canteenDialog.vue

@@ -415,9 +415,7 @@
           </div>
           <div class="dialog-item">
             <div class="content-title">
-              <span class="title">就餐人数
-                <span class="smallTitle">截止至{{timeDay}}</span>
-              </span>
+              <span class="title">就餐人数(当天)</span>
             </div>
             <div class="content">
               <pie-chart

src/views/pad/service/employeeProfile.vue

@@ -29,12 +29,12 @@
             </div>
            
             <div class="data-item">
-              <span class="data">{{entryInternalNum.value}}</span>
+              <span class="data1">{{entryInternalNum.value}}</span>
               <span class="name">{{ entryInternalNum.name }}</span>
             </div>
         
             <div class="data-item">
-              <span class="data">{{visitorNum.value}}</span>
+              <span class="data2">{{visitorNum.value}}</span>
               <span class="name">{{ visitorNum.name }}</span>
             </div>
           </div>
@@ -207,6 +207,21 @@ export default {
         .data{
           width: auto;
           font-size: 25px;
+          color:#00FFDF;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg1.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
+        .data1{
+          width: auto;
+          font-size: 25px;
           color:#00FFFF;
           font-family: 'electronicFont';
           background: url("../../../assets/images/service_new/data_bgg.png") no-repeat;
@@ -219,6 +234,21 @@ export default {
           // position: relative;
           // top: 50px;
         }
+        .data2{
+          width: auto;
+          font-size: 25px;
+          color:#F4CB57;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg2.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
      
         .name{
           font-size: 12px;

src/views/pad/service/employeeProfileDialog.vue

@@ -38,12 +38,12 @@
             </div>
            
             <div class="data-item">
-              <span class="data">{{entryInternalNum.value}}</span>
+              <span class="data1">{{entryInternalNum.value}}</span>
               <span class="name">{{ entryInternalNum.name }}</span>
             </div>
         
             <div class="data-item">
-              <span class="data">{{visitorNum.value}}</span>
+              <span class="data2">{{visitorNum.value}}</span>
               <span class="name">{{ visitorNum.name }}</span>
             </div>
               </div>
@@ -603,6 +603,21 @@ export default {
         .data{
           width: auto;
           font-size: 25px;
+          color:#00FFDF;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg1.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
+        .data1{
+          width: auto;
+          font-size: 25px;
           color:#00FFFF;
           font-family: 'electronicFont';
           background: url("../../../assets/images/service_new/data_bgg.png") no-repeat;
@@ -615,6 +630,21 @@ export default {
           // position: relative;
           // top: 50px;
         }
+        .data2{
+          width: auto;
+          font-size: 25px;
+          color:#F4CB57;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg2.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
      
         .name{
           font-size: 12px;

src/views/pad/service/shareStation.vue

@@ -4,11 +4,7 @@
     <div class="content-area">
       <div class="content-left">
         <div class="content-title">
-          <div class="title">建设完成达标率
-            <el-tooltip class="item" effect="dark" content="截止到当天" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-          </div>
+          <div class="title">{{timeString}}建设完成达标率</div>
         </div>
         <div class="content">
           <div class="data-content">
@@ -122,6 +118,7 @@ export default {
   data() {
     return {
       pieData: [],
+      currentTime: new Date(),
       pieLegend: {
         top: 50,
         orient: "vertical",
@@ -154,6 +151,12 @@ export default {
       },
     };
   },
+  computed: {
+    timeString() {
+      const year = this.currentTime.getFullYear();
+      return `${year}年度`;
+    },
+  },
   created() {
     //建设完成率
     this.getOverviewData();

src/views/pad/service/shareStationDialog.vue

@@ -11,11 +11,7 @@
         <div class="dialog-list">
           <div class="dialog-item">
             <div class="content-title">
-              <span class="title">建设完成达标率
-                <el-tooltip class="item" effect="dark" content="截止到今日" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-              </span>
+              <span class="title">{{timeString}}建设完成达标率</span>
             </div>
             <div class="data-chart">
               <div class="data-content">
@@ -153,6 +149,7 @@ export default {
   },
   data() {
     return {
+      currentTime: new Date(),
       //建设完成达标率
       constructionQuantityNum: {name: '', value: 0},
       // 服务内容
@@ -193,6 +190,12 @@ export default {
       },
     };
   },
+  computed: {
+    timeString() {
+      const year = this.currentTime.getFullYear();
+      return `${year}年度`;
+    },
+  },
   created() {
     //建设完成率
     this.getOverviewData();

src/views/screen/data/company.json

@@ -1,7 +1,7 @@
  [
   {
     "value": "10001",
-    "label": "国网山西省电力公司",
+    "label": "国网山西省公司",
     "children": [
       {
         "value": "10001",
@@ -19,7 +19,7 @@
         "value": "1A002",
         "label": "国网超高压变电分公司",
         "poi": [112.555937, 37.785564],
-        "city": "太原市" 
+        "city": "太原市"
       },
       {
         "value": "1A004",
@@ -602,7 +602,7 @@
           {
             "value": "1H00109",
             "label": "国网宁武供电公司",
-            "poi": [112.315447, 39.008705],
+            "poi": [112.425447, 39.008705],
             "city": "忻州市"
           },
           {
@@ -706,13 +706,13 @@
           {
             "value": "1F00100",
             "label": "国网朔州供电公司",
-            "poi": [112.428691, 39.326848],
+            "poi": [112.368691, 39.326848],
             "city": "朔州市"
           },
           {
             "value": "1F00101",
             "label": "国网神头供电公司",
-            "poi": [112.549562, 39.342887],
+            "poi": [112.609562, 39.342887],
             "city": "朔州市"
           },
           {

src/views/screen/engineering/main.vue

@@ -340,7 +340,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省电力公司",
+          "label": "国网山西省公司",
           "children": [
             {
               "value": "10001",

src/views/screen/engineering/unitAccessto.vue

@@ -218,7 +218,7 @@ export default {
     handleUnitDataList() {
       let unitDataList = [];
       unitDataList.push({
-        name: "国网山西省电力公司",
+        name: "国网山西省公司",
         num: 56,
         onLineNum: 46
       });

src/views/screen/official/carWarningDialog.vue

@@ -136,7 +136,7 @@ export default {
       // 公务用车资源情况
       dataList: [
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -152,7 +152,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -168,7 +168,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -184,7 +184,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -200,7 +200,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -216,7 +216,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,
@@ -232,7 +232,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省电力公司",
+          a: "国网山西省公司",
           b: 56,
           c: 46,
           d: 11,

src/views/screen/official/main.vue

@@ -231,7 +231,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省电力公司",
+          "label": "国网山西省公司",
           "children": [
             {
               "value": "10001",

src/views/screen/service/canteenDialog.vue

@@ -415,9 +415,7 @@
           </div>
           <div class="dialog-item">
             <div class="content-title">
-              <span class="title">就餐人数
-                <span class="smallTitle">截止至{{timeDay}}</span>
-              </span>
+              <span class="title">就餐人数(当天)</span>
             </div>
             <div class="content">
               <pie-chart

src/views/screen/service/employeeProfile.vue

@@ -29,12 +29,12 @@
             </div>
            
             <div class="data-item">
-              <span class="data">{{entryInternalNum.value}}</span>
+              <span class="data1">{{entryInternalNum.value}}</span>
               <span class="name">{{ entryInternalNum.name }}</span>
             </div>
         
             <div class="data-item">
-              <span class="data">{{visitorNum.value}}</span>
+              <span class="data2">{{visitorNum.value}}</span>
               <span class="name">{{ visitorNum.name }}</span>
             </div>
           </div>
@@ -206,6 +206,21 @@ export default {
         .data{
           width: auto;
           font-size: 25px;
+          color:#00FFDF;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg1.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
+        .data1{
+          width: auto;
+          font-size: 25px;
           color:#00FFFF;
           font-family: 'electronicFont';
           background: url("../../../assets/images/service_new/data_bgg.png") no-repeat;
@@ -218,6 +233,21 @@ export default {
           // position: relative;
           // top: 50px;
         }
+        .data2{
+          width: auto;
+          font-size: 25px;
+          color:#F4CB57;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg2.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
      
         .name{
           font-size: 12px;

src/views/screen/service/employeeProfileDialog.vue

@@ -38,12 +38,12 @@
             </div>
            
             <div class="data-item">
-              <span class="data">{{entryInternalNum.value}}</span>
+              <span class="data1">{{entryInternalNum.value}}</span>
               <span class="name">{{ entryInternalNum.name }}</span>
             </div>
         
             <div class="data-item">
-              <span class="data">{{visitorNum.value}}</span>
+              <span class="data2">{{visitorNum.value}}</span>
               <span class="name">{{ visitorNum.name }}</span>
             </div>
               </div>
@@ -602,6 +602,21 @@ export default {
         .data{
           width: auto;
           font-size: 25px;
+          color:#00FFDF;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg1.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
+        .data1{
+          width: auto;
+          font-size: 25px;
           color:#00FFFF;
           font-family: 'electronicFont';
           background: url("../../../assets/images/service_new/data_bgg.png") no-repeat;
@@ -614,6 +629,21 @@ export default {
           // position: relative;
           // top: 50px;
         }
+        .data2{
+          width: auto;
+          font-size: 25px;
+          color:#F4CB57;
+          font-family: 'electronicFont';
+          background: url("../../../assets/images/service_new/data_bgg2.png") no-repeat;
+          background-size: 100% 100%;
+          background-position: center;
+          height: 85px;
+          width: 68px;
+          text-align: center;
+          padding-top: 23px;
+          // position: relative;
+          // top: 50px;
+        }
      
         .name{
           font-size: 12px;

src/views/screen/service/shareStation.vue

@@ -4,11 +4,7 @@
     <div class="content-area">
       <div class="content-left">
         <div class="content-title">
-          <div class="title">建设完成达标率
-            <el-tooltip class="item" effect="dark" content="截止到当天" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-          </div>
+          <div class="title">{{timeString}}建设完成达标率</div>
         </div>
         <div class="content">
           <div class="data-content">
@@ -122,6 +118,7 @@ export default {
   data() {
     return {
       flag: 0,
+      currentTime: new Date(),
       pieData: [],
       pieLegend: {
         top: 50,
@@ -155,6 +152,12 @@ export default {
       },
     };
   },
+  computed: {
+    timeString() {
+      const year = this.currentTime.getFullYear();
+      return `${year}年度`;
+    },
+  },
   created() {
     //建设完成率
     this.getOverviewData();

src/views/screen/service/shareStationDialog.vue

@@ -11,11 +11,7 @@
         <div class="dialog-list">
           <div class="dialog-item">
             <div class="content-title">
-              <span class="title">建设完成达标率
-                <el-tooltip class="item" effect="dark" content="截止到今日" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-              </span>
+              <span class="title">{{timeString}}建设完成达标率</span>
             </div>
             <div class="data-chart">
               <div class="data-content">
@@ -154,6 +150,7 @@ export default {
   data() {
     return {
       flag: 0,
+      currentTime: new Date(),
       //建设完成达标率
       constructionQuantityNum: {name: '', value: 0},
       // 服务内容
@@ -194,6 +191,12 @@ export default {
       },
     };
   },
+  computed: {
+    timeString() {
+      const year = this.currentTime.getFullYear();
+      return `${year}年度`;
+    },
+  },
   created() {
     //建设完成率
     this.getOverviewData();