update

src/components/chart/radar/normal-radar-chart.vue

@@ -66,6 +66,19 @@ export default {
             borderWidth: 0.5,
           },
         },
+		{
+		  areaStyle: {
+		    color: "rgba(165,228,175, 0.9)",
+		  },
+		  lineStyle: {
+		    color: "rgba(255,255,255, 0.85)",
+		  },
+		  itemStyle: {
+		    color: "rgba(165,228,175, 0.5)",
+		    borderColor: "rgba(255,255,255, 0.5)",
+		    borderWidth: 0.5,
+		  },
+		},
       ],
     };
   },

src/components/other/cesium/index.vue

@@ -50,28 +50,30 @@
 </template>
  
 <script>
-import addCircleWave from "./static/CiecleScan";
-import Windy from "./static/wind/Windy";
-import response from "./static/2017121300";
-import wtTree from "./static/fj";
+// import addCircleWave from "./static/CiecleScan";
+// import Windy from "./static/wind/Windy";
+// import response from "./static/2017121300";
+// import wtTree from "./static/fj";
 
-import h337 from "./static/heatmap";
+// import h337 from "./static/heatmap";
 
-import $ from "jquery";
+// import $ from "jquery";
 
-import {
-  createSnowStage,
-  createRainStage,
-} from "./static/postProcessController";
+// import {
+//   createSnowStage,
+//   createRainStage,
+// } from "./static/postProcessController";
 
-const Cesium = require("cesium/Cesium");
-const widgets = require("cesium/Widgets/widgets.css");
+// const Cesium = require("cesium/Cesium");
+// const widgets = require("cesium/Widgets/widgets.css");
 
 export default {
   data() {
     return {
       viewer: null,
-      url: window.__MODE__.tilesUrl,
+      // url: "http://localhost:8080/static/cesium/Assets/Textures/temp",
+      // url: "http://localhost:8080/static/cesium/Assets/Textures/NaturalEarthII",
+      url: "http://10.155.32.4/tiles",
       publicPath: "./",
       initPosition: [106.0231304, 37.73323706, 0],
 
@@ -106,9 +108,9 @@ export default {
   created() {},
 
   mounted() {
-    this.initMap();
-    this.handleCommand("b");
-    this.flyto(1600000);
+    // this.initMap();
+    // this.handleCommand("b");
+    // this.flyto(1600000);
   },
 
   computed: {},
@@ -621,7 +623,7 @@ export default {
   }
 }
 </style>
-<style lang="less">
+<!-- <style lang="less">
 .menu {
   .el-dropdown-menu {
     background: rgba(0, 0, 0, 0.5) !important;
@@ -633,4 +635,4 @@ export default {
 .heatmap-canvas {
   pointer-events: none;
 }
-</style>
+</style> -->

src/router/index.js

@@ -775,7 +775,7 @@ component:() => import("../views/MalfunctionWarning/MalfunctionWarning.vue")
 	name: "boosterAlarm",
 	component: () => import("../views/alarmCenter/boosterAlarm.vue")
 },
-{
+{//样本库，基础库，知识库
 	path: "/others/otherComponent",
 	name: "otherComponent",
 	component: () => import("../views/Others/otherComponent.vue")

src/views/Decision/Decision2.vue

@@ -728,7 +728,6 @@ export default {
         baseURL: "http://10.155.32.4:9001/",
         subUrl: "benchmarking/wplist",
         success(res) {
-			that.value1.push(res.data[0].id);
         //   that.value2.push(res.data[0].id);
           that.ChangZhan = res.data;
           //  that.AjaxCommon();

src/views/Decision/Decision2Cndb.vue

@@ -650,7 +650,6 @@ export default {
         subUrl: "benchmarking/wplist",
         success(res) {
           that.ChangZhan = res.data;
-          that.value1 = res.data[0].id;
         },
       });
     },

src/views/Decision/Decision2Xmdb.vue

@@ -682,7 +682,6 @@ export default {
         baseURL: "http://10.155.32.4:9001/",
         subUrl: "benchmarking/wplist",
         success(res) {
-          that.value1.push(res.data[0].id);
           that.ChangZhan = res.data;
           that.AjaxCommon();
         },

src/views/NewPages/dj1.vue

@@ -1422,7 +1422,7 @@ export default {
               mgtData.data[0].value.push(ele.data1);
             });
           }
-
+			mgtData.data[0].value.reverse();
           that[dataKey] = mgtData;
         },
       });

src/views/NewPages/multiple-y-line-chart-normal.vue

@@ -0,0 +1,484 @@
+<template>
+    <div class="chart" :id="id"></div>
+</template>
+
+<script>
+import util from "@/helper/util.js";
+import partten from "@/helper/partten.js";
+import * as echarts from "echarts";
+
+export default {
+    name: "multiple-y-line-chart-normal",
+    componentName: "multiple-y-line-chart-normal",
+    props: {
+        width: {
+            type: String,
+            default: "100%",
+        },
+        height: {
+            type: String,
+            default: "13.889vh",
+        },
+        // 数据
+        list: {
+            type: Array,
+            default: () => [
+                {
+                    title: "机舱震动x方向",
+                    yAxisIndex: 0,
+                    value: [
+                        {
+                            text: "-0.003",
+                            value: -0.003,
+                        },
+                        {
+                            text: "-0.002",
+                            value: -0.002,
+                        },
+                        {
+                            text: "-0.003",
+                            value: -0.006,
+                        },
+                        {
+                            text: "-0.003",
+                            value: -0.003,
+                        },
+                        {
+                            text: "-0.002",
+                            value: -0.002,
+                        },
+                        {
+                            text: "-0.003",
+                            value: -0.006,
+                        },
+                        {
+                            text: "-0.003",
+                            value: -0.003,
+                        },
+                        {
+                            text: "-0.002",
+                            value: -0.002,
+                        },
+                        {
+                            text: "-0.003",
+                            value: -0.006,
+                        },
+                    ],
+                },
+                {
+                    title: "机舱震动y方向",
+                    yAxisIndex: 1,
+                    value: [
+                        {
+                            text: "-0.01",
+                            value: -0.01,
+                        },
+                        {
+                            text: "-0.005",
+                            value: -0.005,
+                        },
+                        {
+                            text: "-0.008",
+                            value: -0.008,
+                        },
+                        {
+                            text: "-0.01",
+                            value: -0.01,
+                        },
+                        {
+                            text: "-0.005",
+                            value: -0.005,
+                        },
+                        {
+                            text: "-0.008",
+                            value: -0.008,
+                        },
+                        {
+                            text: "-0.01",
+                            value: -0.01,
+                        },
+                        {
+                            text: "-0.005",
+                            value: -0.005,
+                        },
+                        {
+                            text: "-0.008",
+                            value: -0.008,
+                        },
+                    ],
+                },
+                {
+                    title: "机舱震动最大偏移值",
+                    yAxisIndex: 2,
+                    value: [
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "0.05",
+                            value: 0.05,
+                        },
+                        {
+                            text: "0.5",
+                            value: 0.5,
+                        },
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "0.05",
+                            value: 0.05,
+                        },
+                        {
+                            text: "0.5",
+                            value: 0.5,
+                        },
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "0.05",
+                            value: 0.05,
+                        },
+                        {
+                            text: "0.5",
+                            value: 0.5,
+                        },
+                    ],
+                },
+                {
+                    title: "风速1",
+                    yAxisIndex: 3,
+                    value: [
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "5",
+                            value: 5,
+                        },
+                        {
+                            text: "3",
+                            value: 1,
+                        },
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "5",
+                            value: 5,
+                        },
+                        {
+                            text: "3",
+                            value: 1,
+                        },
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "5",
+                            value: 5,
+                        },
+                        {
+                            text: "3",
+                            value: 1,
+                        },
+                    ],
+                },
+                {
+                    title: "风速2",
+                    yAxisIndex: 4,
+                    value: [
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "2",
+                            value: 2,
+                        },
+                        {
+                            text: "3",
+                            value: 1,
+                        },
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "2",
+                            value: 2,
+                        },
+                        {
+                            text: "3",
+                            value: 1,
+                        },
+                        {
+                            text: "1",
+                            value: 1,
+                        },
+                        {
+                            text: "2",
+                            value: 2,
+                        },
+                        {
+                            text: "3",
+                            value: 1,
+                        },
+                    ],
+                },
+            ],
+        },
+        showLegend: {
+            type: Boolean,
+            default: false,
+        },
+        // 轴
+        yAxises: {
+            type: Array,
+            default: () => [
+                {
+                    name: '机舱震动x方向',
+                    min: -0.01,
+                    max: 0,
+                    unit: "",
+                    position: "left",
+                },
+                {
+                    name: '机舱震动y方向',
+                    min: -0.01,
+                    max: 0,
+                    unit: "",
+                    position: "right",
+                },
+                {
+                    name: '机舱震动最大偏移值',
+                    min: 0,
+                    max: 1,
+                    unit: "",
+                    position: "left",
+                },
+                {
+                    name: '风速1',
+                    min: 0,
+                    max: 10,
+                    unit: "",
+                    position: "right",
+                },
+                {
+                    name: '风速2',
+                    min: 0,
+                    max: 10,
+                    unit: "",
+                    position: "left",
+                },
+            ],
+        },
+    },
+    data() {
+        return {
+            id: "",
+            chart: null,
+            color: ["#323E6F", "#1DA0D7", "#05BB4C", "#EDB32F", "#DB5520"],
+        
+        };
+    },
+    computed: {
+        legend() {
+            return this.list.map((t) => {
+                return t.title;
+            });
+        },
+        xdata() {
+            console.log('this.list[0].value:',this.list)
+            if(this.list.length > 1){
+                this.list[1].value.forEach((lEle,lIndex)=>{
+                    console.log( this.list[1].value.indexOf(this.list[1].value[lIndex].text == "00:00") )
+                })
+                  return this.list[1]?.value.map((t) => {
+                return t.text;
+            });
+            }else if(this.list.length == 1){
+    return this.list[0]?.value.map((t) => {
+                return t.text;
+            });
+            }
+        
+        },
+        yAxis() {
+            let result = [];
+            let p = {left: 0, right: 0};
+            this.yAxises.forEach((item, index) => {
+                console.log('yitem:',item)
+                result.push({
+                    type: "value",
+                    name: `${item.name}${item.unit}`,
+                    nameLocation: p[item.position] % 2 == 0 ? "end" : "start",
+                    nameGap: 10,
+                    min: item.min,
+                    max: item.max,
+                    position: item.position,
+                    offset: p[item.position] * 50,
+                    axisLabel: {
+                        formatter: "{value}",
+                        fontSize: 12,
+                    },
+                    //分格线
+                    splitLine: {
+                        lineStyle: {
+                            color: partten.getColor("gray"),
+                            type: "dashed",
+                        },
+                    },
+                    axisLine: {
+                      show: true,
+                    },
+                    axisTick: {
+                      show: true
+                    }
+                });
+                p[item.position]++;
+            });
+console.log('yResult:',result)
+            return result;
+            
+        },
+        series() {
+            let result = [];
+           console.log('list:',this.list)
+            this.list.forEach((value, index) => {
+                console.log('seriesValue:',value)
+                console.log('seriesIndex:',index)
+                result.push({
+                    name: value.title,
+                    type: "line",
+                    smooth: true,
+                    zlevel: index,
+                    lineStyle: {
+                        normal: {
+                            color: this.color[index],
+                            width: 1,
+                        },
+                    },
+                    showSymbol: false,
+                    yAxisIndex: value.yAxisIndex,
+                    data: value.value.map((t) => {
+                        return t.value;
+                    }),
+                });
+            });
+
+            return result;
+        },
+    },
+    methods: {
+        resize() {},
+        initChart() {
+            const chart = echarts.init(this.$el);
+
+            let option = this.option();
+            chart.clear();
+          
+            chart.setOption(option);
+              console.log('111111111111111111111',option);
+
+            this.resize = function() {
+                chart.resize();
+            };
+
+            window.addEventListener("resize", this.resize);
+        },
+        option: function () {
+            return {
+                color: this.color,
+                tooltip: {
+                    trigger: "axis",
+                    backgroundColor: "rgba(0,0,0,0.4)",
+                    borderColor: partten.getColor("gray"),
+                    textStyle: {
+                        color: "#fff",
+                        fontSize: 12,
+                    },
+                },
+                legend: {
+                    show: this.showLegend,
+                    data: this.legend,
+                    top: 'top',
+                    icon: "circle",
+                    itemWidth: 6,
+                    inactiveColor: partten.getColor("gray"),
+                    textStyle: {
+                        color: partten.getColor("grayl"),
+                        fontSize: 12,
+                    },
+                },
+                grid: {
+                    top: 27,
+                    left: 16,
+                    right: 16,
+                    bottom: 0,
+                    containLabel: true,
+                },
+                xAxis: [
+                    {
+                        type: "category",
+                        boundaryGap: false,
+                        axisLabel: {
+                            interval: (Number((this.xdata.length / 8).toFixed(0)) > 2) ? Number((this.xdata.length / 8).toFixed(0)) : 0,
+                                showMinLabel: true,
+                                showMaxLabel: true,
+                            formatter: "{value}",
+                            fontSize: 12,
+                            textStyle: {
+                                color: partten.getColor("gray"),
+                            },
+                        },
+                        data: this.xdata,
+                    },
+                ],
+                yAxis: this.yAxis,
+                series: this.series,
+            };
+        },
+        reload: function () {
+            const chart = echarts.getInstanceByDom(this.$el);
+            chart.clear();
+            let option = this.option();
+            console.log('111111111111111111111',option);
+            chart.setOption(option);
+        },
+    },
+    created() {
+        this.id = "pie-chart-" + util.newGUID();
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$el.style.width = this.width;
+            this.$el.style.height = this.height;
+            this.initChart();
+        });
+    },
+    updated() {
+        this.$nextTick(() => {
+            this.initChart();
+        });
+    },
+    unmounted() {
+        window.removeEventListener("resize", this.resize);
+    },
+};
+</script>
+
+<style lang="less">
+.chart {
+    width: 100%;
+    height: 100%;
+    display: inline-block;
+}
+</style>

src/views/Others/gz.vue

@@ -0,0 +1,341 @@
+<template>
+	<el-scrollbar :height="height" v-if="gzCgd == 1">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">部件：</div>
+					<div class="search-input">
+						<el-select v-model="value1" clearable placeholder="请选择" popper-class="select" multiple>
+							<el-option v-for="item in BuJian" :key="item.value" :value="item.value" :label="item.label">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">停机类型：</div>
+					<div class="search-input">
+						<el-select v-model="value2" multiple placeholder="请选择" popper-class="select">
+							<el-option v-for="item in TingJiLeiXing" :key="item.value" :value="item.value"
+								:label="item.label">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">时间：</div>
+					<div class="search-input">
+						<el-date-picker v-model="value3" type="datetimerange" range-separator="至"
+							start-placeholder="开始日期" end-placeholder="结束日期">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-actions">
+					<button class="btn" @click="query()">查询</button>
+					<button class="btn" @click="addEdit()">新增</button>
+				</div>
+			</div>
+		</div>
+		<el-row :type="'flex'" class="content">
+			<el-col :span="24">
+				<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh" v-loading="tableLoading"
+					element-loading-text="拼命加载中" element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
+			</el-col>
+		</el-row>
+		<el-dialog :title="isvisiableType==1?'新增':'编辑'" v-model="isvisiable" width="45%" top="15vh" custom-class="modal"
+			:close-on-click-modal="false" :before-close="onClickDialogClose">
+			<!-- 这里是新增或编辑 -->
+			<el-row type="flex">
+				<el-col :span="12">
+					字段1：
+					<el-input placeholder="请选择日期" v-model="myInput1" :value="myInput1">
+					</el-input>
+				</el-col>
+				<el-col :span="12">
+					字段2：
+					<el-input placeholder="请选择日期" v-model="myInput2" :value="myInput2">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex">
+				<el-col :span="12">
+					字段3：
+					<el-input placeholder="请选择日期" v-model="myInput3" :value="myInput3">
+					</el-input>
+				</el-col>
+				<el-col :span="12">
+					字段4：
+					<el-input placeholder="请选择日期" v-model="myInput4" :value="myInput4">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex" justify="end">
+				<div class="query-actions" style="margin-top: 15px;">
+					<button class="btn" @click="onClickDialogClose">取消</button>
+					<button class="btn" @click="dialogSave()">保存</button>
+				</div>
+			</el-row>
+		</el-dialog>
+	</el-scrollbar>
+	<el-scrollbar :height="height" v-else>
+		<Cgd :data='gzCgdData' @gzCgdClick='gzCgdClick'/>
+	</el-scrollbar>
+</template>
+
+<script>
+	import ComTable from "@/components/coms/table/table.vue";
+	import Cgd from "./gzCgd.vue";
+	export default {
+		components: {
+			ComTable,
+			Cgd
+		},
+		data() {
+			const that = this;
+			return {
+				pageIndex: 1,
+				            pageSize: 20,
+				gzCgd:1,//传感点组件隐藏或显示
+				gzCgdData:'',//传感点参数
+				BuJian: [{
+					label: '部件1',
+					value: '1'
+				}, {
+					label: '部件2',
+					value: '2'
+				}],
+				TingJiLeiXing: [{
+					label: '类型1',
+					value: '1'
+				}, {
+					label: '类型2',
+					value: '2'
+				}],
+				value1: '',
+				value2: '',
+				value3: [],
+				myInput1: "",
+				myInput2: "",
+				myInput3: "",
+				myInput4: "",
+				isvisiable: false,
+				isvisiableType: 1, //新增为1，编辑为2
+				tableData: {
+					column: [{
+							name: "序号",
+							field: "index",
+							is_light: false,
+						},
+						{
+							name: "字段1",
+							field: "myInput1",
+							is_light: false,
+						},
+						{
+							name: "字段2",
+							field: "myInput2",
+							is_light: false,
+						},
+						{
+							name: "字段3",
+							field: "myInput3",
+							is_light: false,
+						},
+						{
+							name: "字段4",
+							field: "myInput4",
+							is_light: false,
+						},
+						{
+							name: "操作",
+							is_light: false,
+							width: 100,
+							template: () => {
+								return (
+									"<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='delete'>删除</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='config'>传感点</el-button>&nbsp"
+								);
+							},
+							click(e, row) {
+								that.onClickOption(e, row);
+							},
+						},
+					],
+					data: [{
+							index: 1,
+							myInput1: "MG01-01",
+							myInput2: "0.1000",
+							myInput3: "0.1000",
+							myInput4: "0.1000",
+							value: '这里放隐藏值1',
+							is_light: false,
+						},
+						{
+							index: 2,
+							myInput1: "MG01-02",
+							myInput2: "2",
+							myInput3: "23",
+							myInput4: "24",
+							value: '这里放隐藏值2',
+							is_light: false,
+						},
+					],
+				}
+			};
+		},
+		props: {
+			height: {
+				type: String
+			},
+		},
+		methods: {
+			getTable() {
+				let that = this;
+				this.tableLoading = true;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wplist",
+					data: {
+						wpId: that.stationId,
+						startTs: that.startDate,
+						endTs: that.endDate,
+						pageNum: that.pageIndex,
+						pageSize: that.pageSize,
+					},
+					success(res) {
+						var dataTab = [];
+						if (res.data) {
+							res.data.list.forEach(item => {
+								dataTab.push({ //表格
+									recodedata: that.formatTime(item.recodedata),
+									region: item.region,
+									weather: item.weather,
+									maximumtem: item.maximumtem,
+									minimumtem: item.minimumtem,
+									sunrise: item.sunrise,
+									sunset: item.sunset,
+									weather1: item.weather1,
+									weather2: item.weather2,
+									temperature1: item.temperature1,
+									temperature2: item.temperature2,
+									realfeel1: item.realfeel1,
+									realfeel2: item.realfeel2,
+									precipitation1: item.precipitation1,
+									precipitation2: item.precipitation2,
+									winddirection1: item.winddirection1,
+									winddirection2: item.winddirection2,
+									speed1: item.speed1,
+									speed2: item.speed2
+								})
+							})
+							that.tableData.data = dataTab;
+							that.tableData.total = res.data.total;
+						} else {
+							that.tableData.data = [];
+							that.tableData.total = 0;
+						}
+						that.tableLoading = false;
+					},
+				});
+			},
+			onChangePage(params) {
+				this.pageIndex = params.pageIndex;
+				this.pageSize = params.pageSize;
+				this.getTable();
+			},
+			startAjax() {
+				// BuJian
+				// TingJiLeiXing
+				var that = this;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wplist",
+					success(res) {
+						that.ChangZhan = res.data;
+					},
+				});
+			},
+			query() {
+				var that = this;
+				console.log(that.value1)
+				console.log(that.value2)
+				console.log(that.value3)
+				if(that.value3){
+					that.value3[0].valueOf()//开始时间
+					that.value3[1].valueOf()//结束时间
+				}
+				
+				// that.API.requestData({
+				// 	method: "GET",
+				// 	baseURL: "http://10.155.32.4:9001/",
+				// 	subUrl: "benchmarking/wplist",
+				// 	success(res) {
+				// 		that.ChangZhan = res.data;
+				// 	},
+				// });
+			},
+			addEdit() {
+				this.isvisiableType = 1;
+				this.myInput1 = '';
+				this.myInput2 = '';
+				this.myInput3 = '';
+				this.myInput4 = '';
+				this.isvisiable = true;
+			},
+			onClickOption(e, row) { // 操作按钮
+				let that = this;
+				console.log(row.value) //通过这个value去执行相关操作
+				if ("delete" == e.target.getAttribute("value")) {
+					that
+						.$confirm("确认删除此条样本数据？", "提示", {
+							confirmButtonText: "删除",
+							cancelButtonText: "取消"
+						})
+						.then((_) => {
+							console.log('ok')
+							// that.requestDelete(row);
+						})
+						.catch((_) => {});
+				}
+				if ("edit" == e.target.getAttribute("value")) {
+					that.isvisiableType = 2;
+					that.$nextTick(()=>{
+						that.myInput1 = row.myInput1;
+						that.myInput2 = row.myInput2;
+						that.myInput3 = row.myInput3;
+						that.myInput4 = row.myInput4;
+					});
+					that.isvisiable = true;
+				}
+				if ("config" == e.target.getAttribute("value")) {//传感点
+					that.gzCgdData = row.value;
+					that.gzCgd = 2;
+				}
+			},
+			onClickDialogClose() { // 弹窗右上角关闭按钮
+				this.isvisiable = false;
+				this.isvisiableType = 1;
+			},
+			dialogSave() {
+				console.log(this.myInput1)
+				// myInput1: "",
+				// myInput2: "",
+				// myInput3: "",
+				// myInput4: "",
+			},
+			gzCgdClick(data){
+				this.gzCgd = data;
+			}
+		},
+		created() {
+			// this.startAjax();
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+	
+</style>

src/views/Others/gzCgd.vue

@@ -0,0 +1,255 @@
+<template>
+	<div>
+		<el-row type="flex">
+			<div class="query-actions">
+				<button class="btn" @click="addEdit">新增</button>
+				<button class="btn" @click="back">返回</button>
+			</div>
+		</el-row>
+		<el-row :type="'flex'" class="content">
+			<el-col :span="24">
+				<ComTable :data="tableData" :pageSize="pageSize" @onPagging="onChangePage" height="84vh"
+					v-loading="tableLoading" element-loading-text="拼命加载中"
+					element-loading-background="rgba(0, 0, 0, 0.8)"></ComTable>
+			</el-col>
+		</el-row>
+		<el-dialog :title="isvisiableType==1?'新增':'编辑'" v-model="isvisiable" width="45%" top="15vh" custom-class="modal"
+			:close-on-click-modal="false" :before-close="onClickDialogClose">
+			<!-- 这里是新增或编辑 -->
+			<el-row type="flex">
+				<el-col :span="12">
+					字段1：
+					<el-input placeholder="请选择日期" v-model="myInput1" :value="myInput1"></el-input>
+				</el-col>
+				<el-col :span="12">
+					字段2：
+					<el-input placeholder="请选择日期" v-model="myInput2" :value="myInput2">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex">
+				<el-col :span="12">
+					字段3：
+					<el-input placeholder="请选择日期" v-model="myInput3" :value="myInput3">
+					</el-input>
+				</el-col>
+				<el-col :span="12">
+					字段4：
+					<el-input placeholder="请选择日期" v-model="myInput4" :value="myInput4">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex" justify="end">
+				<div class="query-actions" style="margin-top: 15px;">
+					<button class="btn" @click="onClickDialogClose">取消</button>
+					<button class="btn" @click="dialogSave()">保存</button>
+				</div>
+			</el-row>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	import ComTable from "@/components/coms/table/table.vue";
+	export default {
+		components: {
+			ComTable
+		},
+		data() {
+			const that = this;
+			return {
+				pageIndex: 1,
+				pageSize: 20,
+				myInput1: "",
+				myInput2: "",
+				myInput3: "",
+				myInput4: "",
+				isvisiable: false,
+				isvisiableType: 1, //新增为1，编辑为2
+				tableData: {
+					column: [{
+							name: "序号",
+							field: "index",
+							is_light: false,
+						},
+						{
+							name: "字段1",
+							field: "myInput1",
+							is_light: false,
+						},
+						{
+							name: "字段2",
+							field: "myInput2",
+							is_light: false,
+						},
+						{
+							name: "字段3",
+							field: "myInput3",
+							is_light: false,
+						},
+						{
+							name: "字段4",
+							field: "myInput4",
+							is_light: false,
+						},
+						{
+							name: "操作",
+							is_light: false,
+							width: 100,
+							template: () => {
+								return (
+									"<el-button type='text' style='cursor: pointer;' value='edit'>编辑</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='delete'>删除</el-button>&nbsp" +
+									"<el-button type='text' style='cursor: pointer;' value='config'>原始数据</el-button>&nbsp"
+								);
+							},
+							click(e, row) {
+								that.onClickOption(e, row);
+							},
+						},
+					],
+					data: [{
+							index: 1,
+							myInput1: "MG01-01",
+							myInput2: "0.1000",
+							myInput3: "0.1000",
+							myInput4: "0.1000",
+							value: '这里放隐藏值1',
+							is_light: false,
+						},
+						{
+							index: 2,
+							myInput1: "MG01-02",
+							myInput2: "2",
+							myInput3: "23",
+							myInput4: "24",
+							value: '这里放隐藏值2',
+							is_light: false,
+						},
+					],
+				}
+			};
+		},
+		props: {
+			data: {
+				type: String
+			},
+		},
+		methods: {
+			getTable() {
+				let that = this;
+				this.tableLoading = true;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wplist",
+					data: {
+						wpId: that.stationId,
+						startTs: that.startDate,
+						endTs: that.endDate,
+						pageNum: that.pageIndex,
+						pageSize: that.pageSize,
+					},
+					success(res) {
+						var dataTab = [];
+						if (res.data) {
+							res.data.list.forEach(item => {
+								dataTab.push({ //表格
+									recodedata: that.formatTime(item.recodedata),
+									region: item.region,
+									weather: item.weather,
+									maximumtem: item.maximumtem,
+									minimumtem: item.minimumtem,
+									sunrise: item.sunrise,
+									sunset: item.sunset,
+									weather1: item.weather1,
+									weather2: item.weather2,
+									temperature1: item.temperature1,
+									temperature2: item.temperature2,
+									realfeel1: item.realfeel1,
+									realfeel2: item.realfeel2,
+									precipitation1: item.precipitation1,
+									precipitation2: item.precipitation2,
+									winddirection1: item.winddirection1,
+									winddirection2: item.winddirection2,
+									speed1: item.speed1,
+									speed2: item.speed2
+								})
+							})
+							that.tableData.data = dataTab;
+							that.tableData.total = res.data.total;
+						} else {
+							that.tableData.data = [];
+							that.tableData.total = 0;
+						}
+						that.tableLoading = false;
+					},
+				});
+			},
+			onChangePage(params) {
+				this.pageIndex = params.pageIndex;
+				this.pageSize = params.pageSize;
+				this.getTable();
+			},
+			addEdit() {
+				this.isvisiableType = 1;
+				this.myInput1 = '';
+				this.myInput2 = '';
+				this.myInput3 = '';
+				this.myInput4 = '';
+				this.isvisiable = true;
+			},
+			onClickOption(e, row) { // 操作按钮
+				let that = this;
+				console.log(row.value) //通过这个value去执行相关操作
+				if ("delete" == e.target.getAttribute("value")) {
+					that
+						.$confirm("确认删除此条样本数据？", "提示", {
+							confirmButtonText: "删除",
+							cancelButtonText: "取消"
+						})
+						.then((_) => {
+							console.log('ok')
+							// that.requestDelete(row);
+						})
+						.catch((_) => {});
+				}
+				if ("edit" == e.target.getAttribute("value")) {
+					that.isvisiableType = 2;
+					that.$nextTick(() => {
+						that.myInput1 = row.myInput1;
+						that.myInput2 = row.myInput2;
+						that.myInput3 = row.myInput3;
+						that.myInput4 = row.myInput4;
+					});
+					that.isvisiable = true;
+				}
+				if ("config" == e.target.getAttribute("value")) { //传感点
+					that.gzCgd = 2;
+				}
+			},
+			onClickDialogClose() { // 弹窗右上角关闭按钮
+				this.isvisiable = false;
+				this.isvisiableType = 1;
+			},
+			dialogSave() {
+				console.log(this.myInput1)
+				// myInput1: "",
+				// myInput2: "",
+				// myInput3: "",
+				// myInput4: "",
+			},
+			back() {
+				this.$emit('gzCgdClick', 1);
+			}
+		},
+		created() {
+			// console.log(this.data)//上个页面的参数
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/otherComponent.vue

@@ -1,165 +1,76 @@
 <template>
-	<tab :data="tabData" @select="select" />
 	<el-row>
 		<el-col :span="3">
-			<el-tree :data="elTreeData.data[currTab]" :props="elTreeData.defaultProps" @node-click="handleNodeClick"></el-tree>
+			<el-tree :data="elTreeData.data" :props="elTreeData.defaultProps" @node-click="handleNodeClick" default-expand-all highlight-current :expand-on-click-node="false"></el-tree>
 		</el-col>
 		<el-col :span="21">
-			<tab :data="tabData2[currTab]" @select="select2" />
-			<Fj v-if="currTab == 0" :currTab="currTab2" height="85vh"/>
-			<Syz v-if="currTab == 1" :currTab="currTab2" height="85vh"/>
+			<Gz v-if="currTab == 'ybk1'" height="92vh" />
+			<Xn v-if="currTab == 'ybk2'" height="92vh" />
+			<Yj v-if="currTab == 'ybk3'" height="92vh" />
+			<Zn v-if="currTab == 'ybk4'" height="92vh" />
 		</el-col>
 	</el-row>
 </template>
 
 <script>
-	import Tab from "../../components/coms/tabs/tab.vue";
-	import Fj from "./otherComponentFj.vue";
-	import Syz from "./otherComponentSyz.vue";
+	import $ from "jquery";
+	import Gz from "./gz.vue";
+	import Xn from "./xn.vue";
+	import Yj from "./yj.vue";
+	import Zn from "./zn.vue";
 	export default {
-		components: {Tab,Fj,Syz},
+		components: {
+			Gz,
+			Xn,
+			Yj,
+			Zn
+		},
 		data() {
 			return {
-				currTab: 0,
-				currTab2: 0,
-				tabData: [{
-						id: "0",
-						text: "风机",
-					},
-					{
-						id: "1",
-						text: "升压站",
-					}
-				],
-				tabData2: [
-					[{
-							id: "0",
-							text: "位置",
-						},
-						{
-							id: "1",
-							text: "技术参数",
-						},
-						{
-							id: "2",
-							text: "预防性维护",
-						},
-						{
-							id: "3",
-							text: "设备历史",
-						},
-						{
-							id: "4",
-							text: "设备维护操作记录",
-						}
-					],
-					[{
-							id: "0",
-							text: "位置2",
-						},
-						{
-							id: "1",
-							text: "技术参数",
-						},
-						{
-							id: "2",
-							text: "预防性维护",
-						},
-						{
-							id: "3",
-							text: "设备历史",
-						},
-						{
-							id: "4",
-							text: "设备维护操作记录",
-						}
-					],
-				],
+				currTab: 'ybk1',
 				elTreeData: {
-					data: [[{
-							label: "一级 1",
+					data: [{
+							label: "样本库",
 							children: [{
-								label: "二级 1-1",
-								children: [{
-									label: "三级 1-1-1",
-								}, ],
-							}, ],
+								label: "故障样本库",
+								id: 'ybk1'
+							}, {
+								label: "性能下降样本库",
+								id: 'ybk2'
+							}, {
+								label: "预警分析样本库",
+								id: 'ybk3'
+							}, {
+								label: "智能营销样本库",
+								id: 'ybk4'
+							}],
 						},
 						{
-							label: "一级 2",
+							label: "基础库",
 							children: [{
-									label: "二级 2-1",
-									children: [{
-										label: "三级 2-1-1",
-									}, ],
-								},
-								{
-									label: "二级 2-2",
-									children: [{
-										label: "三级 2-2-1",
-									}, ],
-								},
-							],
+								label: "风机",
+								id: 'jck1'
+							}, {
+								label: "升压站",
+								id: 'jck2'
+							}, {
+								label: "场站",
+								id: 'jck3'
+							}, {
+								label: "逆变器",
+								id: 'jck4'
+							}, {
+								label: "测点",
+								id: 'jck5'
+							}, {
+								label: "风机类型",
+								id: 'jck6'
+							}],
 						},
 						{
-							label: "一级 3",
-							children: [{
-									label: "二级 3-1",
-									children: [{
-										label: "三级 3-1-1",
-									}, ],
-								},
-								{
-									label: "二级 3-2",
-									children: [{
-										label: "三级 3-2-1",
-									}, ],
-								},
-							],
+							label: "知识库",
 						},
 					],
-					[{
-							label: "mw一级 1",
-							children: [{
-								label: "二级 1-1",
-								children: [{
-									label: "三级 1-1-1",
-								}, ],
-							}, ],
-						},
-						{
-							label: "一级 2",
-							children: [{
-									label: "二级 2-1",
-									children: [{
-										label: "三级 2-1-1",
-									}, ],
-								},
-								{
-									label: "二级 2-2",
-									children: [{
-										label: "三级 2-2-1",
-									}, ],
-								},
-							],
-						},
-						{
-							label: "一级 3",
-							children: [{
-									label: "二级 3-1",
-									children: [{
-										label: "三级 3-1-1",
-									}, ],
-								},
-								{
-									label: "二级 3-2",
-									children: [{
-										label: "三级 3-2-1",
-									}, ],
-								},
-							],
-						},
-					]],
 					defaultProps: {
 						children: "children",
 						label: "label",
@@ -168,24 +79,31 @@
 			};
 		},
 		methods: {
-			select(data) {
-				if (data.id != this.currTab) {
-					this.currTab = parseInt(data.id);
-					this.currTab2 = 0;
+			handleNodeClick(a) {
+				if (a.id) {
+					this.currTab = a.id;
 				}
 			},
-			select2(data) {
-				console.log(data)
-				this.currTab2 = parseInt(data.id);
-			},
 		},
 		created() {
 
 		},
-		mounted() {},
+		mounted() {
+			// jq实现的tree默认第一个节点选中
+			$('.el-tree .el-tree-node__children').eq(0).find('.el-tree-node').eq(0).addClass('is-current');
+			$('.el-tree .el-tree-node__children .el-tree-node').click(function(){
+				$(this).siblings().removeClass('is-current')
+			})
+		},
 	};
 </script>
 
-<style lang="less" scoped>
-
+<style lang="less">
+	.el-tree{
+		.el-tree-node__children {
+			.el-tree-node__content{cursor: pointer;}
+			.el-tree-node.is-current{background-color: #0F3C25;}
+		}
+		.el-tree-node__content{cursor: auto;}
+	}
 </style>

src/views/Others/otherComponentFj.vue

@@ -1,49 +0,0 @@
-<template>
-	<el-scrollbar v-if="currTab == 0" :height="height">
-	 风机1
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 1" :height="height">
-	 2
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 2" :height="height">
-	 3
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 3" :height="height">
-	 4
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 4" :height="height">
-	 5
-	</el-scrollbar>
-</template>
-
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-		props:{
-			currTab:{
-			  type: Number
-			},
-			height: {
-			  type: String
-			},
-		},
-		methods:{
-			
-		},
-		created() {
-
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/otherComponentSyz.vue

@@ -1,49 +0,0 @@
-<template>
-	<el-scrollbar v-if="currTab == 0" :height="height">
-	升压站 1
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 1" :height="height">
-	 2
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 2" :height="height">
-	 3
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 3" :height="height">
-	 4
-	</el-scrollbar>
-	<el-scrollbar v-if="currTab == 4" :height="height">
-	 5
-	</el-scrollbar>
-</template>
-
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-		props:{
-			currTab:{
-			  type: Number
-			},
-			height: {
-			  type: String
-			},
-		},
-		methods:{
-			
-		},
-		created() {
-
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/xn.vue

@@ -0,0 +1,37 @@
+<template>
+	<el-scrollbar :height="height">
+	 风机2
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/yj.vue

@@ -0,0 +1,37 @@
+<template>
+	<el-scrollbar :height="height">
+	 风机3
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/Others/zn.vue

@@ -0,0 +1,37 @@
+<template>
+	<el-scrollbar :height="height">
+	 风机4
+	</el-scrollbar>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		data() {
+			return {
+				
+			};
+		},
+		props:{
+			currTab:{
+			  type: Number
+			},
+			height: {
+			  type: String
+			},
+		},
+		methods:{
+			
+		},
+		created() {
+
+		},
+		mounted() {},
+	};
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/views/WindSite/components/boosterstation/dwk.vue

@@ -14,7 +14,7 @@
               y="0px"
               width="1681.668px"
               height="806.571px"
-              viewBox="0 80 1718.668 806.571"
+              viewBox="0 0 1718.668 806.571"
               enable-background="new 0 0 1681.668 806.571"
               xml:space="preserve"
             >
@@ -178,7 +178,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5445,7 +5445,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5545,7 +5545,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5645,7 +5645,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5745,7 +5745,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5845,7 +5845,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (kVar)
+                      (MVar)
                     </tspan>
                     <tspan
                       x="36.451"

src/views/WindSite/components/boosterstation/mch.vue

@@ -259,7 +259,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 664.6775 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -273,7 +273,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -307,7 +307,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 664.6775 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -321,7 +321,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 264.0801)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 264.0801)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">

src/views/WindSite/components/boosterstation/mhs.vue

@@ -14,7 +14,7 @@
               y="0px"
               width="1617.869px"
               height="1130.968px"
-              viewBox="0 80 1617.869 1200.968"
+              viewBox="0 0 1617.869 1200.968"
               enable-background="new 0 0 1617.869 1130.968"
               xml:space="preserve"
             >
@@ -4792,7 +4792,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.4551"
                     >
-                      MW
+                      kW
                     </text>
                     <text
                       transform="matrix(1 0 0 1 39.1521 1062.0347)"
@@ -4816,7 +4816,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.4551"
                     >
-                      MVar
+                      kVar
                     </text>
                     <text
                       transform="matrix(1 0 0 1 39.1521 1094.1343)"

src/views/WindSite/components/boosterstation/nss.vue

@@ -7,7 +7,7 @@
 
 						<svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 							version="1.1" id="图层_1" x="0px" y="0px" width="1932.596px" height="894.189px"
-							viewBox="-30 70 1920.596 914.189" enable-background="new 0 0 1922.596 894.189"
+							viewBox="-30 0 1920.596 914.189" enable-background="new 0 0 1922.596 894.189"
 							xml:space="preserve">
 							<g id="other">
 								<path fill="none" stroke="#40B9B0" stroke-width="2.5" stroke-miterlimit="10"
@@ -2831,7 +2831,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 -10.5789 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											Mw
+											kW
 										</text>
 										<text transform="matrix(1 0 0 1 2.8728 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2843,7 +2843,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 -15.6868 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											MVar
+											kVar
 										</text>
 										<text transform="matrix(1 0 0 1 2.8728 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2879,7 +2879,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 1606.0286 113.8252)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(kW)
+											(MW)
 										</text>
 										<text transform="matrix(1 0 0 1 1627.4875 113.8252)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2893,7 +2893,7 @@
 										</text>
 										<text transform="matrix(1 0 0 1 1600.3196 136.1104)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(kVar)
+											(MVar)
 										</text>
 										<text transform="matrix(1 0 0 1 1627.4875 136.1104)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">

src/views/WindSite/components/boosterstation/pl1.vue

@@ -14,7 +14,7 @@
               y="0px"
               width="1848.938px"
               height="829.936px"
-              viewBox="0 80 1848.938 829.936"
+              viewBox="0 0 1848.938 829.936"
               enable-background="new 0 0 1848.938 829.936"
               xml:space="preserve"
             >
@@ -512,7 +512,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 239.0789 296.7874)"
@@ -538,7 +538,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 239.0789 319.0725)"
@@ -1335,7 +1335,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 506.6316 297.5061)"
@@ -1361,7 +1361,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 506.6316 319.7913)"
@@ -2013,7 +2013,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 765.3103 297.5061)"
@@ -2039,7 +2039,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 765.3098 319.7913)"
@@ -2165,7 +2165,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1041.0198 298.51)"
@@ -2191,7 +2191,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1041.0198 320.7952)"
@@ -2847,7 +2847,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1687.7151 298.51)"
@@ -2873,7 +2873,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1687.7151 320.7952)"
@@ -3442,7 +3442,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1348.2288 298.51)"
@@ -3468,7 +3468,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1348.2268 320.7952)"
@@ -4180,7 +4180,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 739.5056 139.5452)"
@@ -4206,7 +4206,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 739.5056 161.8303)"
@@ -4304,7 +4304,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MM)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1355.8752 129.2971)"
@@ -4330,7 +4330,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1355.8733 151.5823)"
@@ -4468,7 +4468,7 @@
                   font-family="'MicrosoftYaHei'"
                   font-size="15"
                 >
-                  输出功率(kW):
+                  输出功率(MM):
                 </text>
               </g>
               <g id="arrow">

src/views/WindSite/components/boosterstation/pl2.vue

@@ -6,7 +6,7 @@
 					<template v-slot:svg>
 <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 							version="1.1" id="图层_1" x="0px" y="0px" width="1853.732px" height="885.063px"
-							viewBox="0 80 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
+							viewBox="0 0 1853.732 885.063" enable-background="new 0 0 1853.732 885.063"
 							xml:space="preserve">
 							<g id="other_1_">
 								<path fill="none" stroke="#42B0A8" stroke-width="2.5" stroke-miterlimit="10"
@@ -130,7 +130,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 166.8015 82.063)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 188.2629 82.063)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -162,7 +162,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 927.3142 86.4722)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 948.7742 86.4722)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -258,7 +258,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1720.8406 191.0923)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 1742.3005 191.0923)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -290,7 +290,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1591.4314 74.6606)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MM)
 									</text>
 									<text transform="matrix(1 0 0 1 1612.8914 74.6606)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -306,7 +306,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1585.7214 95.0884)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1612.8914 95.0884)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">

src/views/WindSite/components/boosterstation/qs.vue

@@ -14,7 +14,7 @@
               y="0px"
               width="1755.701px"
               height="853.164px"
-              viewBox="0 80 1755.701 853.164"
+              viewBox="0 0 1755.701 853.164"
               enable-background="new 0 0 1755.701 853.164"
               xml:space="preserve"
             >
@@ -86,7 +86,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1116.6396 32.3096)"
@@ -112,7 +112,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1116.6396 54.5947)"
@@ -284,7 +284,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 306.2197)"
@@ -310,7 +310,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 328.5049)"
@@ -411,7 +411,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 465.2539)"
@@ -437,7 +437,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 264.3535 487.5391)"
@@ -538,7 +538,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 306.2197)"
@@ -564,7 +564,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 328.5049)"
@@ -665,7 +665,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kW)
+                    (MW)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 465.2539)"
@@ -691,7 +691,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="9.6234"
                   >
-                    (kVar)
+                    (MVar)
                   </text>
                   <text
                     transform="matrix(1 0 0 1 1323.8809 487.5391)"

src/views/WindSite/components/boosterstation/sbdl.vue

@@ -15,7 +15,7 @@
               y="0px"
               width="1313.34px"
               height="587.686px"
-              viewBox="0 50 1313.34 587.686"
+              viewBox="0 0 1313.34 587.686"
               enable-background="new 0 0 1313.34 587.686"
               xml:space="preserve"
             >
@@ -2679,7 +2679,7 @@
                         font-family="'MicrosoftYaHei'"
                         font-size="10.652"
                       >
-                        P(kW)
+                        P(MM)
                       </text>
                     </g>
                     <g>
@@ -2689,7 +2689,7 @@
                         font-family="'MicrosoftYaHei'"
                         font-size="10.652"
                       >
-                        Q(kVar)
+                        Q(MVar)
                       </text>
                     </g>
                   </g>

src/views/WindSite/components/boosterstation/sbq.vue

@@ -7,7 +7,7 @@
 						
 <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 							version="1.1" id="图层_1" x="0px" y="0px" width="1864.602px" height="860.264px"
-							viewBox="0 80 1864.602 860.264" enable-background="new 0 0 1864.602 860.264"
+							viewBox="0 0 1864.602 860.264" enable-background="new 0 0 1864.602 860.264"
 							xml:space="preserve">
 							<g id="other">
 								<rect x="25.503" y="60.704" opacity="0.9" fill="#162320" enable-background="new    "
@@ -35,7 +35,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 53.9529 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 75.4124 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -51,7 +51,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 48.2439 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 75.4124 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -107,7 +107,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 727.2854 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 748.7454 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -123,7 +123,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 721.5764 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 748.7454 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -1016,7 +1016,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1395.4182 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 1416.8792 93.0139)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -1032,7 +1032,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1389.7092 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1416.8792 113.4426)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2383,7 +2383,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 408.8977 461.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 430.3572 461.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2397,7 +2397,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 403.1882 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 430.3572 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2443,7 +2443,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 896.7292 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 918.1887 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2457,7 +2457,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 891.0208 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 918.1887 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2503,7 +2503,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1298.7834 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 1320.2424 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2517,7 +2517,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1293.0745 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1320.2424 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2563,7 +2563,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1418.9377 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kW)
+										(MW)
 									</text>
 									<text transform="matrix(1 0 0 1 1440.3967 462.8801)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -2577,7 +2577,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1413.2288 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(kVar)
+										(MVar)
 									</text>
 									<text transform="matrix(1 0 0 1 1440.3967 484.1643)" fill="#96A0A1"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">

src/views/WindSite/components/boosterstation/xh.vue

@@ -11,7 +11,7 @@
         y="0px"
         width="1918px"
         height="879.725px"
-        viewBox="0 80 1918 879.725"
+        viewBox="0 0 1918 879.725"
         enable-background="new 0 0 1918 879.725"
         xml:space="preserve"
       >
@@ -110,7 +110,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1048.5251 88.1272)"
@@ -676,7 +676,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7498 234.0979)"
@@ -702,7 +702,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 256.3821)"
@@ -816,7 +816,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 549.0823 388.0686)"
@@ -842,7 +842,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 549.0823 410.3547)"
@@ -956,7 +956,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7498 493.3762)"
@@ -982,7 +982,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 515.6604)"
@@ -1096,7 +1096,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 352.1238 523.7493)"
@@ -1194,7 +1194,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 768.5061 352.0559)"
@@ -1220,7 +1220,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 768.5061 374.343)"
@@ -1318,7 +1318,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 994.5212 352.0559)"
@@ -1344,7 +1344,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 994.5212 374.343)"
@@ -2711,7 +2711,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1243.8181 374.343)"
@@ -2835,7 +2835,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1458.8123 489.2522)"
@@ -2959,7 +2959,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1669.8123 489.2522)"
@@ -8218,7 +8218,7 @@
                 font-family="'MicrosoftYaHei'"
                 font-size="12.1437"
               >
-                (kW)
+                (MM)
               </text>
               <text
                 transform="matrix(1 0 0 1 45.3665 864.7239)"

src/views/WindSite/components/boosterstation/xs.vue

@@ -11,7 +11,7 @@
         y="0px"
         width="1788.209px"
         height="848.758px"
-        viewBox="0 80 1788.209 848.758"
+        viewBox="0 0 1788.209 848.758"
         enable-background="new 0 0 1788.209 848.758"
         xml:space="preserve"
       >
@@ -2213,7 +2213,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kW)
+              (MM)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.9412 189.844)"
@@ -2248,7 +2248,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (kVar)
+              (MVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1712.9412 210.2727)"

src/views/WindSite/components/generalappearance/sbq.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <previewPicture v-if="datas">
           <template v-slot:svg>
-            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 86 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
+            <svg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="图层_1" x="0px" y="0px" width="1794px" height="788px" viewBox="0 46 1794 788" enable-background="new 0 0 1794 788" xml:space="preserve">
             <g id="other">
             	<g opacity="0.6">
             		<path opacity="0.4" fill="#114832" enable-background="new    " d="M44.605,133.222c0,0.709-0.574,1.281-1.283,1.281H8.933    c-0.709,0-1.283-0.572-1.283-1.281v-22.84c0-0.709,0.574-1.281,1.283-1.281h34.392c0.709,0,1.282,0.572,1.282,1.281    L44.605,133.222L44.605,133.222z"></path>

src/views/WindSite/components/generalappearance/xh.vue

@@ -6,7 +6,7 @@
 					<template v-slot:svg>
 						<svg class="svg" version="1.0" id="图层_1" xmlns="http://www.w3.org/2000/svg"
 							xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1374px" height="557.86px"
-							viewBox="0 90 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
+							viewBox="0 40 1374 557.86" enable-background="new 0 0 1374 557.86" xml:space="preserve">
 							<g id="other">
 								<polygon fill="#B6065C" points="1314.454,24.469 1322.343,5.755 1330.232,24.472 	" />
 								<rect x="1321.816" y="24.5" fill="#B6065C" width="1.375" height="49.073" />

src/views/WindSite/components/generalappearance/xs.vue

@@ -11,10 +11,10 @@
               xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink"
               x="0px"
-              y="0px"
+              y="30px"
               width="1399.132px"
               height="800px"
-              viewBox="0 65 1399.132 629.341"
+              viewBox="0 35 1399.132 629.341"
               enable-background="new 0 0 1399.132 629.341"
               xml:space="preserve"
             >

src/views/WindSite/components/previewPicture.vue

@@ -96,7 +96,7 @@ export default {
       isChange: true,
       // 图片显示默认大小
       width: "1600px",
-      height: "1000px",
+      height: "800px",
       // 可缩小倍数,为空则可无限缩小
       minification: 3,
       // 可放大倍数 为空则可无限放大

src/views/report/ExportExcel.vue

@@ -183,8 +183,9 @@
 				this.allExportF(0);
 			},
 			allExportF(_index, thisIndex) {//_index递归递增，thisIndex单击导出【下标】
-				BASE.showLoading({text:'正在导出，请耐心等待...'});
 				const that = this;
+				var loadingName = thisIndex!=undefined?'正在导出'+that.zipNames[thisIndex]:(that.zipNames[_index]!=undefined?'正在导出'+that.zipNames[_index]:'正在合成压缩包');
+				BASE.showLoading({text: loadingName +'，请耐心等待...'});
 				if (that.stations[_index]) {
 					that.API.requestData({
 						method: "GET",
@@ -247,7 +248,7 @@
 					if (deepIndex!=undefined) {
 						setTimeout(() => {
 							that.export(data, _index, zipName, deepIndex);
-						}, 500);
+						}, 1000);
 						if (dataKey.length == _index) { //当长度一致时，向zip塞值
 							var thisPath = that.paths,
 								thisPathName = that.pathName;
@@ -258,7 +259,7 @@
 					} else {
 						setTimeout(() => {
 							that.export(data, _index, zipName);
-						}, 500);
+						}, 1000);
 						if (dataKey.length == _index) { //当长度一致时，向zip塞值
 							var thisPath = that.paths,
 								thisPathName = that.pathName;

src/views/sisView/index.vue

@@ -377,6 +377,11 @@ export default {
 
     &:first-child {
       margin: 0;
+	  .contentItem {
+		  .itemNum {
+			width: 157px !important;
+		  }
+	  }
     }
 
     .viewTitle {