Merge pull request 'projects/mescc/zhp' (#28) from projects/mescc/zhp into projects/mescc/develop

Reviewed-on: #28

src/views/dashboard/charts/Bipv.vue

@@ -1,16 +1,10 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-05-31 16:14:09
+ * @LastEditTime: 2024-06-03 08:55:42
  * @LastEditors: zhp
  * @Description:
 -->
-<!--
-    filename: Bipv.vue
-    author: liubin
-    date: 2024-04-10 15:39:54
-    description:
--->
 
 <template>
   <right-chart-base
@@ -31,7 +25,7 @@ export default {
   data() {
     const year = new Date().getFullYear();
     // 城市数组的顺序必须是固定的
-    const cities = ["瑞昌", "邯郸",
+    const cities = [ "邯郸",
       // "株洲", "佳木斯", "成都", "凯盛", "蚌埠"
 
     ];
@@ -80,15 +74,15 @@ export default {
       return [
         {
           name: `${new Date().getFullYear()}年目标值`,
-          data: bipvOutput.target,
+          data: bipvOutput.target.splice(0, 1),
         },
         {
           name: `${new Date().getFullYear() - 1}年`,
-          data: bipvOutput.previous,
+          data: bipvOutput.previous.splice(0, 1)
         },
         {
           name: `${new Date().getFullYear()}年`,
-          data: bipvOutput.current,
+          data: bipvOutput.current.splice(0, 1),
         },
       ];
     },

src/views/dashboard/charts/LeftChartBase.vue

@@ -111,18 +111,16 @@ export default {
             name: '', // this.series[0].name,
             type: "bar",
             barWidth: 12,
+            label: {
+              show: true, //开启显示
+              position: 'top', //在上方显示
+              textStyle: { //数值样式
+                color: '#DFF1FE',
+                fontSize: 16
+              }
+            },
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
-              normal: {
-                label: {
-                  show: true, //开启显示
-                  position: 'top', //在上方显示
-                  textStyle: { //数值样式
-                    color: '#DFF1FE',
-                    fontSize: 16
-                  }
-                }
-              },
               color: {
                 type: "linear",
                 x: 0,
@@ -156,8 +154,19 @@ export default {
             name: '', // this.series[1].name,
             type: "bar",
             barWidth: 12,
+            label: {
+              show: true, //开启显示
+              position: 'top', //在上方显示
+              textStyle: { //数值样式
+                color: '#DFF1FE',
+                fontSize: 16
+              }
+            },
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
+              // normal: {
+
+              // },
               color: {
                 type: "linear",
                 x: 0,

src/views/index.vue

@@ -3,8 +3,8 @@
     <div id="map-container">
       <!-- <div v-if="visible" class="cdLine"></div> -->
       <!-- <div v-if="visible" class="zzLine"></div> -->
-      <div v-if="visible" class="rcLine"></div>
+      <!-- <div v-if="visible" class="rcLine"></div> -->
-      <div v-if="visible" class="rcLineTwo"></div>
+      <!-- <div v-if="visible" class="rcLineTwo"></div> -->
       <div v-if="visible" class="hdLine"></div>
       <div v-if="visible" class="hdLineTwo"></div>
       <!-- <div v-if="visible" class="ksLine"></div> -->
@@ -39,12 +39,12 @@
       </div>
     </div>
     <company-info v-if="visible" :info="info" :position="rcHintPosition" />
-    <ks-company-info v-if="visible" :info="ksInfo" :position="ksHintPosition" />
+    <!-- <ks-company-info v-if="visible" :info="ksInfo" :position="ksHintPosition" /> -->
-    <jms-company-info v-if="visible" :info="jmsInfo" :position="jmsHintPosition" />
+    <!-- <jms-company-info v-if="visible" :info="jmsInfo" :position="jmsHintPosition" /> -->
     <hd-company-info v-if="visible" :info="hdInfo" :position="hdHintPosition" />
-    <bb-company-info v-if="visible" :info="bbInfo" :position="bbHintPosition" />
+    <!-- <bb-company-info v-if="visible" :info="bbInfo" :position="bbHintPosition" /> -->
-    <cd-company-info v-if="visible" :info="cdInfo" :position="cdHintPosition" />
+    <!-- <cd-company-info v-if="visible" :info="cdInfo" :position="cdHintPosition" /> -->
-    <zz-company-info v-if="visible" :info="zzInfo" :position="zzHintPosition" />
+    <!-- <zz-company-info v-if="visible" :info="zzInfo" :position="zzHintPosition" /> -->
   </div>
 </template>
 
@@ -69,13 +69,17 @@ const LOCATIONS = [
   // 蚌埠2
   // { x: 61, y: 53, tx: 39, ty: 68, path: 'factoryData/ksIndex' },
   // 江西 瑞昌
-  { x: 60, y: 58, tx: 68, ty: 52, path: 'factoryData/factory-data' },
+  { x: 60, y: 58, tx: 68, ty: 52,lx:61,ly:61.5,ltx:68.8,lty:52, path: 'factoryData/factory-data' },
   // 湖南 株洲
   // { x: 56, y: 60, tx: 60, ty: 95, path: 'factoryData/zzIndex' },
   // 邯郸
-  { x: 58, y: 45, tx: 47, ty: 34, path: 'factoryData/hdIndex' },
+  { x: 58, y: 45, tx: 47, ty: 34, lx: 58.7, ly: 34, ltx: 53, lty: 34, path: 'factoryData/hdIndex' },
 ];
-
+// rcLine.style.left = `66.8%`;
+// rcLine.style.top = `52%`;
+// rcLineTwo.className = "rcLineTwo";
+// rcLineTwo.style.left = `58.7%`;
+// rcLineTwo.style.top = `34%`;
 export default {
   name: "Index",
   components: {
@@ -247,7 +251,17 @@ export default {
         // templateInfo.items[3].value = this.homeStore.stdOutput.current[5];
         // this.ksInfo = templateInfo;
       // }
-      (position === LOCATIONS[0]) {
+        (position === LOCATIONS[0]) {
+        const rcLine = document.createElement("div");
+        const rcLineTwo = document.createElement("div");
+        rcLine.className = "rcLine";
+        rcLine.style.left = `${position.lx}%`;
+        rcLine.style.top = `${position.ly}%`;
+        rcLineTwo.className = "rcLineTwo";
+        rcLineTwo.style.left = `${position.ltx}%`;
+        rcLineTwo.style.top = `${position.lty}%`;
+        document.getElementById("map-container").appendChild(rcLine);
+        document.getElementById("map-container").appendChild(rcLineTwo);
         this.rcHintPosition = position;
         templateInfo.companyName = "瑞昌中建材";
         templateInfo.items[0].value = this.homeStore.ftoInvest?.current[0];
@@ -264,6 +278,16 @@ export default {
         // templateInfo.items[3].value = this.homeStore.stdOutput.current[2];
         // this.zzInfo = templateInfo;
       } else if (position === LOCATIONS[1]) {
+        const hdLine = document.createElement("div");
+        const hdLineTwo = document.createElement("div");
+        hdLine.className = "hdLine";
+        hdLine.style.left = `${position.lx}%`;
+        hdLine.style.top = `${position.ly}%`;
+        hdLineTwo.className = "hdLineTwo";
+        hdLineTwo.style.left = `${position.ltx}%`;
+        hdLineTwo.style.top = `${position.lty}%`;
+        document.getElementById("map-container").appendChild(hdLine);
+        document.getElementById("map-container").appendChild(hdLineTwo);
         this.hdHintPosition = position;
         templateInfo.companyName = "邯郸中建材";
         templateInfo.items[0].value = this.homeStore.ftoInvest?.current[1];
@@ -350,22 +374,22 @@ export default {
 .rcLine {
   display: inline-block;
   position: absolute;
-  left: 61%;
+  /* left: 61%; */
-  width: 100px;
+  width: 7.9vw;
-  top: 61.5%;
+  /* top: 61.5%; */
   /* x: 60, y: 58, */
-    height: 1px;
+  height: 1px;
   border: 2px dashed #FFCF00;
 }
 
 .rcLineTwo {
   position: absolute;
-  left: 66.8%;
+  /* left: 66.8%; */
   width: 1px;
-  top: 52%;
+  /* top: 52%; */
   display: inline-block;
   /* // x: 60, y: 58, */
-  height: 90px;
+  height: 5vw;
   border: 2px dashed #FFCF00;
 }
 
@@ -376,13 +400,13 @@ export default {
   top: 34%;
   display: inline-block;
   /* // x: 60, y: 58, */
-  height: 100px;
+  height: 6vw;
   border: 2px dashed #FFCF00;
 }
 .hdLineTwo {
   position: absolute;
   left: 53%;
-  width: 90px;
+  width: 5vw;
   top: 34%;
   display: inline-block;
   /* // x: 60, y: 58, */