sis产品问题修改

src/components/qushi/lineCharts.vue

@@ -234,10 +234,10 @@ export default {
           showSymbol: true,
           zlevel: index,
           lineStyle: {
-            normal: {
-              color: this.color[index],
-              width: 1,
-            },
+            // normal: {
+            //   color: this.color[index],
+            //   width: 1,
+            // },
           },
           yAxisIndex: value.yAxisIndex,
           data: value.value.map((t) => {

src/components/qushi/qushiDialog.vue

@@ -734,31 +734,31 @@
             this.chartsData = [{
                     title: '测试1',
                     type: 'line',
-                    smooth: false,
+                    smooth: true,
                     value: [{
                         value: 20,
                         dateTime: "10-23 08:00"
                     }, {
                         value: 25,
-                        dateTime: "10-23 09:00"
+                        dateTime: "10-24 09:00"
                     }, {
                         value: 30,
-                        dateTime: "10-23 10:00"
+                        dateTime: "10-25 10:00"
                     }]
                 },
                 {
                     title: '测试2',
                     type: 'line',
-                    smooth: false,
+                    smooth: true,
                     value: [{
                         value: 20,
                         dateTime: "10-23 08:00"
                     }, {
                         value: 30,
-                        dateTime: "10-23 09:00"
+                        dateTime: "10-24 09:00"
                     }, {
                         value: 40,
-                        dateTime: "10-23 10:00"
+                        dateTime: "10-25 10:00"
                     }]
                 }
             ]

src/router/index.js

@@ -1832,8 +1832,9 @@ export const asyncRoutes = [
   },
   // 智能报表
   {
-    path: "/report",
-    redirect: "report/report/fdxnyrb",
+      path: "/report",
+      name: "report",
+    redirect: "report/reportst/fdxnyrb",
     meta: {
       title: "智能报表",
       icon: "",
@@ -1843,8 +1844,7 @@ export const asyncRoutes = [
     component: () => import("@/views/report"),
     children: [
       {
-        path: "report",
-        name: "report",
+        path: "reportst",
         meta: {
           title: "自定制报表管理",
           icon: "svg-自定制报表管理",
@@ -1950,7 +1950,7 @@ export const asyncRoutes = [
           {
             path: "dmb",
             name: "dmb",
-            component: () => import("@/views/report/stationReport/fdczzdy"),
+            component: () => import("@/views/report/stationReport/fczybb"),
             meta: {
               title: "自定义报表",
               icon: "",

src/views/layout/Header.vue

@@ -239,10 +239,13 @@ export default {
         return;
       } else if (data.path === "/powerGenerating") {
         this.$router.replace(`${data.path}/dataFilter/prepare`);
+      } else if (data.path === "/report") {
+        this.$router.replace(`${data.path}/reportst/fdxnyrb`);
       } else {
         this.activeIndex = index;
         this.$router.push(data.path);
       }
+
       const ActiveModule = this.currMenu.find((ele) => {
         return ele.path === data.path;
       });

src/views/report/stationReport/fczybb/index.vue

@@ -8,7 +8,7 @@
         data() {
             return {
                 //   url: "http://10.81.3.155:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$cf794177cf764f258f8105c6d3b03f3c$7cf4ccc30f914f0b8925e2234780402e&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
-                url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true",
+                url: "http://123.60.219.66:8083/bi/ebipro/easyolap.do?action=edit&resid=EANA$2$8$1$041302f30436412d9ba78f161a6575f0$f5c25912e8aa49d78e33f070bf944858&id=admin&pw=admin",
             };
         },
     };

src/views/report/stationReport/fdczzdy/index.vue

@@ -7,7 +7,7 @@
     export default {
         data() {
             return {
-                url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$621b7c14e4aa4a0483a8e577d8dc4cff&id=admin&pw=admin&showmenu=false&showparams=true&calcnow=true"
+                url: "http://123.60.219.66:8083/bi/ebibase/showreport.do?resid=EANA$2$2$1$041302f30436412d9ba78f161a6575f0$8e0637d590ce4fa2b3a26455a81895b2&id=admin&pw=admin"
             }
         }
     }

src/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation/index.vue

@@ -6,7 +6,9 @@
   />
   <div style="height: calc(100% - 77px)">
     <!-- 光伏 *************** -->
-
+    <test
+      class="booster-station-body"
+    />
     <!-- 繁峙均然 -->
     <GFfanshijunran
       class="booster-station-body"
@@ -142,6 +144,7 @@ import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerB
 import GFshanyinrongxin from "./components/shanyinrongxin.vue";
 import GFfangshansunjiashan from "./components/fangshansunjiashan.vue";
 import GFfanshijunran from "./components/fanshijunran.vue";
+import test from "./components/test.vue";
 import GFhuairenchuchen from "./components/huairenchuchen.vue";
 import GFpingluzuhu from "./components/pingluzuhu.vue";
 import GFtianzhenxusheng from "./components/tianzhenxusheng.vue";
@@ -156,6 +159,7 @@ export default {
   name: "lightBoosterStation",
   components: {
     headerButton,
+    test,
     GFshanyinrongxin,
     GFfangshansunjiashan,
     GFfanshijunran,

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/components/test-map.vue

@@ -0,0 +1,276 @@
+<template>
+  <div class="svg-map">
+    <svg
+      version="1.1"
+      xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      x="0px"
+      y="0px"
+      viewBox="0 0 1955 940"
+      :style="
+        'enable-background: new 0 0 866 359; left: ' +
+        svgLeft +
+        '; top: ' +
+        svgTop +
+        ';'
+      "
+      xml:space="preserve"
+      :width="svgWidth"
+      :height="svgHeight"
+    >
+      <defs>
+        <g id="nx-map-line">
+          <line
+            class="nx-map-line"
+            x1="25"
+            y1="25"
+            x2="25"
+            y2="80"
+            stroke="#edbf03"
+            stroke-width="1"
+          />
+          <circle
+            class="nx-map-up-circle"
+            cx="25"
+            cy="25"
+            r="2"
+            fill="#edbf03"
+          />
+        </g>
+        <g id="nx-map-circle">
+          <circle
+            class="nx-map-down-circle-1"
+            cx="25"
+            cy="80"
+            r="3"
+            fill="#edbf03"
+          />
+          <circle
+            class="nx-map-down-circle-2"
+            :class="{ 'nx-map-down-circle-loop': c1 }"
+            cx="25"
+            cy="80"
+            r="9"
+            stroke="#edbf03"
+            stroke-width="1"
+            fill="none"
+          />
+          <circle
+            class="nx-map-down-circle-3"
+            :class="{ 'nx-map-down-circle-loop': c2 }"
+            cx="25"
+            cy="80"
+            r="16"
+            opacity="0.6"
+            stroke="#edbf03"
+            stroke-width="1"
+            fill="none"
+          />
+        </g>
+      </defs>
+      <g>
+        <image
+          style="overflow: visible"
+          width="2050"
+          height="1220"
+          class="map-base"
+          xlink:href="./img/dmt_sy1.png"
+          transform="matrix(1 0 0 1 0 -100)"
+        ></image>
+        <g
+          :class="item.name != '升压站' ? 'item-label-hover' : ''"
+          v-for="(item, index) in dataList"
+          :key="index"
+          @click="handleClick(item.id, item.name)"
+        >
+          <image
+            v-if="item.name != '升压站'"
+            data-v-28794fe1=""
+            width="41"
+            height="34"
+            :x="Number(item.x) - 10"
+            :y="Number(item.y) + 10"
+            xlink:href="@/assets\png\sun.png"
+            class="pillar"
+          ></image>
+          <image
+            v-if="item.name == '升压站'"
+            data-v-28794fe1=""
+            width="75"
+            height="54"
+            :x="Number(item.x) + 20"
+            :y="Number(item.y) + 10"
+            xlink:href="@/assets/png/booster-station.png"
+          ></image>
+          <text
+            v-if="item.name != '升压站'"
+            class="mapKey"
+            :x="Number(item.x) - 10"
+            :y="Number(item.y) + 60"
+            fill="#ffffff"
+            font-size="14"
+          >
+            {{ item.name }}
+          </text>
+          <text
+            v-else
+            class="mapKey"
+            :x="Number(item.x) + 60"
+            :y="Number(item.y) + 70"
+            fill="#ffffff"
+            font-size="14"
+          >
+            {{ item.name }}
+          </text>
+        </g>
+      </g>
+    </svg>
+    <Wtllist ref="dialog" :showname="showname" />
+  </div>
+</template>
+<script>
+import Wtllist from "./zhenqudialog.vue";
+export default {
+  props: {
+    windturbineList: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  components: {
+    Wtllist,
+  },
+  data() {
+    return {
+      dataList: [
+        {
+          name: "升压站",
+          x: "1760",
+          y: "360",
+        },
+        {
+          name: "N13方阵",
+          x: "1415",
+          y: "195",
+          type: 3,
+        },
+        {
+          name: "N14方阵",
+          x: "1430",
+          y: "325",
+          type: 3,
+        },
+        {
+          name: "N15方阵",
+          x: "1440",
+          y: "465",
+          type: 3,
+        },
+        {
+          name: "N01方阵",
+          x: "1215",
+          y: "215",
+          type: 3,
+        },
+        {
+          name: "N05方阵",
+          x: "1215",
+          y: "325",
+          type: 3,
+        },
+        {
+          name: "N10方阵",
+          x: "1220",
+          y: "465",
+          type: 3,
+        },
+        {
+          name: "N12方阵",
+          x: "1135",
+          y: "555",
+          type: 3,
+        },
+        {
+          name: "N04方阵",
+          x: "1005",
+          y: "315",
+          type: 3,
+        },
+        {
+          name: "N09方阵",
+          x: "995",
+          y: "455",
+          type: 3,
+        },
+        {
+          name: "N03方阵",
+          x: "785",
+          y: "315",
+          type: 3,
+        },
+        {
+          name: "N08方阵",
+          x: "765",
+          y: "455",
+          type: 3,
+        },
+        {
+          name: "N02方阵",
+          x: "580",
+          y: "310",
+          type: 3,
+        },
+        {
+          name: "N07方阵",
+          x: "545",
+          y: "455",
+          type: 3,
+        },
+        {
+          name: "N11方阵",
+          x: "605",
+          y: "540",
+          type: 3,
+        },
+        {
+          name: "N06方阵",
+          x: "325",
+          y: "450",
+          type: 3,
+        },
+      ],
+      list: [],
+      showname: "",
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.getData();
+    });
+  },
+  methods: {
+    getData() {
+      this.dataList.forEach((item) => {
+        this.windturbineList.forEach((i, num) => {
+          if (item.name == i.name) {
+            item["id"] = i.id;
+          }
+        });
+      });
+    },
+    handleClick(id, name) {
+      this.showname = name;
+      this.$refs.dialog.openDialog(id);
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.item-label-hover {
+  cursor: pointer;
+}
+.isshow {
+  display: none;
+  color: #ffffff;
+}
+</style>

src/views/stateMonitor/factoryMonitor/photovoltaic/lightGeomorphologicMap/index.vue

@@ -1,6 +1,10 @@
 <template>
   <headerButton :showType="true" :type="stationType" @renderData="renderData" />
   <div>
+    <testMap
+      :windturbineList="windturbineList"
+      ref="maps"
+    ></testMap>
     <!-- 山阴 -->
     <syMap
       v-if="project === 'SXJ_KGDL_SYG01_EG'"
@@ -90,6 +94,7 @@
 </template>
 <script>
 import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerButton.vue";
+import testMap from "./components/test-map.vue";
 import syMap from "./components/sy-map.vue";
 import syMap2 from "./components/sy2-map.vue";
 import fsMap from "./components/fs-map.vue";
@@ -110,6 +115,7 @@ export default {
   name: "geomorphologicMap",
   components: {
     headerButton,
+    testMap,
     syMap,
     syMap2,
     jrMap,

src/views/stateMonitor/factoryMonitor/photovoltaic/lightMillivolt/index.vue

@@ -6,7 +6,9 @@
   />
   <div style="height: calc(100% - 77px)">
     <!-- 光伏 *************** -->
-
+    <test
+      class="booster-station-body"
+    />
     <!-- 繁峙均然 -->
     <GFfanshijunran
       class="booster-station-body"
@@ -142,6 +144,7 @@ import headerButton from "@/views/stateMonitor/factoryMonitor/components/headerB
 import GFshanyinrongxin from "./components/shanyinrongxin.vue";
 import GFfangshansunjiashan from "./components/fangshansunjiashan.vue";
 import GFfanshijunran from "./components/fanshijunran.vue";
+import test from "./components/test.vue";
 import GFhuairenchuchen from "./components/huairenchuchen.vue";
 import GFpingluzuhu from "./components/pingluzuhu.vue";
 import GFtianzhenxusheng from "./components/tianzhenxusheng.vue";
@@ -156,6 +159,7 @@ export default {
   name: "lightMillivolt",
   components: {
     headerButton,
+    test,
     GFshanyinrongxin,
     GFfangshansunjiashan,
     GFfanshijunran,