update

src/components/BasicInformationDetail.vue

@@ -113,7 +113,7 @@
       <el-col :span="12">
         <div class="dataLists">
           <div class="dataTitle">
-            <div style="margin-left: 24px;">报警参数</div>
+            <div style="margin-left: 24px;">报警记录</div>
           </div>
           <el-scrollbar class="scorll">
             <el-table stripe="true" border-color="#141414" :data="warning" style="width: 100%" :header-cell-style="{
@@ -571,6 +571,7 @@
           bd.windturbineControl(
             los,
             true,
+            '',
             this.controlSuccess,
             this.controlError
           );
@@ -582,6 +583,7 @@
           bd.windturbineControl(
             vs,
             false,
+            '',
             this.controlSuccess,
             this.controlError
           );

src/components/BoosterStation/previewPicture.vue

@@ -621,7 +621,7 @@
 				position: absolute;
 				// top: 75%;
 				left: 50%;
-				transform: translate(-50%, -10%);
+				transform: translate(-50%, -5%);
 
 				img,
 				.svg {

src/components/WindturbineDetailPages.vue

@@ -2,7 +2,7 @@
 	<el-dialog width="75%" @opened="opened()" @closed="closed()" :show-close="false" class="my-info-dialog">
 		<template #title>
 			<div v-if="!showSvg" style="margin-top:-10px;color: #FFFFFF;">风机详情</div>
-			<div v-else style="margin-top:-10px;color: #FFFFFF;">升压站</div>
+			<div v-else style="margin-top:-10px;color: #FFFFFF;">{{svgWeb}}升压站</div>
 		</template>
 		<div v-if="!showSvg" class="body">
 			<table style="border-bottom: 1px solid #242424;" width="99.8%">

src/components/areaCard.vue

@@ -301,6 +301,7 @@
                     bd.windturbineControl(
                         los,
                         true,
+                        '',
                         this.controlSuccess,
                         this.controlError
                     );
@@ -313,6 +314,7 @@
                     bd.windturbineControl(
                         vs,
                         false,
+                        '',
                         this.controlSuccess,
                         this.controlError
                     );

src/components/check/areaCard.vue

@@ -107,7 +107,7 @@
         width: 100%;
         margin-left: 15px;
         margin-top: 10px;
-        height: 34vh;
+        height: 35vh;
     }
 
     .body .scoll {

src/components/control/areaCard.vue

@@ -301,6 +301,7 @@
                     bd.windturbineControl(
                         this.chooseList,
                         true,
+                        '',
                         this.controlSuccess,
                         this.controlError
                     );
@@ -325,12 +326,24 @@
                     }
                     this.showFlag = true
                     bd.checkout(sendList);
-                    bd.windturbineControl(
+                    if(automatic){
+                        bd.windturbineControl(
+                        sendList,
+                        false,
+                        'automatic',
+                        this.controlSuccess,
+                        this.controlError
+                    );
+                    }else{
+                        bd.windturbineControl(
                         sendList,
                         false,
+                        '',
                         this.controlSuccess,
                         this.controlError
                     );
+                    }
+                    
                 } else if (msg.type == "marking") {
                     // 标注
                     var vvs = this.getSelectedItems();
@@ -453,7 +466,7 @@
         border: 1px solid #373737;
         width: 100%;
         margin-left: 15px;
-        margin-top: 10px;
+        margin-top: 20px;
     }
 
     .body .scoll {
@@ -489,7 +502,7 @@
 
     .logo {
         position: absolute;
-        top: 2px;
+        top: 12px;
         left: 12px;
     }
 

src/components/control/controlAllArea.vue

@@ -362,7 +362,7 @@
                     this.chooseList.forEach(item => {
                         item.lockType = msg.value;
                     })
-                    bd.windturbineControl(this.chooseList, true);
+                    bd.windturbineControl(this.chooseList, true,'',);
                 } else if (msg.type == "send") {
                     // 发送
                     let sendList = []
@@ -380,6 +380,7 @@
                     bd.windturbineControl(
                         sendList,
                         false,
+                        '',
                         this.controlSuccess,
                         this.controlError
                     );

src/components/focus/focusCard.vue

@@ -78,7 +78,7 @@
 					.then(msg => {
 						console.log(msg)
 						for (let v in msg.data) {
-							if (msg.data[v].doubleValue ? (msg.data[v].doubleValue === 0) : (!msg.data[v].booleanValue)) {
+							if (msg.data[v].doubleValue ? (msg.data[v].doubleValue > 0) : (msg.data[v].booleanValue)) {
 								bd.Recommends[v].isActive = true
 							}
 						}

src/components/matrixBlock.vue

@@ -1,7 +1,7 @@
 <template>
-    <div style="display: flex; flex-direction: row; flex-wrap: wrap;">
+    <div style="display: flex; flex-direction: row; flex-wrap: wrap;margin-left: 10px;">
         <div :class="item.active?'box-' + item.status:'unbox-' + item.status" v-for="(item, index) in dataList"
-            :key="index" @click="onSelectHandler(item)" @dblclick="sendMsg(item)">
+            :key="index" @click="onSelectHandler(item)" @dblclick="sendMsg(item)" style="margin-right: 15px;">
             <div :class="item.active?'left-' + item.status:'unleft-' + item.status">
                 <div>{{ item.windturbineId.slice(0, 2) }}</div>
                 <div>{{ item.windturbineId.slice(5) }}</div>

src/components/modeControl/modeControl.vue

@@ -65,7 +65,7 @@
         },
         created() {
             this.getData(),
-                this.refreshTimer = setInterval(this.getData, 600000);
+            this.refreshTimer = setInterval(this.getData, 20000);
         },
         mounted() {
             this.current = this.$props.current
@@ -135,7 +135,7 @@
         height: 18.5vh;
         /* background-color: #ffffff; */
         margin-left: 15px;
-        margin-top: 10px;
+        margin-top: 20px;
         border-left: 1px solid #373737;
         border-right: 1px solid #373737;
         border-bottom: 1px solid #373737;

src/components/problem/ProblemArea.vue

@@ -1,7 +1,7 @@
 /* 问题区 */
 <template>
   <div class="problem" >
-    <AreaCard title="问题区" height="85"></AreaCard>
+    <AreaCard title="问题区" height="86"></AreaCard>
   </div>
 </template>
 
@@ -112,7 +112,7 @@
           for (var id in los) {
             los[id].lockType = msg.value;
           }
-          bd.windturbineControl(los, true);
+          bd.windturbineControl(los, true,'',);
         } else if (msg.type == "marking") {
           // 标注
           var vs = this.getSelectedItems();

src/components/problem/areaCard.vue

@@ -294,6 +294,7 @@
                     bd.windturbineControl(
                         this.chooseList,
                         true,
+                        '',
                         this.controlSuccess,
                         this.controlError
                     );
@@ -303,6 +304,7 @@
                     bd.windturbineControl(
                         this.chooseList,
                         false,
+                        '',
                         this.controlSuccess,
                         this.controlError
                     );
@@ -458,7 +460,7 @@
         border: 1px solid #373737;
         width: 100%;
         margin-left: 15px;
-        margin-top: 10px;
+        margin-top: 20px;
     }
 
     .body .scoll {
@@ -494,7 +496,7 @@
 
     .logo {
         position: absolute;
-        top: 2px;
+        top: 12px;
         left: 12px;
     }
 

src/components/warning/warningArea.vue

@@ -2,7 +2,7 @@
     <div class="body">
         <img class="logo" src="../../assets/img/logo.png" alt="">
         <div class="title">告警区</div>
-        <div style="margin-top: 50px; margin-left: 10px; height: 28vh;">
+        <div style="margin-top: 50px; margin-left: 10px; height: 29vh;">
             <el-scrollbar>
                 <div class="scoll" style="margin-left: 5px;">
                     <WarningCard></WarningCard>
@@ -25,7 +25,7 @@
         width: 100%;
         margin-left: 15px;
         margin-top: 10px;
-        height: 34vh
+        height: 35vh
     }
 
     .body .scoll {

src/components/warning/warningCard.vue

@@ -1,7 +1,7 @@
 /* 告警区 */
 <template>
-		<div style="padding-left: 5px; padding-right: 5px">
-			<el-table :data="values" class="table" height="27vh" :header-cell-style="{
+	<div style="padding-left: 5px; padding-right: 5px">
+		<el-table :data="values" class="table" height="28vh" :header-cell-style="{
           background: '#000000',
           color: 'rgb(220,220,220)',
           padding: '4px',
@@ -13,20 +13,20 @@
           padding: '3px',
           fontSize: '12px',
         }" @row-dblclick="itemDblclick">
-				<el-table-column prop="lastUpdateTime" align="center" label="时间" width="150">
-				</el-table-column>
-				<el-table-column prop="alertText" align="center" label="描述" width="280">
-				</el-table-column>
-				<el-table-column prop="isSelected" align="center" label="确认">
-					<template v-slot="scope">
-						<!-- <el-checkbox v-model="scope.row.isSelected" @click="itemChecked(scope.row)"></el-checkbox> -->
-						<input type="checkbox" v-model="scope.row.isSelected" @click="itemChecked(scope.row)" />
-					</template>
-					<!-- <el-checkbox v-model="isSelected"></el-checkbox> -->
-					<!-- <input type="checkbox"/> -->
-				</el-table-column>
-			</el-table>
-		</div>
+			<el-table-column prop="lastUpdateTime" align="center" label="时间" width="150">
+			</el-table-column>
+			<el-table-column prop="alertText" align="center" label="描述" width="280">
+			</el-table-column>
+			<el-table-column prop="isSelected" align="center" label="确认">
+				<template v-slot="scope">
+					<!-- <el-checkbox v-model="scope.row.isSelected" @click="itemChecked(scope.row)"></el-checkbox> -->
+					<input type="checkbox" v-model="scope.row.isSelected" @click="itemChecked(scope.row)" />
+				</template>
+				<!-- <el-checkbox v-model="isSelected"></el-checkbox> -->
+				<!-- <input type="checkbox"/> -->
+			</el-table-column>
+		</el-table>
+	</div>
 	<WindturbineDetailPages v-model="dialogVisible" :windturbine="currentWindturbine" :showSvg="showSvg"
 		:svgWeb="svgWeb" @close="close"></WindturbineDetailPages>
 </template>
@@ -44,7 +44,7 @@
 			WindturbineDetailPages,
 			// Sbdl,
 		},
-		created: function() {
+		created: function () {
 			this.initData();
 		},
 		props: {},
@@ -124,7 +124,7 @@
 			},
 			confirm(item) {
 				var url =
-                process.env.VUE_APP_API+`/alarm/confirm?snapID=${item.snapIDString}&faultID=${item.idString}&userName=${BackgroundData.getInstance().LoginUser.name}`;
+					process.env.VUE_APP_API + `/alarm/confirm?snapID=${item.snapIDString}&faultID=${item.idString}&userName=${BackgroundData.getInstance().LoginUser.name}`;
 				axios
 					.get(url)
 					.then((msg) => {
@@ -154,12 +154,14 @@
 	};
 </script>
 <style scoped>
-    .el-table::before{
-        width: 0;
-    }
-    .table{
-        background-color: #000000;
-    }
+	.el-table::before {
+		width: 0;
+	}
+
+	.table {
+		background-color: #000000;
+	}
+
 	:deep(.el-table__body-wrapper::-webkit-scrollbar) {
 		width: 8px;
 		height: 0px;
@@ -202,4 +204,4 @@
 		border-collapse: separate;
 		border-spacing: 0px 5px;
 	}
-</style>
+</style>

src/router/index.js

@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory} from 'vue-router'
+import { createRouter, createWebHashHistory  } from 'vue-router'
 import CenterPage from 'views/CenterPage.vue'
 
 const routes = [

src/utils/BackgroundData.js

@@ -293,7 +293,7 @@ export default class BackgroundData {
     // }
 
     /* 风机控制 */
-    windturbineControl(windturbines, isLockOrUnlock, success, error) {
+    windturbineControl(windturbines, isLockOrUnlock, automatic ,success, error) {
         var pairs = {};
         for (var ind in windturbines) {
             var wb = windturbines[ind];
@@ -304,7 +304,7 @@ export default class BackgroundData {
                 modelId: wb.modelId,
                 controlType: wb.controlType,
                 lockType: wb.lockType,
-                userName: this.LoginUser.userName,
+                userName: automatic?'system_'+this.LoginUser.name:this.LoginUser.name,
                 userId: this.LoginUser.id,
             };
             pairs[ct.windturbineId] = ct;

src/views/TitleBar.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="title-bar" onselectstart="return false">
     <el-row>
-      <el-col :span="6">
+      <el-col :span="5">
         <img class="logo" src="../assets/img/main_window/logo.png" sytle="align-items" />
       </el-col>
       <el-col :span=".1">
@@ -327,7 +327,7 @@
   .logo {
     position: relative;
     top: 32%;
-    margin-left: 10px;
+    margin-left: 30px;
   }
 
   .titleinfo {