冲突处理

src/router/index.js

@@ -779,25 +779,29 @@ const routes = [{
 	name: "boosterAlarm",
 	component: () => import("../views/alarmCenter/boosterAlarm.vue")
 },
-{//故障样本库
-	path: "/others/gz",
-	name: "gz",
-	component: () => import("../views/Others/gz.vue")
-},
-{//性能样本库
-	path: "/others/xn",
-	name: "xn",
-	component: () => import("../views/Others/xn.vue")
-},
-{//预警样本库
-	path: "/others/yj",
-	name: "yj",
-	component: () => import("../views/Others/yj.vue")
-},
-{//智能样本库
-	path: "/others/zn",
-	name: "zn",
-	component: () => import("../views/Others/zn.vue")
+//故障样本库
+{
+	path: "/others/fault",
+	name: "fault",
+	component: () => import("../views/sampleDatabase/fault/index.vue")
+},
+//性能样本库
+{
+	path: "/others/performance",
+	name: "performance",
+	component: () => import("../views/sampleDatabase/performance/index.vue")
+},
+//预警样本库
+{
+	path: "/others/warning",
+	name: "warning",
+	component: () => import("../views/sampleDatabase/warning/index.vue")
+},
+//智能营销样本库
+{
+	path: "/others/market",
+	name: "market",
+	component: () => import("../views/sampleDatabase/market/index.vue")
 },
 // 报警中心-SCADA报警
 {

src/views/NewPages/alarm-center-1.vue

@@ -333,6 +333,7 @@ export default {
           name: name,
         },
         success(res) {
+			console.log(res)
           if (res.data.length == 1) {
             that.dialogVisible = true;
             BASE.closeLoading();

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

@@ -295,15 +295,7 @@ export default {
       });
     },
     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;
         });
@@ -317,7 +309,6 @@ export default {
       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}`,
@@ -347,12 +338,10 @@ export default {
         });
         p[item.position]++;
       });
-      console.log("yResult:", result);
       return result;
     },
     series() {
       let result = [];
-      console.log("list:", this.list);
       this.list.forEach((value, index) => {
         result.push({
           name: value.title,

src/views/Others/gzCgd.vue

@@ -1,332 +0,0 @@
-<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>
-		
-		<!-- 原始数据start -->
-		<el-dialog title="原始数据" v-model="yssjDialog" width="70%" top="15vh" custom-class="modal"
-			:close-on-click-modal="false" :before-close="yssjDialogClose">
-			
-			<div class="query mg-b-8">
-				<div class="query-items">
-					<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-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-actions">
-						<button class="btn" @click="query()">查询</button>
-					</div>
-				</div>
-			</div>
-			<tab :data="tabData" @select="select" />
-			<el-row type="flex" v-if="currTab == 1">
-				<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-row type="flex" v-if="currTab == 2">
-				<el-col :span="24">
-					<double-line-chart :height="'200px'" />
-				</el-col>
-			</el-row>
-		</el-dialog>
-		<!-- 原始数据end -->
-	</div>
-</template>
-
-<script>
-	import ComTable from "@/components/coms/table/table.vue";
-	import DoubleLineChart from "@/components/chart/line/double-line-chart.vue";
-	import Tab from "@/components/coms/tabs/tab.vue";
-	export default {
-		components: {
-			ComTable,DoubleLineChart,Tab
-		},
-		data() {
-			const that = this;
-			return {
-				currTab:1,
-				tabData:[{ id: "1", text: "表格"}, { id: "2", text: "图表", }],
-				value2: '',
-				value3: [],
-				pageIndex: 1,
-				pageSize: 20,
-				myInput1: "",
-				myInput2: "",
-				myInput3: "",
-				myInput4: "",
-				isvisiable: false,
-				yssjDialog: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: {
-			select(data) {
-			  // console.log(data);
-			  this.currTab = parseInt(data.id);
-			},
-			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.yssjDialog=true;
-				}
-			},
-			onClickDialogClose() { // 弹窗右上角关闭按钮
-				this.isvisiable = false;
-				this.isvisiableType = 1;
-			},
-			yssjDialogClose(){//原始数据
-				this.yssjDialog = false;
-			},
-			dialogSave() {
-				console.log(this.myInput1)
-				// myInput1: "",
-				// myInput2: "",
-				// myInput3: "",
-				// myInput4: "",
-			},
-			back() {
-				this.$emit('gzCgdClick', 1);
-			},
-			query() {
-				var that = this;
-				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;
-				// 	},
-				// });
-			},
-		},
-		created() {
-			// console.log(this.data)//上个页面的参数
-		},
-		mounted() {},
-	};
-</script>
-
-<style lang="less" scoped>
-
-</style>

src/views/Others/xn.vue

@@ -1,37 +0,0 @@
-<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

@@ -1,37 +0,0 @@
-<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

@@ -1,37 +0,0 @@
-<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

@@ -130,7 +130,7 @@
                   </text>
                 </g>
                 <g>
-                  <text transform="matrix(1 0 0 1 70.9336 126.3535)">
+                  <text transform="matrix(1 0 0 1 65.9336 126.3535)">
                     <tspan
                       x="0"
                       y="0"
@@ -147,21 +147,12 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (MW)
-                    </tspan>
-                    <tspan
-                      x="32.592"
-                      y="0"
-                      fill="#97A1A2"
-                      font-family="'MicrosoftYaHei'"
-                      font-size="11.3899"
-                    >
-                      :
+                      (MVar):
                     </tspan>
                   </text>
                 </g>
                 <g>
-                  <text transform="matrix(1 0 0 1 67.0742 145.5039)">
+                  <text transform="matrix(1 0 0 1 65.0742 145.5039)">
                     <tspan
                       x="0"
                       y="0"
@@ -178,16 +169,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (MVar)
-                    </tspan>
-                    <tspan
-                      x="36.451"
-                      y="0"
-                      fill="#97A1A2"
-                      font-family="'MicrosoftYaHei'"
-                      font-size="11.3899"
-                    >
-                      :
+                      (MVar):
                     </tspan>
                   </text>
                 </g>
@@ -5445,7 +5427,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (MVar)
+                      (kVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5545,7 +5527,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (MVar)
+                      (kVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5645,7 +5627,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (MVar)
+                      (kVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5745,7 +5727,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (MVar)
+                      (kVar)
                     </tspan>
                     <tspan
                       x="36.451"
@@ -5845,7 +5827,7 @@
                       font-family="'MicrosoftYaHei'"
                       font-size="9.6234"
                     >
-                      (MVar)
+                      (kVar)
                     </tspan>
                     <tspan
                       x="36.451"

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

@@ -5,7 +5,7 @@
 				<previewPicture>
 					<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="90%" height="100%" viewBox="-103.472 181.25 700.334 342.25" enable-background="new -50.472 115.25 634.334 342.25" 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="90%" height="100%" viewBox="-103.472 131.25 700.334 342.25" enable-background="new -50.472 115.25 634.334 342.25" xml:space="preserve">
 							<g id="other">
 								<text transform="matrix(0.9268 0 0 1 519.0732 163.3872)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="4.8442">牛首山第五风场电场</text>
 								<text transform="matrix(0.9268 0 0 1 519.0732 169.1304)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="4.8442">110kV V母</text>
@@ -34,9 +34,7 @@
 									<text transform="matrix(1 0 0 1 551.1602 185.2998)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">:</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 534.9355 194.6533)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">P</text>
-									<text transform="matrix(1 0 0 1 538.4844 194.6533)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">(MW)</text>
-									<text transform="matrix(1 0 0 1 551.1602 194.6533)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">:</text>
+									<text transform="matrix(1 0 0 1 532.9355 194.6533)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">P(MVar):</text>
 								</g>
 								<g>
 									<text transform="matrix(1 0 0 1 532.1523 206.0078)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">Q</text>
@@ -164,12 +162,12 @@
 								</g>
 								<g>
 									<text transform="matrix(1 0 0 1 535.4473 343.3301)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">P</text>
-									<text transform="matrix(1 0 0 1 538.998 343.3301)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">(MW)</text>
+									<text transform="matrix(1 0 0 1 538.998 343.3301)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">(kVar)</text>
 									<text transform="matrix(1 0 0 1 551.6738 343.3301)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">:</text>
 								</g>
 								<g>
 									<text transform="matrix(1 0 0 1 532.6641 354.6846)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">Q</text>
-									<text transform="matrix(1 0 0 1 536.0879 354.6846)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">(MVar)</text>
+									<text transform="matrix(1 0 0 1 537.0879 354.6846)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">(kVar)</text>
 									<text transform="matrix(1 0 0 1 551.2383 354.6846)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="4.6193">:</text>
 								</g>
 								<rect x="499.345" y="118.659" opacity="0.9" fill="#1B2522" enable-background="new    " width="55.565" height="9.406"></rect>
@@ -416,10 +414,10 @@
 										<text transform="matrix(1.0534 0 0 1 21.1885 321.1758)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">A</text>
 										<text transform="matrix(1.0534 0 0 1 23.4697 321.1758)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 13.085 332.333)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">P(</text>
-										<text transform="matrix(1.0534 0 0 1 17.0977 332.333)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MW</text>
+										<text transform="matrix(1.0534 0 0 1 17.0977 332.333)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 23.4697 332.333)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 10.041 343.7852)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">Q(</text>
-										<text transform="matrix(1.0534 0 0 1 14.6982 343.7852)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MVar</text>
+										<text transform="matrix(1.0534 0 0 1 15.6982 343.7852)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 23.4697 343.7852)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 									</g>
 								</g>
@@ -432,10 +430,10 @@
 										<text transform="matrix(1.0534 0 0 1 151.0308 322.1309)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">A</text>
 										<text transform="matrix(1.0534 0 0 1 153.312 322.1309)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 142.9272 333.2881)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">P(</text>
-										<text transform="matrix(1.0534 0 0 1 146.9399 333.2881)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MW</text>
+										<text transform="matrix(1.0534 0 0 1 146.9399 333.2881)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 153.312 333.2881)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 139.8833 344.7402)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">Q(</text>
-										<text transform="matrix(1.0534 0 0 1 144.5405 344.7402)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MVar</text>
+										<text transform="matrix(1.0534 0 0 1 145.5405 344.7402)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 153.312 344.7402)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 									</g>
 								</g>
@@ -445,10 +443,10 @@
 										<text transform="matrix(1.0534 0 0 1 336.918 323.6875)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">A</text>
 										<text transform="matrix(1.0534 0 0 1 339.1992 323.6875)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 328.8145 335.8438)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">P(</text>
-										<text transform="matrix(1.0534 0 0 1 332.8262 335.8438)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MW</text>
+										<text transform="matrix(1.0534 0 0 1 332.8262 335.8438)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 339.1992 335.8438)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 325.7695 347.2969)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">Q(</text>
-										<text transform="matrix(1.0534 0 0 1 330.4277 347.2969)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MVar</text>
+										<text transform="matrix(1.0534 0 0 1 331.4277 347.2969)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 339.1992 347.2969)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 									</g>
 								</g>
@@ -458,10 +456,10 @@
 										<text transform="matrix(1.0534 0 0 1 250.6333 323.292)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">A</text>
 										<text transform="matrix(1.0534 0 0 1 252.9146 323.292)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 242.5298 335.4482)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">P(</text>
-										<text transform="matrix(1.0534 0 0 1 246.5425 335.4482)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MW</text>
+										<text transform="matrix(1.0534 0 0 1 246.5425 335.4482)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 252.9146 335.4482)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 										<text transform="matrix(1.0534 0 0 1 239.4858 346.9004)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">Q(</text>
-										<text transform="matrix(1.0534 0 0 1 244.1431 346.9004)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">MVar</text>
+										<text transform="matrix(1.0534 0 0 1 245.1431 346.9004)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.0786">kVar</text>
 										<text transform="matrix(1.0534 0 0 1 252.9146 346.9004)" fill="#919CA0" font-family="'MicrosoftYaHei'" font-size="3.8482">):</text>
 									</g>
 								</g>

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

@@ -253,13 +253,9 @@
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 657.7087 96.584)" fill="#97A1A2"
+									<text transform="matrix(1 0 0 1 645.7087 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										P
-									</text>
-									<text transform="matrix(1 0 0 1 664.6775 96.584)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MM)
+										P(kVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 96.584)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -273,7 +269,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MVar)
+										(kVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 118.8701)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -301,13 +297,9 @@
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 657.7087 241.7939)" fill="#97A1A2"
+									<text transform="matrix(1 0 0 1 654.7087 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										P
-									</text>
-									<text transform="matrix(1 0 0 1 664.6775 241.7939)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MM)
+										P(kVar)
 									</text>
 									<text transform="matrix(1 0 0 1 686.1379 241.7939)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
@@ -321,7 +313,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 654.8049 264.0801)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MVar)
+										(kVar)
 									</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/nss.vue

@@ -274,31 +274,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 446.7263 92.4893)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 436.7263 92.4893)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 453.6951 92.4893)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 475.155 92.4893)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 438.7039 114.7744)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 436.7039 114.7744)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 447.9861 114.7744)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 475.155 114.7744)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="433.904" y="121.662" opacity="0.9" fill="#162320"
@@ -372,31 +356,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 511.6243 300.1123)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 518.5935 300.1123)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 540.0535 300.1123)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 501.6243 300.1123)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 503.6018 322.3975)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 501.6018 322.3975)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 512.8835 322.3975)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 540.053 322.3975)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="482.332" y="328.749" opacity="0.9" fill="#162320"
@@ -428,31 +396,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 511.6243 441.124)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 501.6243 441.124)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 518.5935 441.124)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 540.0535 441.124)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 503.6018 463.4092)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 501.6018 463.4092)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 512.8835 463.4092)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 540.053 463.4092)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="482.332" y="469.761" opacity="0.9" fill="#162320"
@@ -684,31 +636,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1019.0598 92.4893)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1009.0598 92.4893)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 1026.0286 92.4893)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 1047.4875 92.4893)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1011.0364 114.7744)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 1020.3196 114.7744)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 1047.4875 114.7744)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1009.0364 114.7744)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="1006.239" y="121.662" opacity="0.9" fill="#162320"
@@ -1157,31 +1093,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1065.0793 300.1123)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1055.0793 300.1123)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 1072.0481 300.1123)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 1093.5071 300.1123)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1057.0559 322.3975)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1055.0559 322.3975)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 1066.3391 322.3975)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 1093.5071 322.3975)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="1035.789" y="328.749" opacity="0.9" fill="#162320"
@@ -1213,31 +1133,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1065.0793 441.124)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1055.0793 441.124)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 1072.0481 441.124)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 1093.5071 441.124)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1057.0559 463.4092)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 1066.3391 463.4092)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 1093.5071 463.4092)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1055.0559 463.4092)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="1035.789" y="469.761" opacity="0.9" fill="#162320"
@@ -1295,31 +1199,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1607.9778 441.124)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 1614.9465 441.124)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 1636.4055 441.124)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1597.9778 441.124)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1599.9543 463.4092)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 1609.2375 463.4092)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 1636.4055 463.4092)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1597.9543 463.4092)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="1578.688" y="469.761" opacity="0.9" fill="#162320"
@@ -2931,17 +2819,9 @@
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
 											):
 										</text>
-										<text transform="matrix(1 0 0 1 -20.76 867.3301)" fill="#FFFFFF"
+										<text transform="matrix(1 0 0 1 -28.76 867.3301)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
-											P(
-										</text>
-										<text transform="matrix(1 0 0 1 -10.5789 867.3301)" fill="#FFFFFF"
-											font-family="'MicrosoftYaHei'" font-size="8.6118">
-											kW
-										</text>
-										<text transform="matrix(1 0 0 1 2.8728 867.3301)" fill="#FFFFFF"
-											font-family="'MicrosoftYaHei'" font-size="10.7648">
-											):
+											P(kVar):
 										</text>
 										<text transform="matrix(1 0 0 1 -28.0549 893.1807)" fill="#FFFFFF"
 											font-family="'MicrosoftYaHei'" font-size="10.7648">
@@ -2979,31 +2859,15 @@
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1599.0598 113.8252)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1589.0598 113.8252)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											P
-										</text>
-										<text transform="matrix(1 0 0 1 1606.0286 113.8252)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MW)
-										</text>
-										<text transform="matrix(1 0 0 1 1627.4875 113.8252)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											P(MVar):
 										</text>
 									</g>
 									<g>
-										<text transform="matrix(1 0 0 1 1591.0364 136.1104)" fill="#97A1A2"
+										<text transform="matrix(1 0 0 1 1589.0364 136.1104)" fill="#97A1A2"
 											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											Q
-										</text>
-										<text transform="matrix(1 0 0 1 1600.3196 136.1104)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="9.6234">
-											(MVar)
-										</text>
-										<text transform="matrix(1 0 0 1 1627.4875 136.1104)" fill="#97A1A2"
-											font-family="'MicrosoftYaHei'" font-size="11.3899">
-											:
+											Q(MVar):
 										</text>
 									</g>
 									<rect x="1586.239" y="142.159" opacity="0.9" fill="#162320"

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

@@ -499,54 +499,22 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 210.6501 296.7874)"
+                    transform="matrix(1 0 0 1 200.6501 296.7874)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 217.6189 296.7874)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 239.0789 296.7874)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(kVar):
                   </text>
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 202.6277 319.0725)"
+                    transform="matrix(1 0 0 1 200.6277 319.0725)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 211.9099 319.0725)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 239.0789 319.0725)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(kVar):
                   </text>
                 </g>
                 <g>
@@ -1322,54 +1290,22 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 478.2029 297.5061)"
+                    transform="matrix(1 0 0 1 468.2029 297.5061)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 485.1716 297.5061)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 506.6316 297.5061)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(kVar):
                   </text>
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 470.1804 319.7913)"
+                    transform="matrix(1 0 0 1 465.1804 319.7913)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 479.4626 319.7913)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 506.6316 319.7913)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(kVar):
                   </text>
                 </g>
                 <g>
@@ -2000,54 +1936,22 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 736.8811 297.5061)"
+                    transform="matrix(1 0 0 1 726.8811 297.5061)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 743.8503 297.5061)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 765.3103 297.5061)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(kVar):
                   </text>
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 728.8586 319.7913)"
+                    transform="matrix(1 0 0 1 726.8586 319.7913)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 738.1404 319.7913)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 765.3098 319.7913)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(kVar):
                   </text>
                 </g>
                 <g>
@@ -2152,54 +2056,22 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 1012.592 298.51)"
+                    transform="matrix(1 0 0 1 1002.592 298.51)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1019.5608 298.51)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1041.0198 298.51)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(kVar):
                   </text>
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 1004.5686 320.7952)"
+                    transform="matrix(1 0 0 1 1002.5686 320.7952)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1013.8499 320.7952)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1041.0198 320.7952)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(kVar):
                   </text>
                 </g>
                 <g>
@@ -2834,28 +2706,12 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 1659.2854 298.51)"
+                    transform="matrix(1 0 0 1 1649.2854 298.51)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1666.2542 298.51)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1687.7151 298.51)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(kVar):
                   </text>
                 </g>
                 <g>
@@ -2865,23 +2721,7 @@
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1660.5452 320.7952)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1687.7151 320.7952)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(kVar):
                   </text>
                 </g>
                 <g>
@@ -3429,54 +3269,22 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 1319.7991 298.51)"
+                    transform="matrix(1 0 0 1 1309.7991 298.51)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1326.7678 298.51)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1348.2288 298.51)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(kVar):
                   </text>
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 1311.7776 320.7952)"
+                    transform="matrix(1 0 0 1 1309.7776 320.7952)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1321.0588 320.7952)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1348.2268 320.7952)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(kVar):
                   </text>
                 </g>
                 <g>
@@ -4167,54 +3975,22 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 711.0769 139.5452)"
+                    transform="matrix(1 0 0 1 701.0769 139.5452)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 718.0457 139.5452)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 739.5056 139.5452)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(MVar):
                   </text>
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 703.0544 161.8303)"
+                    transform="matrix(1 0 0 1 701.0544 161.8303)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 712.3367 161.8303)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 739.5056 161.8303)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(MVar):
                   </text>
                 </g>
                 <g>
@@ -4291,54 +4067,22 @@
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 1327.4456 129.2971)"
+                    transform="matrix(1 0 0 1 1317.4456 129.2971)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    P
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1334.4143 129.2971)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MM)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1355.8752 129.2971)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    P(MVar):
                   </text>
                 </g>
                 <g>
                   <text
-                    transform="matrix(1 0 0 1 1319.4241 151.5823)"
+                    transform="matrix(1 0 0 1 1316.4241 151.5823)"
                     fill="#97A1A2"
                     font-family="'MicrosoftYaHei'"
                     font-size="11.3899"
                   >
-                    Q
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1328.7053 151.5823)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="9.6234"
-                  >
-                    (MVar)
-                  </text>
-                  <text
-                    transform="matrix(1 0 0 1 1355.8733 151.5823)"
-                    fill="#97A1A2"
-                    font-family="'MicrosoftYaHei'"
-                    font-size="11.3899"
-                  >
-                    :
+                    Q(MVar):
                   </text>
                 </g>
                 <g>
@@ -4468,7 +4212,7 @@
                   font-family="'MicrosoftYaHei'"
                   font-size="15"
                 >
-                  输出功率(MM):
+                  输出功率(kw):
                 </text>
               </g>
               <g id="arrow">

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

@@ -124,17 +124,9 @@
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 159.8337 82.063)" fill="#97A1A2"
+									<text transform="matrix(1 0 0 1 149.8337 82.063)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										P
-									</text>
-									<text transform="matrix(1 0 0 1 166.8015 82.063)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MM)
-									</text>
-									<text transform="matrix(1 0 0 1 188.2629 82.063)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										:
+										P(kVar):
 									</text>
 								</g>
 								<rect x="870.11" y="54.162" opacity="0.9" fill="#162320" enable-background="new    "
@@ -156,17 +148,9 @@
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 920.3459 86.4722)" fill="#97A1A2"
+									<text transform="matrix(1 0 0 1 910.3459 86.4722)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										P
-									</text>
-									<text transform="matrix(1 0 0 1 927.3142 86.4722)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MM)
-									</text>
-									<text transform="matrix(1 0 0 1 948.7742 86.4722)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										:
+										P(kVar):
 									</text>
 								</g>
 								<rect x="870.11" y="95.087" opacity="0.9" fill="#162320" enable-background="new    "
@@ -204,17 +188,9 @@
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1502.6492 193.9634)" fill="#97A1A2"
+									<text transform="matrix(1 0 0 1 1492.6492 193.9634)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										P
-									</text>
-									<text transform="matrix(1 0 0 1 1509.6179 193.9634)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MW)
-									</text>
-									<text transform="matrix(1 0 0 1 1531.0779 193.9634)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										:
+										P(kVar):
 									</text>
 								</g>
 								<rect x="1452.414" y="202.58" opacity="0.9" fill="#162320" enable-background="new    "
@@ -252,17 +228,9 @@
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1713.8718 191.0923)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										P
-									</text>
-									<text transform="matrix(1 0 0 1 1720.8406 191.0923)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MM)
-									</text>
-									<text transform="matrix(1 0 0 1 1742.3005 191.0923)" fill="#97A1A2"
+									<text transform="matrix(1 0 0 1 1703.8718 191.0923)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										:
+										P(kVar):
 									</text>
 								</g>
 								<rect x="1562.98" y="42.351" opacity="0.9" fill="#162320" enable-background="new    "
@@ -284,17 +252,9 @@
 									</text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1584.4617 74.6606)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										P
-									</text>
-									<text transform="matrix(1 0 0 1 1591.4314 74.6606)" fill="#97A1A2"
-										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MM)
-									</text>
-									<text transform="matrix(1 0 0 1 1612.8914 74.6606)" fill="#97A1A2"
+									<text transform="matrix(1 0 0 1 1574.4617 74.6606)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="11.3899">
-										:
+										P(kVar):
 									</text>
 								</g>
 								<rect x="1562.98" y="83.277" opacity="0.9" fill="#162320" enable-background="new    "
@@ -306,7 +266,7 @@
 									</text>
 									<text transform="matrix(1 0 0 1 1585.7214 95.0884)" fill="#97A1A2"
 										font-family="'MicrosoftYaHei'" font-size="9.6234">
-										(MVar)
+										(kVar)
 									</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

@@ -29,14 +29,10 @@
               			<text transform="matrix(1 0 0 1 1116.6396 13.9502)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 1088.2119 32.3096)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-              			<text transform="matrix(1 0 0 1 1095.1807 32.3096)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-              			<text transform="matrix(1 0 0 1 1116.6396 32.3096)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 1078.2119 32.3096)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 1080.1885 54.5947)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-              			<text transform="matrix(1 0 0 1 1089.4717 54.5947)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-              			<text transform="matrix(1 0 0 1 1116.6396 54.5947)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 1078.1885 54.5947)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
               		</g>
               		<rect x="1075.391" y="61.482" opacity="0.9" fill="#162320" enable-background="new    " width="108.762" height="18.49"/>
               		<g>
@@ -65,14 +61,10 @@
               			<text transform="matrix(1 0 0 1 264.3535 287.8604)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 235.9258 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-              			<text transform="matrix(1 0 0 1 242.8945 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-              			<text transform="matrix(1 0 0 1 264.3535 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 225.9258 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 227.9023 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-              			<text transform="matrix(1 0 0 1 237.1855 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-              			<text transform="matrix(1 0 0 1 264.3535 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 225.9023 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
               		</g>
               		<rect x="223.104" y="335.393" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.49"/>
               		<g>
@@ -89,14 +81,10 @@
               			<text transform="matrix(1 0 0 1 264.3535 446.8945)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 235.9258 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-              			<text transform="matrix(1 0 0 1 242.8945 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-              			<text transform="matrix(1 0 0 1 264.3535 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 225.9258 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 227.9023 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-              			<text transform="matrix(1 0 0 1 237.1855 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-              			<text transform="matrix(1 0 0 1 264.3535 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 225.9023 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
               		</g>
               		<rect x="223.104" y="494.427" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.49"/>
               		<g>
@@ -113,14 +101,10 @@
               			<text transform="matrix(1 0 0 1 1323.8809 287.8604)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 1295.4531 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-              			<text transform="matrix(1 0 0 1 1302.4219 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-              			<text transform="matrix(1 0 0 1 1323.8809 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 1285.4531 306.2197)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 1287.4297 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-              			<text transform="matrix(1 0 0 1 1296.7129 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-              			<text transform="matrix(1 0 0 1 1323.8809 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 1285.4297 328.5049)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
               		</g>
               		<rect x="1282.632" y="335.393" opacity="0.9" fill="#162320" enable-background="new    " width="108.76" height="18.49"/>
               		<g>
@@ -137,14 +121,10 @@
               			<text transform="matrix(1 0 0 1 1323.8809 446.8945)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 1295.4531 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-              			<text transform="matrix(1 0 0 1 1302.4219 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-              			<text transform="matrix(1 0 0 1 1323.8809 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 1285.4531 465.2539)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 1287.4297 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-              			<text transform="matrix(1 0 0 1 1296.7129 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-              			<text transform="matrix(1 0 0 1 1323.8809 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+              			<text transform="matrix(1 0 0 1 1285.4297 487.5391)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
               		</g>
               		<rect x="1282.632" y="494.427" opacity="0.9" fill="#162320" enable-background="new    " width="108.76" height="18.49"/>
               		<g>
@@ -1066,8 +1046,8 @@
               			<text transform="matrix(1 0 0 1 22.7139 790.7725)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> la( </text>
               			<text transform="matrix(1 0 0 1 35.124 790.7725)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="8.6118"> A </text>
               			<text transform="matrix(1 0 0 1 41.1826 790.7725)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> ): </text>
-              			<text transform="matrix(1 0 0 1 17.5498 816.625)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> P( </text>
-              			<text transform="matrix(1 0 0 1 27.731 816.625)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="8.6118"> kW </text>
+              			<text transform="matrix(1 0 0 1 10.5498 816.625)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> P( </text>
+              			<text transform="matrix(1 0 0 1 22.731 816.625)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="8.6118"> kVar </text>
               			<text transform="matrix(1 0 0 1 41.1826 816.625)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> ): </text>
               			<text transform="matrix(1 0 0 1 10.2549 842.4756)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> Q( </text>
               			<text transform="matrix(1 0 0 1 22.623 842.4756)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="8.6118"> kVar </text>

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

@@ -609,10 +609,10 @@
               				<text transform="matrix(1 0 0 1 45.4175 537.8779)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> la(A) </text>
               			</g>
               			<g>
-              				<text transform="matrix(1 0 0 1 33.8696 558.1279)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> P(MM) </text>
+              				<text transform="matrix(1 0 0 1 25.8696 558.1279)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> P(kVar) </text>
               			</g>
               			<g>
-              				<text transform="matrix(1 0 0 1 25.3867 576.8779)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> Q(MVar) </text>
+              				<text transform="matrix(1 0 0 1 25.3867 576.8779)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> Q(kVar) </text>
               			</g>
               		</g>
               		<polyline opacity="0.9" fill="#162320" enable-background="new    " points="546.832,521.51 487.717,521.51 487.717,509.944     546.832,509.944   "/>
@@ -700,7 +700,7 @@
               			<text transform="matrix(1 0 0 1 818.9395 30.7939)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> la(A): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 808.4258 51.0439)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> P(MW): </text>
+              			<text transform="matrix(1 0 0 1 798.4258 51.0439)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652">P(MVar):</text>
               		</g>
               		<g>
               			<text transform="matrix(1 0 0 1 799.9424 69.7939)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> Q(MVar): </text>
@@ -726,7 +726,7 @@
               			<text transform="matrix(1 0 0 1 824.9922 175.9951)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> la(A): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 813.4453 196.2451)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> P(MW): </text>
+              			<text transform="matrix(1 0 0 1 803.4453 196.2451)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652">P(MVar):</text>
               		</g>
               		<g>
               			<text transform="matrix(1 0 0 1 804.9619 214.9951)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> Q(MVar): </text>
@@ -799,7 +799,7 @@
               			<text transform="matrix(1 0 0 1 824.8848 273.5615)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> la(A): </text>
               		</g>
               		<g>
-              			<text transform="matrix(1 0 0 1 813.3379 293.8115)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> P(MW): </text>
+              			<text transform="matrix(1 0 0 1 803.3379 293.8115)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652">P(MVar):</text>
               		</g>
               		<g>
               			<text transform="matrix(1 0 0 1 804.8545 312.5615)" fill="#98A2A3" font-family="'MicrosoftYaHei'" font-size="10.652"> Q(MVar): </text>

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

@@ -18,15 +18,11 @@
 									<text transform="matrix(1 0 0 1 75.4121 74.6533)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 46.9829 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-									<text transform="matrix(1 0 0 1 53.9526 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-									<text transform="matrix(1 0 0 1 75.4121 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 36.9829 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
 								</g>
 								<rect x="25.503" y="101.63" opacity="0.9" fill="#162320" enable-background="new    " width="125.332" height="18.49"/>
 								<g>
-									<text transform="matrix(1 0 0 1 38.9614 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-									<text transform="matrix(1 0 0 1 48.2437 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-									<text transform="matrix(1 0 0 1 75.4121 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 36.9614 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar):</text>
 								</g>
 								<rect x="25.503" y="121.963" opacity="0.9" fill="#162320" enable-background="new    " width="125.332" height="18.49"/>
 								<g>
@@ -46,15 +42,11 @@
 									<text transform="matrix(1 0 0 1 748.7451 74.6533)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 720.3164 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-									<text transform="matrix(1 0 0 1 727.2847 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-									<text transform="matrix(1 0 0 1 748.7451 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 720.3164 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
 								</g>
 								<rect x="698.836" y="101.63" opacity="0.9" fill="#162320" enable-background="new    " width="125.331" height="18.49"/>
 								<g>
-									<text transform="matrix(1 0 0 1 712.2935 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-									<text transform="matrix(1 0 0 1 721.5757 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-									<text transform="matrix(1 0 0 1 748.7451 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 712.2935 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
 								</g>
 								<rect x="698.836" y="121.963" opacity="0.9" fill="#162320" enable-background="new    " width="125.331" height="18.49"/>
 								<g>
@@ -463,15 +455,11 @@
 									<text transform="matrix(1 0 0 1 1416.8784 74.6533)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1388.4487 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-									<text transform="matrix(1 0 0 1 1395.4175 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-									<text transform="matrix(1 0 0 1 1416.8784 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 1378.4487 93.0137)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
 								</g>
 								<rect x="1366.969" y="101.63" opacity="0.9" fill="#162320" enable-background="new    " width="125.332" height="18.49"/>
 								<g>
-									<text transform="matrix(1 0 0 1 1380.4272 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-									<text transform="matrix(1 0 0 1 1389.7085 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-									<text transform="matrix(1 0 0 1 1416.8784 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 1378.4272 113.4424)" fill="#97A1A2" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
 								</g>
 								<rect x="1366.969" y="121.963" opacity="0.9" fill="#162320" enable-background="new    " width="125.332" height="18.49"/>
 								<g>
@@ -1324,14 +1312,10 @@
 								<rect x="389.108" y="450.067" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.486"/>
 								<rect x="389.108" y="470.563" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.489"/>
 								<g>
-									<text transform="matrix(1 0 0 1 401.9287 461.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-									<text transform="matrix(1 0 0 1 408.897 461.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-									<text transform="matrix(1 0 0 1 430.3569 461.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 391.9287 461.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 393.9043 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-									<text transform="matrix(1 0 0 1 403.1875 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-									<text transform="matrix(1 0 0 1 430.3569 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 392.9043 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
 								</g>
 								<rect x="389.108" y="490.298" opacity="0.9" fill="#162320" enable-background="new    " width="108.761" height="18.485"/>
 								<g>
@@ -1347,14 +1331,10 @@
 								<rect x="876.939" y="450.067" opacity="0.9" fill="#162320" enable-background="new    " width="108.762" height="18.486"/>
 								<rect x="876.939" y="470.563" opacity="0.9" fill="#162320" enable-background="new    " width="108.762" height="18.489"/>
 								<g>
-									<text transform="matrix(1 0 0 1 889.7603 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-									<text transform="matrix(1 0 0 1 896.7285 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-									<text transform="matrix(1 0 0 1 918.188 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 879.7603 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 881.7368 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-									<text transform="matrix(1 0 0 1 891.0205 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-									<text transform="matrix(1 0 0 1 918.188 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 879.7368 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
 								</g>
 								<rect x="876.939" y="490.298" opacity="0.9" fill="#162320" enable-background="new    " width="108.762" height="18.485"/>
 								<g>
@@ -1370,14 +1350,10 @@
 								<rect x="1278.991" y="450.067" opacity="0.9" fill="#162320" enable-background="new    " width="108.762" height="18.486"/>
 								<rect x="1278.991" y="470.563" opacity="0.9" fill="#162320" enable-background="new    " width="108.762" height="18.489"/>
 								<g>
-									<text transform="matrix(1 0 0 1 1291.814 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-									<text transform="matrix(1 0 0 1 1298.7827 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-									<text transform="matrix(1 0 0 1 1320.2417 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 1281.814 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1283.7905 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-									<text transform="matrix(1 0 0 1 1293.0737 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-									<text transform="matrix(1 0 0 1 1320.2417 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 1281.7905 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
 								</g>
 								<rect x="1278.991" y="490.298" opacity="0.9" fill="#162320" enable-background="new    " width="108.762" height="18.485"/>
 								<g>
@@ -1393,14 +1369,10 @@
 								<rect x="1399.145" y="450.067" opacity="0.9" fill="#162320" enable-background="new    " width="108.764" height="18.486"/>
 								<rect x="1399.145" y="470.563" opacity="0.9" fill="#162320" enable-background="new    " width="108.764" height="18.489"/>
 								<g>
-									<text transform="matrix(1 0 0 1 1411.9683 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P </text>
-									<text transform="matrix(1 0 0 1 1418.937 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MW) </text>
-									<text transform="matrix(1 0 0 1 1440.396 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 1401.9683 462.8799)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> P(MVar): </text>
 								</g>
 								<g>
-									<text transform="matrix(1 0 0 1 1403.9448 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q </text>
-									<text transform="matrix(1 0 0 1 1413.228 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="9.6234"> (MVar) </text>
-									<text transform="matrix(1 0 0 1 1440.396 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> : </text>
+									<text transform="matrix(1 0 0 1 1401.9448 484.1641)" fill="#96A0A1" font-family="'MicrosoftYaHei'" font-size="11.3899"> Q(MVar): </text>
 								</g>
 								<rect x="1399.145" y="490.298" opacity="0.9" fill="#162320" enable-background="new    " width="108.764" height="18.485"/>
 								<g>
@@ -1910,9 +1882,7 @@
 									<text transform="matrix(1 0 0 1 18.3613 803.4404)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> la( </text>
 									<text transform="matrix(1 0 0 1 30.7705 803.4404)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="8.6118"> A </text>
 									<text transform="matrix(1 0 0 1 36.8286 803.4404)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> ): </text>
-									<text transform="matrix(1 0 0 1 13.1958 829.292)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> P( </text>
-									<text transform="matrix(1 0 0 1 23.3784 829.292)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="8.6118"> kW </text>
-									<text transform="matrix(1 0 0 1 36.8286 829.292)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> ): </text>
+									<text transform="matrix(1 0 0 1 3.1958 829.292)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> P(kVar): </text>
 									<text transform="matrix(1 0 0 1 5.9023 855.1436)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> Q( </text>
 									<text transform="matrix(1 0 0 1 18.2705 855.1436)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="8.6118"> kVar </text>
 									<text transform="matrix(1 0 0 1 36.8286 855.1436)" fill="#FFFFFF" font-family="'MicrosoftYaHei'" font-size="10.7648"> ): </text>

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

@@ -84,10 +84,10 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (ＭW)
+              (MVar)
             </text>
             <text
-              transform="matrix(1 0 0 1 1048.9119 65.8411)"
+              transform="matrix(1 0 0 1 1052.9119 65.8411)"
               fill="#96A0A1"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
@@ -113,7 +113,7 @@
               (MVar)
             </text>
             <text
-              transform="matrix(1 0 0 1 1048.5251 88.1272)"
+              transform="matrix(1 0 0 1 1052.5251 88.1272)"
               fill="#96A0A1"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
@@ -663,28 +663,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 63.3206 234.0979)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 70.2893 234.0979)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MM)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 91.7498 234.0979)"
+              transform="matrix(1 0 0 1 55.3206 234.0979)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              :
+              P(kVar):
             </text>
           </g>
           <g>
@@ -702,7 +686,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 256.3821)"
@@ -803,28 +787,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 520.6536 388.0686)"
+              transform="matrix(1 0 0 1 512.6536 388.0686)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 527.6223 388.0686)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MM)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 549.0823 388.0686)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(kVar):
             </text>
           </g>
           <g>
@@ -842,7 +810,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 549.0823 410.3547)"
@@ -943,28 +911,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 63.3206 493.3762)"
+              transform="matrix(1 0 0 1 55.3206 493.3762)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 70.2893 493.3762)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MM)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 91.7498 493.3762)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(kVar):
             </text>
           </g>
           <g>
@@ -982,7 +934,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 91.7493 515.6604)"
@@ -1096,7 +1048,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 352.1238 523.7493)"
@@ -1181,28 +1133,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 740.0774 352.0559)"
+              transform="matrix(1 0 0 1 732.0774 352.0559)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 747.0461 352.0559)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MM)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 768.5061 352.0559)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(kVar):
             </text>
           </g>
           <g>
@@ -1220,7 +1156,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 768.5061 374.343)"
@@ -1305,28 +1241,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 966.0916 352.0559)"
+              transform="matrix(1 0 0 1 958.0916 352.0559)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 973.0603 352.0559)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MM)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 994.5212 352.0559)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(kVar):
             </text>
           </g>
           <g>
@@ -1344,7 +1264,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 994.5212 374.343)"
@@ -2672,28 +2592,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 1211.0056 352.0559)"
+              transform="matrix(1 0 0 1 1207.0056 352.0559)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1217.9744 352.0559)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (ＭW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1243.8181 352.0559)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(kVar):
             </text>
           </g>
           <g>
@@ -2711,7 +2615,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1243.8181 374.343)"
@@ -2809,7 +2713,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (ＭW)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1458.8103 466.9661)"
@@ -2835,7 +2739,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1458.8123 489.2522)"
@@ -2933,7 +2837,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (ＭW)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1669.8103 466.9661)"
@@ -2959,7 +2863,7 @@
               font-family="'MicrosoftYaHei'"
               font-size="9.6234"
             >
-              (MVar)
+              (kVar)
             </text>
             <text
               transform="matrix(1 0 0 1 1669.8123 489.2522)"
@@ -8218,7 +8122,7 @@
                 font-family="'MicrosoftYaHei'"
                 font-size="12.1437"
               >
-                (MM)
+                (kVar)
               </text>
               <text
                 transform="matrix(1 0 0 1 45.3665 864.7239)"

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

@@ -1220,28 +1220,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 1054.0144 341.554)"
+              transform="matrix(1 0 0 1 1044.0144 341.554)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1060.9832 341.554)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1082.4431 341.554)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(MVar):
             </text>
           </g>
           <rect
@@ -1255,28 +1239,12 @@
           />
           <g>
             <text
-              transform="matrix(1 0 0 1 1045.9919 361.9807)"
+              transform="matrix(1 0 0 1 1043.9919 361.9807)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              Q
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1055.2742 361.9807)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MVar)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1082.4431 361.9807)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              Q(MVar):
             </text>
           </g>
           <rect
@@ -1334,54 +1302,22 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 563.5295 135.509)"
+              transform="matrix(1 0 0 1 553.5295 135.509)"
               fill="#96A0A1"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 570.4988 135.509)"
-              fill="#96A0A1"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (ＭW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 596.342 135.509)"
-              fill="#96A0A1"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(MVar):
             </text>
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 559.5066 157.7942)"
+              transform="matrix(1 0 0 1 557.5066 157.7942)"
               fill="#96A0A1"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              Q
-            </text>
-            <text
-              transform="matrix(1 0 0 1 568.7898 157.7942)"
-              fill="#96A0A1"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MVar)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 595.9578 157.7942)"
-              fill="#96A0A1"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              Q(MVar):
             </text>
           </g>
           <rect
@@ -1850,28 +1786,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 63.0144 445.3)"
+              transform="matrix(1 0 0 1 53.0144 445.3)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 69.9836 445.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 91.4441 445.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(MVar):
             </text>
           </g>
           <rect
@@ -1885,28 +1805,12 @@
           />
           <g>
             <text
-              transform="matrix(1 0 0 1 54.9919 465.7268)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              Q
-            </text>
-            <text
-              transform="matrix(1 0 0 1 64.2747 465.7268)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MVar)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 91.4431 465.7268)"
+              transform="matrix(1 0 0 1 52.9919 465.7268)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              :
+              Q(MVar):
             </text>
           </g>
           <rect
@@ -2025,28 +1929,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 1684.0154 445.3)"
+              transform="matrix(1 0 0 1 1674.0154 445.3)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1690.9841 445.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1712.4441 445.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(MVar):
             </text>
           </g>
           <rect
@@ -2060,28 +1948,12 @@
           />
           <g>
             <text
-              transform="matrix(1 0 0 1 1675.9929 465.7278)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              Q
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1685.2751 465.7278)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MVar)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1712.4441 465.7278)"
+              transform="matrix(1 0 0 1 1673.9929 465.7278)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              :
+              Q(MVar):
             </text>
           </g>
           <rect
@@ -2200,28 +2072,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 1684.5125 189.844)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1691.4812 189.844)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MM)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1712.9412 189.844)"
+              transform="matrix(1 0 0 1 1674.5125 189.844)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              :
+              P(MVar):
             </text>
           </g>
           <rect
@@ -2235,28 +2091,12 @@
           />
           <g>
             <text
-              transform="matrix(1 0 0 1 1676.49 210.2727)"
+              transform="matrix(1 0 0 1 1674.49 210.2727)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              Q
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1685.7722 210.2727)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MVar)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1712.9412 210.2727)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              Q(MVar):
             </text>
           </g>
           <rect
@@ -3123,28 +2963,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 21.4822 819.7336)"
+              transform="matrix(1 0 0 1 11.4822 819.7336)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 28.4504 819.7336)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (kW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 49.9114 819.7336)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(kVar):
             </text>
           </g>
           <rect
@@ -10142,28 +9966,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 63.0144 295.3)"
+              transform="matrix(1 0 0 1 53.0144 295.3)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 69.9836 295.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 91.4441 295.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              P(MVar):
             </text>
           </g>
           <rect
@@ -10177,28 +9985,12 @@
           />
           <g>
             <text
-              transform="matrix(1 0 0 1 54.9919 315.7268)"
+              transform="matrix(1 0 0 1 52.9919 315.7268)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              Q
-            </text>
-            <text
-              transform="matrix(1 0 0 1 64.2747 315.7268)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MVar)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 91.4431 315.7268)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              Q(MVar):
             </text>
           </g><g>
             <g>
@@ -10372,28 +10164,12 @@
           </g>
           <g>
             <text
-              transform="matrix(1 0 0 1 1063.0144 455.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              P
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1069.9836 455.3)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MW)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1091.4441 455.3)"
+              transform="matrix(1 0 0 1 1053.0144 455.3)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              :
+              P(MVar):
             </text>
           </g>
           <rect
@@ -10407,28 +10183,12 @@
           />
           <g>
             <text
-              transform="matrix(1 0 0 1 1054.9919 475.7268)"
+              transform="matrix(1 0 0 1 1052.9919 475.7268)"
               fill="#97A1A2"
               font-family="'MicrosoftYaHei'"
               font-size="11.3899"
             >
-              Q
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1064.2747 475.7268)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="9.6234"
-            >
-              (MVar)
-            </text>
-            <text
-              transform="matrix(1 0 0 1 1091.4431 475.7268)"
-              fill="#97A1A2"
-              font-family="'MicrosoftYaHei'"
-              font-size="11.3899"
-            >
-              :
+              Q(MVar):
             </text>
           </g><g>
             <g>

src/views/WindSite/pages/BoosterStation.vue

@@ -57,7 +57,7 @@ import XS from "../components/boosterstation/xs.vue";
 import DWK from "../components/boosterstation/dwk.vue";
 import PL1 from "../components/boosterstation/pl1.vue";
 import PL2 from "../components/boosterstation/pl2.vue";
-import XH from "../components/boosterstation/pl2.vue";
+import XH from "../components/boosterstation/xh.vue";
 import MCH from "../components/boosterstation/mch.vue";
 import HZJ from "../components/boosterstation/hzj.vue";
 export default {

src/views/layout/Menu.vue

@@ -961,29 +961,29 @@ export default {
             },
             {
               text: "样本库",
-              icon: "svg-预警记录",
-              path: "/others/gz",
+              icon: "svg-报表管理",
+              path: "/others/fault",
               children: [
                 {
                   text: "故障样本库",
                   icon: "svg-matrix",
-                  path: "/others/gz",
+                  path: "/others/fault",
                 },
                 {
                   text: "性能下降样本库",
                   icon: "svg-matrix",
-                  path: "/others/xn",
+                  path: "/others/performance",
                 },
                 {
                   text: "预警分析样本库",
                   icon: "svg-matrix",
-                  path: "/others/yj",
+                  path: "/others/warning",
                 },
                 {
                   text: "智能营销样本库",
                   icon: "svg-matrix",
-                  path: "/others/zn",
-                },
+                  path: "/others/market",
+                }
               ],
             },
           ],

src/views/report/ExportExcel.vue

@@ -185,7 +185,7 @@ export default {
         subUrl: "export/downloadFile",
         data: {
           station: that.tableData[index].value,
-          templateId: "2" || that.templateId,
+          templateId: that.templateId,
           month: that.dateArray[index].formatDate("yyyy-MM"),
           interval: that.timeData[index],
         },
@@ -267,7 +267,7 @@ export default {
         subUrl: "export/downloadFile",
         data: {
           station: station.toString(),
-          templateId: "2" || that.templateId,
+          templateId: that.templateId,
           month: month.toString(),
           interval: interval.toString(),
         },

src/views/Others/gz.vue

@@ -1,264 +1,154 @@
 <template>
-  <el-scrollbar height="92vh" 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="station"
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in ChangZhan"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="query-item">
-          <div class="lable">故障：</div>
-          <div class="search-input">
-            <el-select
-              v-model="widget"
-              multiple
-              collapse-tags
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <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="model"
-              multiple
-              collapse-tags
-              clearable
-              placeholder="请选择"
-              popper-class="select"
-            >
-              <el-option
-                v-for="item in fjxh"
-                :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="time"
-              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"
-      class="isvisiable"
-    >
-      <!-- 这里是新增或编辑 -->
-      <el-row type="flex" class="mb10">
-        <el-col :span="12">
-          <div>样本：</div>
-          <el-select
-            v-model="tableTag"
-            placeholder="请选择样本"
-            popper-class="select"
-            class="w"
-          >
-            <el-option
-              v-for="item in tableTagArr"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            >
-            </el-option>
-          </el-select>
-        </el-col>
-        <el-col :span="12">
-          <div>风机型号：</div>
-          <el-select
-            v-model="tableModel"
-            placeholder="请选择风机型号"
-            popper-class="select"
-            class="w"
-          >
-            <el-option
-              v-for="item in fjxh"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            >
-            </el-option>
-          </el-select>
-        </el-col>
-      </el-row>
-      <el-row type="flex" class="mb10">
-        <el-col :span="12">
-          <div>故障：</div>
-          <el-select
-            v-model="tableFaulttype"
-            placeholder="请选择故障"
-            popper-class="select"
-            class="w"
-          >
-            <el-option
-              v-for="item in BuJian"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            >
-            </el-option>
-          </el-select>
-        </el-col>
-        <el-col :span="12">
-          <div>时间：</div>
-          <el-date-picker
-            v-model="tableTime"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            class="w"
-          >
-          </el-date-picker>
-        </el-col>
-      </el-row>
-      <el-row type="flex" class="mb10">
-        <el-col :span="12">
-          <div>故障原因：</div>
-          <el-input
-            placeholder="请输入故障原因"
-            v-model="tableSymptom"
-            :value="tableSymptom"
-          >
-          </el-input>
-        </el-col>
-        <el-col :span="12">
-          <div>风机厂商：</div>
-          <el-input
-            placeholder="请输入风机厂商"
-            v-model="tableManufacturer"
-            :value="tableManufacturer"
-          >
-          </el-input>
-        </el-col>
-      </el-row>
-      <el-row type="flex" class="mb10">
-        <el-col :span="12">
-          <div>风机编号：</div>
-          <el-input
-            placeholder="请输入风机编号"
-            v-model="tableWindturbineid"
-            :value="tableWindturbineid"
-          >
-          </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="92vh" v-else>
-    <Cgd :data="gzCgdData" @gzCgdClick="gzCgdClick" />
-  </el-scrollbar>
+	<el-scrollbar height="92vh" 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="station" placeholder="请选择" popper-class="select">
+							<el-option v-for="item in ChangZhan" :key="item.id" :value="item.id" :label="item.name">
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">故障分类：</div>
+					<div class="search-input">
+						<el-select v-model="widget" multiple collapse-tags clearable placeholder="请选择"
+							popper-class="select">
+							<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="model" multiple collapse-tags clearable placeholder="请选择"
+							popper-class="select">
+							<el-option v-for="item in fjxh" :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="time" 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" class="isvisiable">
+			<!-- 这里是新增或编辑 -->
+			<el-row type="flex" class="mb10">
+				<el-col :span="12">
+					<div>样本类型：</div>
+					<el-select v-model="tableTag" placeholder="请选择样本" popper-class="select" class="w">
+						<el-option v-for="item in tableTagArr" :key="item.value" :value="item.value"
+							:label="item.label">
+						</el-option>
+					</el-select>
+				</el-col>
+				<el-col :span="12">
+					<div>风机型号：</div>
+					<el-select v-model="tableModel" placeholder="请选择风机型号" popper-class="select" class="w">
+						<el-option v-for="item in fjxh" :key="item.value" :value="item.value" :label="item.label">
+						</el-option>
+					</el-select>
+				</el-col>
+			</el-row>
+			<el-row type="flex" class="mb10">
+				<el-col :span="12">
+					<div>故障分类：</div>
+					<el-select v-model="tableFaulttype" placeholder="请选择故障" popper-class="select" class="w">
+						<el-option v-for="item in BuJian" :key="item.value" :value="item.value" :label="item.label">
+						</el-option>
+					</el-select>
+				</el-col>
+				<el-col :span="12">
+					<div>时间：</div>
+					<el-date-picker v-model="tableTime" type="datetimerange" range-separator="至"
+						start-placeholder="开始日期" end-placeholder="结束日期" class="w">
+					</el-date-picker>
+				</el-col>
+			</el-row>
+			<el-row type="flex" class="mb10">
+				<el-col :span="12">
+					<div>故障原因：</div>
+					<el-input placeholder="请输入故障原因" v-model="tableSymptom" :value="tableSymptom">
+					</el-input>
+				</el-col>
+				<el-col :span="12">
+					<div>风机厂商：</div>
+					<el-input placeholder="请输入风机厂商" v-model="tableManufacturer" :value="tableManufacturer">
+					</el-input>
+				</el-col>
+			</el-row>
+			<el-row type="flex" class="mb10">
+				<el-col :span="12">
+					<div>风机编号：</div>
+					<el-input placeholder="请输入风机编号" v-model="tableWindturbineid" :value="tableWindturbineid">
+					</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="92vh" v-if="gzCgd == 2">
+		<Point :data="gzCgdData" :st='st' @gzCgdClick="gzCgdClick" />
+	</el-scrollbar>
 </template>
 
 <script>
 	import ComTable from "@/components/coms/table/table.vue";
-	import Cgd from "./gzCgd.vue";
+	import Point from "./point.vue";
 	export default {
 		components: {
 			ComTable,
-			Cgd
+			Point,
 		},
 		data() {
 			const that = this;
 			return {
-				tableTagArr:[{
-					label: '正样本',
-					value: 0
-				},
-				{
-					label: '负样本',
-					value: 1
-				}],
+				tableTagArr: [{
+						label: '正样本',
+						value: 0
+					},
+					{
+						label: '负样本',
+						value: 1
+					}
+				],
 				queryType: false, //没有改变select时，点击查询无效
 				pageIndex: 1,
 				pageSize: 20,
 				gzCgd: 1, //传感点组件隐藏或显示
-				gzCgdData: '', //传感点参数
-				BuJian: [{
-					label: '部件1',
-					value: '1'
-				}, {
-					label: '部件2',
-					value: '2'
-				}],
-				ChangZhan: [{
-					label: '麻黄山风电场',
-					value: 'MHS_FDC'
-				}],
-				fjxh: [{
-					label: '类型1',
-					value: '1'
-				}],
-				fjxhArr: [{
-					id: "MHS_FDC",
-					value: ['UP77', 'UP82', 'UP105']
-				}],
+				gzCgdData: [], //传感点参数
+				st:'',
+				BuJian: [],
+				ChangZhan: [],
+				fjxh: [],
+				fjxhArr: [],
 				widget: [],
 				model: [],
 				time: [],
@@ -270,12 +160,12 @@
 				tableSymptom: "",
 				tableManufacturer: "",
 				tableWindturbineid: "",
-				tableCategory: "",//隐藏保存部分
+				tableCategory: "", //隐藏保存部分
 				tableRemark: "",
 				tableFaultcode: "",
 				tableId: "",
-				tableSymptomcode:"",
-				tableStationen:"",
+				tableSymptomcode: "",
+				tableStationen: "",
 				isvisiable: false,
 				isvisiableType: 1, //新增为1，编辑为2
 				tableData: {
@@ -286,32 +176,32 @@
 							width: '50px',
 						},
 						{
-							name: "样本",
+							name: "样本类型",
 							field: "tableTag",
 							is_light: false,
 							width: '100px',
 						},
 						{
-							name: "风机型号",
-							field: "tableModel",
+							name: "风机编号",
+							field: "tableWindturbineid",
 							is_light: false,
 							width: '150px',
 						},
 						{
-							name: "故障",
+							name: "故障分类",
 							field: "tableFaulttype",
 							is_light: false,
 							width: '150px',
 						},
 						{
-							name: "时间",
-							field: "tableTime",
+							name: "故障原因",
+							field: "tableSymptom",
 							is_light: false,
 							width: '350px',
 						},
 						{
-							name: "故障原因",
-							field: "tableSymptom",
+							name: "时间",
+							field: "tableTime",
 							is_light: false,
 							width: '350px',
 						},
@@ -322,8 +212,8 @@
 							width: '150px',
 						},
 						{
-							name: "风机编号",
-							field: "tableWindturbineid",
+							name: "风机型号",
+							field: "tableModel",
 							is_light: false,
 							width: '150px',
 						},
@@ -343,18 +233,7 @@
 							},
 						},
 					],
-					data: [{
-						index: 1,
-						tableTag: 0,
-						tableFaulttype: "MG01-01",
-						tableModel: "0.1000",
-						tableTime: "0.1000",
-						tableSymptom: "0.1000",
-						tableManufacturer: "0.1000",
-						tableWindturbineid: "0.1000",
-						value: '这里放隐藏值1',
-						is_light: false,
-					}],
+					data: [],
 				}
 			};
 		},
@@ -400,7 +279,9 @@
 			startAjax() {
 				var that = this;
 				// that.time = [new Date((new Date() - 3600 * 1000 * 24 * 30)).formatDate("yyyy-MM-dd"), new Date().formatDate("yyyy-MM-dd")];
-				that.time = [new Date((new Date() - 3600 * 1000 * 24 * 360)).formatDate("yyyy-MM-dd"), new Date().formatDate("yyyy-MM-dd")];
+				that.time = [new Date((new Date() - 3600 * 1000 * 24 * 360)).formatDate("yyyy-MM-dd"), new Date()
+					.formatDate("yyyy-MM-dd")
+				];
 				that.API.requestData({
 					method: "GET",
 					baseURL: "http://10.155.32.4:9001/",
@@ -422,7 +303,7 @@
 							widget = [];
 						keys.forEach((ele, index) => {
 							bujian.push({
-								label: res.data[0]. [ele],
+								label: res.data[0].ele,
 								value: ele
 							})
 							widget.push(ele)
@@ -475,14 +356,14 @@
 				this.tableSymptom = '';
 				this.tableManufacturer = '';
 				this.tableWindturbineid = '';
-				
+
 				// this.tableCategory: data[i].category,
 				// this.tableRemark: data[i].remark,
 				// this.tableFaultcode: data[i].faultcode,
 				// this.tableId: data[i].id,
 				// this.tableSymptomcode:data[i].Symptomcode,
 				// this.tableStationen:data[i].stationen
-				
+
 				this.isvisiable = true;
 			},
 			onClickOption(e, row) { // 操作按钮
@@ -510,23 +391,38 @@
 							}
 						})
 						that.tableModel = row.tableModel;
-						that.tableTime = [Date.parse(new Date(tableTime[0])),Date.parse(new Date(tableTime[1]))];
+						that.tableTime = [Date.parse(new Date(tableTime[0])), Date.parse(new Date(tableTime[1]))];
 						that.tableSymptom = row.tableSymptom;
 						that.tableManufacturer = row.tableManufacturer;
 						that.tableWindturbineid = row.tableWindturbineid;
-						
-						that.tableCategory= row.tableCategory;
-						that.tableRemark= row.tableRemark;
-						that.tableFaultcode= row.tableFaultcode;
-						that.tableId= row.tableId;
-						that.tableSymptomcode= row.tableSymptomcode;
-						that.tableStationen= row.tableStationen;
+
+						that.tableCategory = row.tableCategory;
+						that.tableRemark = row.tableRemark;
+						that.tableFaultcode = row.tableFaultcode;
+						that.tableId = row.tableId;
+						that.tableSymptomcode = row.tableSymptomcode;
+						that.tableStationen = row.tableStationen;
 					});
 					that.isvisiable = true;
 				}
 				if ("config" == e.target.getAttribute("value")) { //传感点
-					that.gzCgdData = row.value;
-					that.gzCgd = 2;
+					that.API.requestData({
+						method: "GET",
+						baseURL: "http://192.168.1.18:9002/",
+						subUrl: "point/all",
+						data: {
+							wtId: row.tableWindturbineid,
+							widget: row.tableFaultcode
+						},
+						success(res) {
+							console.log(res)
+							if (res.code == 200) {
+								that.gzCgdData = res.data;
+								that.st = Date.parse(new Date(row.tableTime.split(" - ")[0]));
+								that.gzCgd = 2;
+							}
+						},
+					});
 				}
 			},
 			onClickDialogClose() { // 弹窗右上角关闭按钮
@@ -535,26 +431,17 @@
 			},
 			dialogSave() {
 				let that = this;
-				let tableTag = '';
-				// if (typeof that.tableTag.valueOf() == 'string') {
-				// 	that.tableTagArr.forEach(ele => {
-				// 		if (ele.label == that.tableTag) {
-				// 			tableTag = ele.value
-				// 		}
-				// 	})
-				// }
-				
 				that.tableTime[0] = that.formatDate(that.tableTime[0].valueOf());
 				that.tableTime[1] = that.formatDate(that.tableTime[1].valueOf());
-
+				console.log(that.tableTime)
 				that.API.requestData({
 					method: "POST",
 					baseURL: "http://192.168.1.18:9002/",
-					headers:{
+					headers: {
 						'Content-Type': 'application/json;charset=utf-8',
 					},
 					subUrl: "case/item/edit",
-					body:{
+					body: {
 						category: that.tableCategory,
 						endtime: that.tableTime[1],
 						faultcode: that.tableFaultcode,
@@ -567,19 +454,26 @@
 						stationen: that.tableStationen,
 						symptom: that.tableSymptom,
 						symptomcode: that.tableSymptomcode,
-						tag: that.tableTag =="正样本" ? 0 : 1,
+						tag: that.tableTag == "正样本" ? 0 : 1,
 						windturbineid: that.tableWindturbineid
 					},
 					success(res) {
-						console.log(res)
+						if (res.code == 200) {
+							that.BASE.showMsg({
+								type: "success",
+								msg: "保存成功",
+							});
+							that.onClickDialogClose();
+							that.list();
+						}
 					},
 				});
 			},
 			gzCgdClick(data) {
 				this.gzCgd = data;
 			},
-			formatDate(date) {
-				var date = new Date(date);
+			formatDate(dates) {
+				var date = new Date(dates);
 				var YY = date.getFullYear() + '-';
 				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
 				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
@@ -654,13 +548,13 @@
 										tableSymptom: data[i].symptom,
 										tableManufacturer: data[i].manufacturer,
 										tableWindturbineid: data[i].windturbineid,
-										
+
 										tableCategory: data[i].category,
 										tableRemark: data[i].remark,
 										tableFaultcode: data[i].faultcode,
 										tableId: data[i].id,
-										tableSymptomcode:data[i].symptomcode,
-										tableStationen:data[i].stationen
+										tableSymptomcode: data[i].symptomcode,
+										tableStationen: data[i].stationen
 									};
 									that.tableData.data.push(obj);
 								}
@@ -669,9 +563,6 @@
 					},
 				});
 			},
-			dialogData(){
-				// this.tableFaulttypeArr
-			}
 		},
 		created() {
 			let that = this;
@@ -711,11 +602,13 @@
 </script>
 
 <style lang="less" scoped>
-.mb10 {
-  margin-bottom: 10px;
-}
-.el-select.w {
-  width: 100%;
-}
-// .el-range-editor.w{width: 100%;}
+	.mb10 {
+		margin-bottom: 10px;
+	}
+
+	.el-select.w {
+		width: 100%;
+	}
+
+	// .el-range-editor.w{width: 100%;}
 </style>

src/views/sampleDatabase/fault/point.vue

@@ -0,0 +1,799 @@
+<template>
+	<el-row type="flex">
+		<div class="query-actions">
+			<button class="btn" @click="addEdit">新增</button>
+			<button class="btn" @click="dbfx">原始数据对标</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" ref="curRef" 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" class="isvisiable">
+		<!-- 这里是新增或编辑 -->
+		<el-row type="flex" class="mb10">
+			<el-col :span="12">
+				<div>样本类型：</div>
+				<el-select v-model="widget" placeholder="请选择样本" popper-class="select" class="w">
+					<el-option v-for="item in widgetArr" :key="item.value" :value="item.value"
+						:label="item.label">
+					</el-option>
+				</el-select>
+			</el-col>
+			<el-col :span="12">
+				<div>风机型号：</div>
+				<el-select v-model="tableModel" placeholder="请选择风机型号" popper-class="select" class="w">
+					<el-option v-for="item in fjxh" :key="item.value" :value="item.value" :label="item.label">
+					</el-option>
+				</el-select>
+			</el-col>
+		</el-row>
+		<el-row type="flex" class="mb10">
+			<el-col :span="12">
+				<div>故障分类：</div>
+				<el-select v-model="windturbinename" placeholder="请选择故障" popper-class="select" class="w">
+					<el-option v-for="item in BuJian" :key="item.value" :value="item.value" :label="item.label">
+					</el-option>
+				</el-select>
+			</el-col>
+			<el-col :span="12">
+				<div>时间：</div>
+				<el-date-picker v-model="tableTime" type="datetimerange" range-separator="至"
+					start-placeholder="开始日期" end-placeholder="结束日期" class="w">
+				</el-date-picker>
+			</el-col>
+		</el-row>
+		<el-row type="flex" class="mb10">
+			<el-col :span="12">
+				<div>故障原因：</div>
+				<el-input placeholder="请输入故障原因" v-model="tableSymptom" :value="tableSymptom">
+				</el-input>
+			</el-col>
+			<el-col :span="12">
+				<div>风机厂商：</div>
+				<el-input placeholder="请输入风机厂商" v-model="tableManufacturer" :value="tableManufacturer">
+				</el-input>
+			</el-col>
+		</el-row>
+		<el-row type="flex" class="mb10">
+			<el-col :span="12">
+				<div>风机编号：</div>
+				<el-input placeholder="请输入风机编号" v-model="stationcn" :value="stationcn">
+				</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>
+	<!-- 原始数据start -->
+	<el-dialog title="原始数据" v-model="yssjDialog" width="70%" top="15vh" custom-class="modal"
+		:close-on-click-modal="false" :before-close="yssjDialogClose">
+		<div class="query mg-b-8">
+			<div class="query-items">
+				<div class="query-item">
+					<div class="lable">时间：</div>
+					<div class="search-input">
+						<el-date-picker v-model="time" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+							end-placeholder="结束日期">
+						</el-date-picker>
+					</div>
+				</div>
+				<div class="query-item">
+					<div class="lable">等间隔：</div>
+					<div class="search-input">
+						<el-select
+						  v-if="!chooseStatus"
+						  @change="switchChange(selectValue)"
+						  class="inputs"
+						  v-model="selectValue"
+						  placeholder="请选择"
+						>
+						  <el-option
+							v-for="item in timeoptions"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						  >
+						  </el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="query-actions">
+					<button class="btn" @click="queryYssj">查询</button>
+				</div>
+			</div>
+		</div>
+		
+		<el-row type="flex">
+			<multiple-y-line-chart-normal
+			  height="500px"
+			  :list="Powertrend"
+			  :yAxises="PowertrendYAxises"
+			  :showLegend="true"
+			/>
+		</el-row>
+	</el-dialog>
+			<!-- 原始数据end -->
+</template>
+
+<script>
+	import ComTable from "@/components/coms/table/table.vue";
+		import MultipleYLineChartNormal from "../../NewPages/multiple-y-line-chart-normal.vue";
+		import Tab from "@/components/coms/tabs/tab.vue";
+	export default {
+		components: {
+			ComTable,MultipleYLineChartNormal,Tab
+		},
+		data() {
+			const that = this;
+			return {
+				Powertrend: [
+				  {
+				    title: "",
+				    yAxisIndex: 0, // 使用单位
+				    value: [],
+				  },
+				],
+				PowertrendYAxises: [
+				  {
+				    name: "功率",
+				    min: 0,
+				    max: null,
+				    unit: "(万kWh)",
+				    position: "left",
+				  },
+				  {
+				    name: "风速",
+				    min: 0,
+				    max: 25,
+				    unit: "(m/s)",
+				    position: "right",
+				  },
+				],
+				selectValue: "60",
+				timeoptions: [
+				  {
+				    value: "60",
+				    label: "一分钟",
+				  },
+				  {
+				    value: "300",
+				    label: "五分钟",
+				  },
+				  {
+				    value: "600",
+				    label: "十分钟",
+				  },
+				  {
+				    value: "1800",
+				    label: "三十分钟",
+				  },
+				  {
+				    value: "3600",
+				    label: "一小时",
+				  },
+				  {
+				    value: "86400",
+				    label: "一天",
+				  },
+				],
+				time: [],
+				yssjDialog:false,
+				point:[],
+				pointdes:[],
+				
+				widgetArr: [{label: '正样本',value: 0},{label: '负样本',value: 1}],
+				queryType: false, //没有改变select时，点击查询无效
+				pageIndex: 1,
+				pageSize: 20,
+				BuJian: [{
+					label: '部件1',
+					value: '1'
+				}, {
+					label: '部件2',
+					value: '2'
+				}],
+				ChangZhan: [{
+					label: '麻黄山风电场',
+					value: 'MHS_FDC'
+				}],
+				fjxh: [{
+					label: '类型1',
+					value: '1'
+				}],
+				fjxhArr: [{
+					id: "MHS_FDC",
+					value: ['UP77', 'UP82', 'UP105']
+				}],
+				widget: [],
+				model: [],
+				station: '',
+				windturbinename: "",
+				widget: "",
+				tableModel: "",
+				tableTime: "",
+				tableSymptom: "",
+				tableManufacturer: "",
+				stationcn: "",
+				tableCategory: "", //隐藏保存部分
+				tableRemark: "",
+				tableFaultcode: "",
+				tableId: "",
+				tableSymptomcode: "",
+				tableStationen: "",
+				isvisiable: false,
+				isvisiableType: 1, //新增为1，编辑为2
+				checkLength: 0, //对标分析只能选择5个
+				tableData: {
+					column: [{
+							name: "序号",
+							field: "index",
+							is_light: false,
+							width: '50px',
+						},
+						{
+						  name: "",
+						  field: "check",
+						  is_light: false,
+						  width: '50px',
+						  template: function () {
+						    return "<input class='check curCheckBox' type='CheckBox'/>";
+						  },
+						  click: function (event, data) {
+						    let point = data.point,
+								pointdes = data.pointdes;
+						    if (event.target.checked == false && that.checkLength <= 5) {
+						      that.point.forEach((item, i) => {
+						        if (item == point) {
+						          that.point.splice(i, 1);
+						          that.pointdes.splice(i, 1);
+						        }
+						      });
+						      that.checkLength--;
+						    } else if (event.target.checked && that.checkLength < 5) {
+						      that.point.push(point);
+						      that.pointdes.push(pointdes);
+						      that.checkLength++;
+						    } else if (that.checkLength == 5) {
+						      event.target.checked = false;
+						    }
+						  },
+						},
+						{
+							name: "风机",
+							field: "windturbineid",
+							is_light: false,
+							width: '100px',
+						},
+						{
+							name: "部件",
+							field: "widget",
+							is_light: false,
+							width: '100px',
+						},
+						{
+							name: "测点",
+							field: "point",
+							is_light: false,
+							width: '250px',
+						},
+						{
+							name: "测点描述",
+							field: "pointdes",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "风机型号",
+							field: "model",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "场站",
+							field: "stationcn",
+							is_light: false,
+							width: '150px',
+						},
+						{
+							name: "操作",
+							is_light: false,
+							width: '200px',
+							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,
+						windturbineid: 0,
+						widget: "MG01-01",
+						point: "0.1000",
+						pointdes: "0.1000",
+						model: "0.1000",
+						stationcn: "0.1000",
+						is_light: false,
+					}],
+				}
+			};
+		},
+		props: {
+			data: {
+				type: Array
+			},
+			st:{
+				type: String
+			}
+		},
+		methods: {
+			getTable() {
+				let that = this;
+				this.tableLoading = true;
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.10.4:9002/",
+					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,
+								})
+							})
+							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() {
+				var that = this;
+				// that.time = [new Date((new Date() - 3600 * 1000 * 24 * 30)).formatDate("yyyy-MM-dd"), new Date().formatDate("yyyy-MM-dd")];
+				that.time = [new Date((new Date() - 3600 * 1000 * 24 * 360)).formatDate("yyyy-MM-dd"), new Date()
+					.formatDate("yyyy-MM-dd")
+				];
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://10.155.32.4:9001/",
+					subUrl: "benchmarking/wplist",
+					success(res) {
+						that.ChangZhan = res.data;
+						// that.station = res.data[0].name
+						that.station = res.data[1].name
+					},
+				});
+
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "basic/widget/condition",
+					success(res) {
+						let keys = Object.keys(res.data[0]);
+						let bujian = [],
+							widget = [];
+						keys.forEach((ele, index) => {
+							bujian.push({
+								label: res.data[0].ele,
+								value: ele
+							})
+							widget.push(ele)
+						})
+
+						that.widget = widget;
+						that.BuJian = bujian;
+					},
+				});
+
+				that.API.requestData({
+					method: "GET",
+					baseURL: "http://192.168.1.18:9002/",
+					subUrl: "basic/station/all",
+					success(res) {
+						let fjxhArr = [];
+						let model = [],
+							fjxh = [];
+						res.data.forEach(ele => {
+							fjxhArr.push({
+								id: ele.id,
+								value: ele.model.split("/")
+							})
+							if (ele.id == "MHS_FDC") {
+								model = ele.model.split("/");
+								model.forEach(ele => {
+									fjxh.push({
+										label: ele,
+										value: ele
+									})
+								})
+							}
+						})
+						that.fjxhArr = fjxhArr;
+						that.model = model;
+						that.fjxh = fjxh;
+					},
+				});
+			},
+			query() {
+				if (this.queryType) {
+					this.list();
+				}
+			},
+			addEdit() {
+				this.isvisiableType = 1;
+				this.windturbinename = '';
+				this.tableModel = '';
+				this.tableTime = '';
+				this.tableSymptom = '';
+				this.tableManufacturer = '';
+				this.stationcn = '';
+
+				// this.tableCategory: data[i].category,
+				// this.tableRemark: data[i].remark,
+				// this.tableFaultcode: data[i].faultcode,
+				// this.tableId: data[i].id,
+				// this.tableSymptomcode:data[i].Symptomcode,
+				// this.tableStationen:data[i].stationen
+
+				this.isvisiable = true;
+			},
+			onClickOption(e, row) { // 操作按钮
+				let that = this;
+				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(() => {
+						let tableTime = row.tableTime.split(" - ");
+						that.widget = row.widget;
+						that.BuJian.forEach(ele => {
+							if (ele.value == row.tableFaultcode) {
+								that.windturbinename = ele.label
+							}
+						})
+						that.tableModel = row.tableModel;
+						that.tableTime = [Date.parse(new Date(tableTime[0])), Date.parse(new Date(tableTime[1]))];
+						that.tableSymptom = row.tableSymptom;
+						that.tableManufacturer = row.tableManufacturer;
+						that.stationcn = row.stationcn;
+
+						that.tableCategory = row.tableCategory;
+						that.tableRemark = row.tableRemark;
+						that.tableFaultcode = row.tableFaultcode;
+						that.tableId = row.tableId;
+						that.tableSymptomcode = row.tableSymptomcode;
+						that.tableStationen = row.tableStationen;
+					});
+					that.isvisiable = true;
+				}
+				if ("config" == e.target.getAttribute("value")) { //传感点
+					that.time = [that.st - (3600 * 1000), that.st];
+					that.point =[row.point];
+					that.pointdes = [row.pointdes];
+					that.requestDetailData(that.point,that.pointdes,that.time,that.selectValue);
+					that.yssjDialog=true;
+				}
+			},
+			onClickDialogClose() { // 弹窗右上角关闭按钮
+				this.isvisiable = false;
+				this.isvisiableType = 1;
+			},
+			dialogSave() {
+				let that = this;
+				that.tableTime[0] = that.formatDate(that.tableTime[0].valueOf());
+				that.tableTime[1] = that.formatDate(that.tableTime[1].valueOf());
+				console.log(that.tableTime)
+				that.API.requestData({
+					method: "POST",
+					baseURL: "http://192.168.1.18:9002/",
+					headers: {
+						'Content-Type': 'application/json;charset=utf-8',
+					},
+					subUrl: "case/item/edit",
+					body: {
+						category: that.tableCategory,
+						endtime: that.tableTime[1],
+						faultcode: that.tableFaultcode,
+						faulttype: that.windturbinename,
+						id: that.tableId,
+						manufacturer: that.tableManufacturer,
+						model: that.tableModel,
+						remark: that.tableRemark,
+						starttime: that.tableTime[0],
+						stationen: that.tableStationen,
+						symptom: that.tableSymptom,
+						symptomcode: that.tableSymptomcode,
+						tag: that.widget == "正样本" ? 0 : 1,
+						windturbineid: that.stationcn
+					},
+					success(res) {
+						if (res.code == 200) {
+							that.BASE.showMsg({
+								type: "success",
+								msg: "保存成功",
+							});
+							that.onClickDialogClose();
+							that.list();
+						}
+					},
+				});
+			},
+			gzCgdClick(data) {
+				this.gzCgd = data;
+			},
+			formatDate(dates) {
+				var date = new Date(dates);
+				var YY = date.getFullYear() + '-';
+				var MM = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+				var DD = (date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate());
+				var hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+				var ss = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+				return YY + MM + DD + " " + hh + mm + ss;
+			},
+			list(data) {
+				console.log(data)
+				var that = this;
+				that.tableData.data = [];
+				if (data.length) {
+					for (var i = 0; i < data.length; i++) {
+						let obj = {
+							index: i + 1,
+							windturbineid: data[i].windturbineid,
+							widget: data[i].widget,
+							point: data[i].point,
+							pointdes: data[i].pointdes,
+							model: data[i].model,
+							stationcn: data[i].stationcn,
+							
+						};
+						that.tableData.data.push(obj);
+					}
+				}
+				
+				
+				// let station = '',
+				// 	widget = ''
+				// if (typeof that.time[0].valueOf() != 'string') {
+				// 	that.time[0] = that.formatDate(that.time[0].valueOf())
+				// }
+				// if (typeof that.time[1].valueOf() != 'string') {
+				// 	that.time[1] = that.formatDate(that.time[1].valueOf())
+				// }
+				// if (typeof that.station.valueOf() == 'string') {
+				// 	that.ChangZhan.forEach(ele => {
+				// 		if (ele.name == that.station) {
+				// 			station = ele.id
+				// 		}
+				// 	})
+				// }
+				// if (typeof that.widget.valueOf() == 'string') {
+				// 	that.BuJian.forEach(ele => {
+				// 		if (ele.label == that.widget) {
+				// 			widget = ele.value
+				// 		}
+				// 	})
+				// }
+				// if (that.model.length == 0) {
+				// 	that.BASE.showMsg({
+				// 		type: "warning",
+				// 		msg: "请选择风机型号",
+				// 	});
+				// 	return
+				// }
+				// if (that.widget.length == 0) {
+				// 	that.BASE.showMsg({
+				// 		type: "warning",
+				// 		msg: "请选择部件",
+				// 	});
+				// 	return
+				// }
+				// that.API.requestData({
+				// 	showLoading: true,
+				// 	method: "GET",
+				// 	baseURL: "http://192.168.1.18:9002/",
+				// 	subUrl: "case/fault/all",
+				// 	data: {
+				// 		widget: widget ? widget : that.widget,
+				// 		station: station ? station : that.station,
+				// 		model: that.model,
+				// 		st: that.time[0].valueOf(),
+				// 		et: that.time[1].valueOf()
+				// 	},
+				// 	success(res) {
+				// 		if (res.code == 200) {
+				// 			console.log(res)
+				// 			that.tableData.data = [];
+				// 			if (res.data.length) {
+				// 				let data = res.data;
+				// 				for (var i = 0; i < data.length; i++) {
+				// 					let obj = {
+				// 						index: i + 1,
+				// 						widget: data[i].tag == 0 ? '正样本' : '负样本',
+				// 						windturbinename: data[i].faulttype,
+				// 						tableModel: data[i].model,
+				// 						tableTime: data[i].starttime + ' - ' + data[i].endtime,
+				// 						tableSymptom: data[i].symptom,
+				// 						tableManufacturer: data[i].manufacturer,
+				// 						stationcn: data[i].windturbineid,
+
+				// 						tableCategory: data[i].category,
+				// 						tableRemark: data[i].remark,
+				// 						tableFaultcode: data[i].faultcode,
+				// 						tableId: data[i].id,
+				// 						tableSymptomcode: data[i].symptomcode,
+				// 						tableStationen: data[i].stationen
+				// 					};
+				// 					that.tableData.data.push(obj);
+				// 				}
+				// 			}
+				// 		}
+				// 	},
+				// });
+			},
+			back() {
+				this.clearDb();
+				this.$emit('gzCgdClick', 1);
+			},
+			switchChange(interval,status) {
+			  if(status === 'interval') {
+			    this.chooseStatus = false
+			    this.selectValue = '60'
+			  }else if(status === 'original'){
+			    this.chooseStatus = true
+			  }
+			  // this.requestDetailData(
+			  //     this.wpvalue,
+			  //     this.startdate,
+			  //     this.enddate,
+			  //     interval,
+			  //     this.wtId,
+			  //     this.descName
+			  //   );
+			},
+			requestDetailData(point, pointdes, time,interval) {
+			    let that = this;
+				let Powertrend = [];
+				pointdes.forEach((ele,index)=>{
+					Powertrend.push({
+						title:ele,
+						smooth: true,
+						value: [],
+					})
+				})
+				point.forEach((ele,index)=>{
+					that.API.requestData({
+						method: "GET",
+						baseURL: "http://192.168.1.18:9002/",
+						subUrl: "point/item",
+						data:{
+							point:ele,
+							startTs:time[0],
+							endTs:time[1],
+							interval:interval
+						},
+						success(res) {
+							if(res.data){
+							  res.data.forEach((cEle) => {
+								Powertrend[index].value.push({
+								  text: new Date(cEle.ts).formatDate("hh:mm"),
+								  value: cEle.doubleValue,
+								});
+							  });
+							  if((point.length - 1) == index){
+								that.Powertrend = Powertrend;
+							  }
+							}
+						},
+					});
+				})
+				
+			},
+			queryYssj(){
+				this.requestDetailData(this.point,this.pointdes,[Date.parse(new Date(this.time[0])), Date.parse(new Date(this.time[1]))],this.selectValue);
+			},
+			dbfx() {
+			  var that = this;
+			  if (that.point.length <=5) {
+				  that.Powertrend = [];
+				  that.time = [that.st - (3600 * 1000), that.st];
+				  that.requestDetailData(that.point,that.pointdes,[Date.parse(new Date(that.time[0])), Date.parse(new Date(that.time[1]))],that.selectValue);
+			    that.yssjDialog = true;
+			    that.clearDb();
+			  }
+			},
+			clearDb() {
+			  //清空对标状态
+			  this.$refs.curRef.clearCheckBox();
+			  this.point = [];
+			  this.pointdes = [];
+			  this.checkLength = 0;
+			},
+		},
+		created() {
+			this.list(this.data)
+		},
+		watch: {
+			station(res) {
+				let fjxh = [];
+				this.fjxhArr.forEach(ele => {
+					if (ele.id == res) {
+						ele.value.forEach(ele2 => {
+							fjxh.push({
+								label: ele2,
+								value: ele2
+							})
+						})
+						this.model = ele.value;
+					}
+				})
+				this.fjxh = fjxh;
+				this.queryType = true;
+			},
+			widget() {
+				this.queryType = true;
+			},
+			model() {
+				this.queryType = true;
+			},
+			time() {
+				this.queryType = true;
+			},
+		},
+	};
+</script>
+
+<style lang="less" scoped>
+	.mb10 {
+		margin-bottom: 10px;
+	}
+
+	.el-select.w {
+		width: 100%;
+	}
+</style>

src/views/sampleDatabase/market/index.vue

@@ -0,0 +1,26 @@
+<template>
+  <el-scrollbar :height="height"> </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/sampleDatabase/performance/index.vue

@@ -0,0 +1,26 @@
+<template>
+  <el-scrollbar :height="height"> </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/sampleDatabase/warning/index.vue

@@ -0,0 +1,26 @@
+<template>
+  <el-scrollbar :height="height"> </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>