1

sources/client/vrv-moblie/config/api.js

@@ -55,6 +55,7 @@ const api = {
 		detail: `${root}/deviceParam/detail`,
 		delete: `${root}/deviceParam/delete`,
 		batchDelete: `${root}/deviceParam/batchDelete`,
+		getTimeData: `${root}/deviceParam/getTimeData`,
 	},
 	deviceAlarmRecord: {
 		list: `${root}/deviceAlarmRecord/list`,

sources/client/vrv-moblie/pages.json

@@ -1,16 +1,18 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+
 		{
-			"path": "pages/login/login",
+			"path": "pages/operator/operator",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "运营商管理",
 				"enablePullDownRefresh": false
 			}
 		},
+
 		{
-			"path": "pages/operator/operator",
+			"path": "pages/login/login",
 			"style": {
-				"navigationBarTitleText": "运营商管理",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 		},

sources/client/vrv-moblie/pages/login/login.vue

@@ -122,9 +122,14 @@
 						icon: "none"
 					})
 
-					uni.switchTab({
-						url: '/pages/operator/operator'
-					})
+					uni.setStorage({
+							key: 'realname',
+							data: res.data.data.userBean.realname
+						}),
+
+						uni.switchTab({
+							url: '/pages/operator/operator'
+						})
 				}
 
 				if (res.data.status == 400) {

sources/client/vrv-moblie/pages/operator/operator.vue

@@ -15,12 +15,32 @@
 	export default {
 		data() {
 			return {
+				realname: '',
 				operators: [],
 			}
 		},
 		onLoad(e) {
 			this.list(e)
 
+			uni.getStorage({
+				key: 'realname',
+				success: function(res) {
+					console.log(res.data);
+					this.realname = res.data
+					
+					if (this.realname == '') {
+						uni.navigateTo({
+							url: '/pages/login/login',
+						});
+						
+						console.log("未找到用户，请登录");
+					}
+				}
+			})
+
+
+		
+
 			uni.$on('flush', () => {
 				this.list(e)
 			})

sources/client/vrv-moblie/pages/parameterSetting/parameterSetting.vue

@@ -46,21 +46,22 @@
 					<view class="text">
 						<text>控制选择模式</text>
 					</view>
-					<button class="button" :class="{'active_button': formData.JZ_XZ == 1}"
+					<button class="button" :class="{'Green_button': formData.JZ_XZ == 1}"
 						@tap="JZXZ">{{formData.JZ_XZ == 0?"CK1":"CK2"}}</button>
 				</view>
 				<view class="item">
 					<view class="text">
 						<text>控制模式复位</text>
 					</view>
-					<button class="button" :class="{'active_button': formData.MS_XZ == 1}" @tap="MSXZ()">复位</button>
+					<button class="button" :class="{'Green_button': formData.MS_XZ == 1}" @tap="MSXZ()">
+						{{ formData.MS_XZ == 0 ? "主用" : "备用" }}</button>
 				</view>
 
 				<view class="item">
 					<view class="text">
 						<text>故障复位</text>
 					</view>
-					<button class="button" :class="{'active_button': formData.GZ_FW == 1}"
+					<button class="button" :class="{'Red_button': formData.GZ_FW == 0}"
 						@tap="GZFW()">{{formData.GZ_FW == 0?"关闭":"打开"}}</button>
 				</view>
 			</view>
@@ -132,7 +133,7 @@
 					@tap="shouZiDongSFJ()">{{formData.SFJ_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.SFJ_SDQD == 1}"
-					@tap="shouZiDongSFJSD()">{{formData.SFJ_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongSFJSD()">{{formData.SFJ_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.SFJ_QT == 0?"停止":"启动"}}</text>
 			</view>
@@ -142,7 +143,7 @@
 					@tap="shouZiDongPFJ">{{formData.PFJ_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.PFJ_SDQD == 1}"
-					@tap="shouZiDongPFJSD()">{{formData.PFJ_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongPFJSD()">{{formData.PFJ_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.PFJ_QT == 0?"停止":"启动"}}</text>
 			</view>
@@ -152,7 +153,7 @@
 					@tap="shouZiDongFLZJ">{{formData.FLZJ_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.FLZJ_SDQD == 1}"
-					@tap="shouZiDongFLZJSD()">{{formData.FLZJ_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongFLZJSD()">{{formData.FLZJ_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.FLZJ_QT == 0?"停止":"启动"}}</text>
 			</view>
@@ -162,7 +163,7 @@
 					@tap="shouZiDongYJDJR">{{formData.YJDJR_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.YJDJR_SDQD == 1}"
-					@tap="shouZiDongYJDJRSD()">{{formData.YJDJR_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongYJDJRSD()">{{formData.YJDJR_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.YJDJR_QT == 0?"停止":"启动"}}</text>
 			</view>
@@ -172,7 +173,7 @@
 					@tap="shouZiDongEJDJR">{{formData.EJDJR_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.SJDJR_SDQD == 1}"
-					@tap="shouZiDongEJDJRSD()">{{formData.SJDJR_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongEJDJRSD()">{{formData.SJDJR_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.EJDJR_QT == 0?"停止":"启动"}}</text>
 			</view>
@@ -182,7 +183,7 @@
 					@tap="shouZiDongSJDJR">{{formData.SJDJR_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.SJDJR_SDQD == 1}"
-					@tap="shouZiDongSJDJRSD()">{{formData.SJDJR_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongSJDJRSD()">{{formData.SJDJR_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.SJDJR_QT == 0?"停止":"启动"}}</text>
 			</view>
@@ -192,7 +193,7 @@
 					@tap="shouZiDongSFF">{{formData.SFF_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.SFF_SDQD == 1}"
-					@tap="shouZiDongSFFSD()">{{formData.SFF_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongSFFSD()">{{formData.SFF_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.SFF_KGKZ == 0?"关闭":"打开"}}</text>
 			</view>
@@ -202,7 +203,7 @@
 					@tap="shouZiDongPFF">{{formData.PFF_SZXZ == 0?'自动':'手动'}}</button>
 
 				<button class="stop" :class="{'active_button': formData.PFF_SDQD == 1}"
-					@tap="shouZiDongPFFSD()">{{formData.PFF_SDQD == 0?'启动':'停止'}}</button>
+					@tap="shouZiDongPFFSD()">{{formData.PFF_SDQD == 1?'启动':'停止'}}</button>
 
 				<text class="four">{{formData.PFF_KGKZ == 0?"关闭":"打开"}}</text>
 			</view>
@@ -1049,6 +1050,26 @@
 	}
 </script>
 <style>
+	.button {
+		width: 208rpx;
+		height: 98rpx;
+		margin-top: 20rpx;
+		background-color: #007AFF;
+		color: white;
+		font-size: unset;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.Green_button {
+		background-color: green;
+	}
+
+	.Red_button {
+		background-color: crimson;
+	}
+
 	.anniu {
 		width: 116rpx;
 		height: 116rpx;
@@ -1159,17 +1180,6 @@
 		justify-content: center;
 	}
 
-	.button {
-		width: 208rpx;
-		height: 98rpx;
-		margin-top: 20rpx;
-		background-color: #007AFF;
-		color: white;
-		font-size: unset;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
 
 	.item {
 		margin-left: 20rpx;

sources/client/vrv-moblie/pages/runningState/runningState.vue

@@ -9,9 +9,9 @@
 				<view class="shangItem">
 					<text style="margin-left: 6rpx;">电加热</text>
 					<view class="buttonItem">
-						<button class="but" :class="{'active-but': formData.YJDJR_QT == 0}">一</button>
-						<button class="but" :class="{'active-but': formData.EJDJR_QT == 0}">二</button>
-						<button class="but" :class="{'active-but': formData.SJDJR_QT == 0}">三</button>
+						<button class="but" :class="{'active-but': formData.YJDJR_QT == 1}">一</button>
+						<button class="but" :class="{'active-but': formData.EJDJR_QT == 1}">二</button>
+						<button class="but" :class="{'active-but': formData.SJDJR_QT == 1}">三</button>
 					</view>
 				</view>
 				<view class="shangItem">
@@ -29,7 +29,8 @@
 				<view class="xiaItem">
 					<text>初效滤网</text>
 					<view class="xiaBut">
-						<button class="xiaButton">{{ formData.LWDS_CX === '0' ? '正常' : '报警' }}</button>
+						<button class="xiaButton"
+							:class="{'Red_button': formData.LWDS_CX == 1}">{{ formData.LWDS_CX === '0' ? '正常' : '报警' }}</button>
 					</view>
 				</view>
 				<view class="xiaItem">
@@ -39,19 +40,22 @@
 				<view class="xiaItem">
 					<text>高温报警</text>
 					<view class="xiaBut">
-						<button class="xiaButton"> {{ formData.GW_BJ === '0' ? '正常' : '报警' }}</button>
+						<button class="xiaButton" :class="{'Red_button': formData.GW_BJ == 1}">
+							{{ formData.GW_BJ === '0' ? '正常' : '报警' }}</button>
 					</view>
 				</view>
 				<view class="xiaItem">
 					<text>缺风压差</text>
 					<view class="xiaBut">
-						<button class="xiaButton">{{ formData.QFYC_BJ === '0' ? '正常' : '报警' }}</button>
+						<button class="xiaButton"
+							:class="{'Red_button': formData.QFYC_BJ == 1}">{{ formData.QFYC_BJ === '0' ? '正常' : '报警' }}</button>
 					</view>
 				</view>
 				<view class="xiaItem">
 					<text>中效滤网</text>
 					<view class="xiaBut">
-						<button class="xiaButton">{{ formData.LWDS_ZX === '0' ? '正常' : '报警' }}</button>
+						<button class="xiaButton"
+							:class="{'Red_button': formData.LWDS_ZX == 1}">{{ formData.LWDS_ZX === '0' ? '正常' : '报警' }}</button>
 					</view>
 				</view>
 
@@ -122,7 +126,7 @@
 		</view>
 
 		<view class="stopButton">
-			<button class="button" @tap="stopAndStart" :class="{'KGJ_button': formData.JZ_KGJ == 0}">开关按钮</button>
+			<button class="Green_button" @tap="stopAndStart" :class="{'Red_button': formData.JZ_KGJ == 0}">开关按钮</button>
 		</view>
 
 		<view class="anniu" @tap="back">
@@ -483,14 +487,19 @@
 		margin-right: 10rpx;
 	}
 
-	.button {
-		background-color: #E12A1F;
+	.Green_button {
+		background-color: mediumspringgreen;
 		color: white;
 		width: 654rpx;
 		margin-left: 48rpx;
 		margin-top: 44rpx;
 	}
 
+	.Red_button {
+		background-color: crimson;
+		color: white;
+	}
+
 	.name1 {
 		color: #848586;
 		font-size: 24rpx;
@@ -638,7 +647,8 @@
 		font-size: 20rpx;
 		color: #444546;
 	}
-	.KGJ_button{
+
+	.KGJ_button {
 		background-color: #00ff99;
 	}
 

sources/client/vrv-moblie/pages/systemParameter/systemParameter.vue

@@ -168,7 +168,7 @@
 
 					<view class="stopButton">
 						<button class="button" @tap="HFCC()"
-							:class="{'active_button': formData.HF_CC == 1}">恢复出厂设定</button>
+							:class="{'active_button': formData.HF_CC == 0}">恢复出厂设定</button>
 					</view>
 
 				</view>

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/login/login",
     "pages/operator/operator",
+    "pages/login/login",
     "pages/operator/operatorInfo/operatorInfo",
     "pages/device/device",
     "pages/device/deviceInfo/deviceInfo",

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1430,7 +1430,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -2734,7 +2734,8 @@ var api = {
     updateParam: "".concat(root, "/deviceParam/updateParam"),
     detail: "".concat(root, "/deviceParam/detail"),
     delete: "".concat(root, "/deviceParam/delete"),
-    batchDelete: "".concat(root, "/deviceParam/batchDelete") },
+    batchDelete: "".concat(root, "/deviceParam/batchDelete"),
+    getTimeData: "".concat(root, "/deviceParam/getTimeData") },
 
   deviceAlarmRecord: {
     list: "".concat(root, "/deviceAlarmRecord/list"),
@@ -14949,7 +14950,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -14970,14 +14971,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -15063,7 +15064,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_NAME":"vrv-platform","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -266,6 +266,11 @@ var _default =
                     icon: "none" });
 
 
+                  uni.setStorage({
+                    key: 'realname',
+                    data: res.data.data.userBean.realname }),
+
+
                   uni.switchTab({
                     url: '/pages/operator/operator' });
 

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/operator/operator.js

@@ -149,12 +149,32 @@ var _default =
 {
   data: function data() {
     return {
+      realname: '',
       operators: [] };
 
   },
   onLoad: function onLoad(e) {var _this = this;
     this.list(e);
 
+    uni.getStorage({
+      key: 'realname',
+      success: function success(res) {
+        console.log(res.data);
+        this.realname = res.data;
+
+        if (this.realname == '') {
+          uni.navigateTo({
+            url: '/pages/login/login' });
+
+
+          console.log("未找到用户，请登录");
+        }
+      } });
+
+
+
+
+
     uni.$on('flush', function () {
       _this.list(e);
     });

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/parameterSetting/parameterSetting.js

@@ -412,6 +412,7 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 var _default =
 {
   data: function data() {var _formData;

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/parameterSetting/parameterSetting.wxss

@@ -1,4 +1,21 @@
 
+.button {
+	width: 208rpx;
+	height: 98rpx;
+	margin-top: 20rpx;
+	background-color: #007AFF;
+	color: white;
+	font-size: unset;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.Green_button {
+	background-color: green;
+}
+.Red_button {
+	background-color: crimson;
+}
 .anniu {
 	width: 116rpx;
 	height: 116rpx;
@@ -97,17 +114,6 @@
 	margin-top: 5rpx;
 	justify-content: center;
 }
-.button {
-	width: 208rpx;
-	height: 98rpx;
-	margin-top: 20rpx;
-	background-color: #007AFF;
-	color: white;
-	font-size: unset;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
 .item {
 	margin-left: 20rpx;
 }

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/runningState/runningState.js

@@ -266,6 +266,10 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
 var _default =
 {
   data: function data() {

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/pages/runningState/runningState.wxss

@@ -5,13 +5,17 @@
 	float: right;
 	margin-right: 10rpx;
 }
-.button {
-	background-color: #E12A1F;
+.Green_button {
+	background-color: mediumspringgreen;
 	color: white;
 	width: 654rpx;
 	margin-left: 48rpx;
 	margin-top: 44rpx;
 }
+.Red_button {
+	background-color: crimson;
+	color: white;
+}
 .name1 {
 	color: #848586;
 	font-size: 24rpx;
@@ -139,7 +143,7 @@
 	font-size: 20rpx;
 	color: #444546;
 }
-.KGJ_button{
+.KGJ_button {
 	background-color: #00ff99;
 }
 .xiaButton {

sources/client/vrv-moblie/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -9,8 +9,22 @@
             "list": [
                 {
                     "name": "",
-                    "pathName": "pages/device/deviceInfo/deviceInfo",
-                    "query": "code=2d7b1ddcdb3d4567a85ea85de677c67b",
+                    "pathName": "pages/login/login",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/runningState/runningState",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/parameterSetting/parameterSetting",
+                    "query": "",
                     "launchMode": "default",
                     "scene": null
                 },

sources/client/vrv-platform/src/views/gateway/list.vue

@@ -142,7 +142,7 @@
 
 <script>
 
-import areas from "../../util/area.json";
+// import areas from "../../util/area.json";
 
 export default {
   name: 'project',

sources/client/vrv-platform/src/views/paramSetting/paramSetting.vue

@@ -26,15 +26,16 @@
           </div>
         </div>
 
-        <div style="display: flex;flex-direction: column;margin-left: 600px">
+        <div class="BUT">
           <div>
             控制选择模式：
             <el-button
-                @click="JZXZ"
-                class="button"
                 type="primary"
+                @click="JZXZ"
                 size="small"
-                :class="{'Active_button' :formData.JZ_XZ == 1}">
+                class="Blue_button"
+                :class="{'Green_button' :formData.JZ_XZ == 1}"
+            >
 
               {{ formData.JZ_XZ == 0 ? "CK1" : "CK2" }}
             </el-button>
@@ -44,11 +45,12 @@
             控制模式复位：
             <el-button
                 @click="MSXZ"
-                class="button"
+                class="Blue_button"
+                :class="{'Green_button' :formData.MS_XZ == 1}"
                 type="primary"
                 size="small"
-                :class="{'Active_button' :formData.MS_XZ == 1}">
-              复位
+            >
+              {{ formData.MS_XZ == 0 ? "主用" : "备用" }}
             </el-button>
           </div>
 
@@ -56,10 +58,10 @@
             故障复位：
             <el-button
                 @click="GZFW"
-                class="button"
+                class="Blue_button"
                 type="primary"
                 size="small"
-                :class="{'Active_button' :formData.GZ_FW == 1}">
+                :class="{'Red_button' :formData.GZ_FW == 1}">
               {{ formData.GZ_FW == 0 ? "关闭" : "打开" }}
             </el-button>
           </div>
@@ -68,8 +70,7 @@
 
       </div>
 
-      <div style="padding: 0px;border: 1px solid #545c64;margin-top: 16px">
-
+      <div class="All">
         <div>
           <div class="head">
             <span>设备名称</span>
@@ -77,98 +78,106 @@
             <span>手动命令</span>
             <span>实时反馈</span>
           </div>
+
           <div class="item">
             <span>空调送风机</span>
-            <el-button size="small" @click="shouZiDongSFJ" :class="{'Active_button' :formData.SFJ_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongSFJ" class="Blue_button"
+                       :class="{'Green_button' :formData.SFJ_SZXZ == 1}"
+            >
               {{ formData.SFJ_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongSFJSD" :class="{'Active_button' :formData.SFJ_SDQD == 1}"
+            <el-button size="small" @click="shouZiDongSFJSD" class="Blue_button"
+                       :class="{'Red_button' :formData.SFJ_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.SFJ_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.SFJ_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
             <span style="margin-right: 14px">{{ formData.SFJ_QT == 0 ? "停止" : "启动" }}</span>
           </div>
 
           <div class="item">
             <span>空调排风机</span>
-            <el-button size="small" @click="shouZiDongPFJ" :class="{'Active_button' :formData.PFJ_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongPFJ" class="Blue_button"
+                       :class="{'Green_button' :formData.PFJ_SZXZ == 1}">
               {{ formData.PFJ_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongPFJSD" :class="{'Active_button' :formData.PFJ_SDQD == 1}"
+            <el-button size="small" @click="shouZiDongPFJSD" class="Blue_button"
+                       :class="{'Red_button' :formData.PFJ_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.PFJ_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.PFJ_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
             <span style="margin-right: 14px">{{ formData.PFJ_QT == 0 ? "停止" : "启动" }}</span>
           </div>
 
           <div class="item">
             <span>风 冷 主 机</span>
-            <el-button size="small" @click="shouZiDongFLZJ" :class="{'Active_button' :formData.FLZJ_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongFLZJ" :class="{'Green_button' :formData.FLZJ_SZXZ == 1}">
               {{ formData.FLZJ_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongFLZJSD" :class="{'Active_button' :formData.FLZJ_SDQD == 1}"
+            <el-button size="small" @click="shouZiDongFLZJSD" :class="{'Red_button' :formData.FLZJ_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.FLZJ_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.FLZJ_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
             <span style="margin-right: 14px">{{ formData.FLZJ_QT == 0 ? "停止" : "启动" }}</span>
           </div>
 
           <div class="item">
             <span>一级电加热</span>
-            <el-button size="small" @click="shouZiDongYJDJRSS" :class="{'Active_button' :formData.YJDJR_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongYJDJRSS" :class="{'Green_button' :formData.YJDJR_SZXZ == 1}">
               {{ formData.YJDJR_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongYJDJRSDSS" :class="{'Active_button' :formData.YJDJR_SDQD == 1}"
+            <el-button size="small" @click="shouZiDongYJDJRSDSS" :class="{'Red_button' :formData.YJDJR_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.YJDJR_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.YJDJR_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
             <span style="margin-right: 14px">{{ formData.YJDJR_QT == 0 ? "停止" : "启动" }}</span>
           </div>
 
           <div class="item">
             <span>二级电加热</span>
-            <el-button size="small" @click="shouZiDongEJDJRSS" :class="{'Active_button' :formData.EJDJR_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongEJDJRSS" :class="{'Green_button' :formData.EJDJR_SZXZ == 1}">
               {{ formData.EJDJR_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongEJDJRSDSS" :class="{'Active_button' :formData.EJDJR_SDQD == 1}"
+            <el-button size="small" @click="shouZiDongEJDJRSDSS" :class="{'Red_button' :formData.EJDJR_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.EJDJR_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.EJDJR_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
             <span style="margin-right: 14px">{{ formData.EJDJR_QT == 0 ? "停止" : "启动" }}</span>
           </div>
 
           <div class="item">
             <span>三级电加热</span>
-            <el-button size="small" @click="shouZiDongSJDJRSS" :class="{'Active_button' :formData.SJDJR_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongSJDJRSS" :class="{'Green_button' :formData.SJDJR_SZXZ == 1}">
               {{ formData.SJDJR_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongSJDJRSDSS" :class="{'Active_button' :formData.SJDJR_SDQD == 1}"
+            <el-button size="small" @click="shouZiDongSJDJRSDSS" :class="{'Red_button' :formData.SJDJR_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.SJDJR_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.SJDJR_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
             <span style="margin-right: 14px">{{ formData.SJDJR_QT == 0 ? "停止" : "启动" }}</span>
           </div>
 
           <div class="item">
             <span>空调送风阀</span>
-            <el-button size="small" @click="shouZiDongSFF" :class="{'Active_button' :formData.SFF_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongSFF" :class="{'Green_button' :formData.SFF_SZXZ == 1}">
               {{ formData.SFF_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongSFFSD" :class="{'Active_button' :formData.SFF_SDQD == 1}"
+
+            <el-button size="small" @click="shouZiDongSFFSD" :class="{'Red_button' :formData.SFF_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.SFF_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.SFF_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
+
             <span style="margin-right: 14px">{{ formData.SFF_KGKZ == 0 ? "关闭" : "打开" }}</span>
           </div>
 
           <div class="item">
             <span>空调排风阀</span>
-            <el-button size="small" @click="shouZiDongPFF" :class="{'Active_button' :formData.PFF_SZXZ == 1}">
+            <el-button size="small" @click="shouZiDongPFF" :class="{'Green_button' :formData.PFF_SZXZ == 1}">
               {{ formData.PFF_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="shouZiDongPFFSD" :class="{'Active_button' :formData.PFF_SDQD == 1}"
+            <el-button size="small" @click="shouZiDongPFFSD" :class="{'Red_button' :formData.PFF_SDQD == 0}"
                        style="margin-right: 30px">
-              {{ formData.PFF_SDQD == 0 ? '启动' : '停止' }}
+              {{ formData.PFF_SDQD == 1 ? '启动' : '停止' }}
             </el-button>
             <span style="margin-right: 14px">{{ formData.PFF_KGKZ == 0 ? "关闭" : "打开" }}</span>
           </div>
@@ -176,7 +185,7 @@
           <div class="item">
             <span>空调冷水阀</span>
             <el-button style="margin-left: 26px" size="small" @click="shouZiDongLSF"
-                       :class="{'Active_button' :formData.LSF_SZXZ == 1}">
+                       :class="{'Green_button' :formData.LSF_SZXZ == 1}">
               {{ formData.LSF_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
             <el-button size="small" @click="dialogA"
@@ -189,7 +198,7 @@
           <div class="item">
             <span>空调热水阀</span>
             <el-button style="margin-left: 26px" size="small" @click="shouZiDongRSF"
-                       :class="{'Active_button' :formData.RSF_SZXZ == 1}">
+                       :class="{'Green_button' :formData.RSF_SZXZ == 1}">
               {{ formData.RSF_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
             <el-button size="small" @click="dialogB"
@@ -201,10 +210,11 @@
 
           <div class="item" style="border-bottom: 0px">
             <span>空调加湿器</span>
-            <el-button style="margin-left: 26px" size="small" @click="shouZiDongJSF">
+            <el-button style="margin-left: 26px" size="small" @click="shouZiDongJSF"
+                       :class="{'Green_button' :formData.JSF_SZXZ == 1}">
               {{ formData.JSF_SZXZ == 0 ? '自动' : '手动' }}
             </el-button>
-            <el-button size="small" @click="dialogC" :class="{'Active_button' :formData.JSF_SDKD == 1}"
+            <el-button size="small" @click="dialogC"
                        style="margin-right: 30px">
               {{ formData.JSF_SDKD }} %
             </el-button>
@@ -393,51 +403,51 @@ export default {
       dialogFormVisibleC: false,
 
       formData: {
-        GZ_FW: '0',
-        JZ_XZ: '0',
-        MS_XZ: '0',
+        GZ_FW: '',
+        JZ_XZ: '',
+        MS_XZ: '',
 
         RSF: '',
         LSF: '',
         JSF: '',
-        WD_SD: '12',
-        SD_SD: '1',
-        JZ_YSTZ: '12',
+        WD_SD: '',
+        SD_SD: '',
+        JZ_YSTZ: '',
         RSF_SDKD: '', //热水温度手动_设定(0~100,单位为%)
         LSF_SDKD: '', //冷水温度手动_设定(0~100,单位为%)
         JSF_SDKD: '', //电加湿手动_设定(0~100,单位为%)
 
-        LSF_SZXZ: '0',
-        RSF_SZXZ: '0',
-        JSF_SZXZ: '0',
+        LSF_SZXZ: '',
+        RSF_SZXZ: '',
+        JSF_SZXZ: '',
 
         //下部按钮参数
-        SFF_SZXZ: '0',
-        SFF_SDQD: '0',
-        PFF_SZXZ: '0',
-        PFF_SDQD: '0',
-        SFJ_SZXZ: '0',
-        SFJ_SDQD: '0',
-        PFJ_SZXZ: '0',
-        PFJ_SDQD: '0',
-        FLZJ_SZXZ: '0',
-        FLZJ_SDQD: '0',
-        YJDJR_SZXZ: '0',
-        YJDJR_SDQD: '0',
-        EJDJR_SZXZ: '0',
-        EJDJR_SDQD: '0',
-        SJDJR_SZXZ: '0',
-        SJDJR_SDQD: '0',
+        SFF_SZXZ: '',
+        SFF_SDQD: '',
+        PFF_SZXZ: '',
+        PFF_SDQD: '',
+        SFJ_SZXZ: '',
+        SFJ_SDQD: '',
+        PFJ_SZXZ: '',
+        PFJ_SDQD: '',
+        FLZJ_SZXZ: '',
+        FLZJ_SDQD: '',
+        YJDJR_SZXZ: '',
+        YJDJR_SDQD: '',
+        EJDJR_SZXZ: '',
+        EJDJR_SDQD: '',
+        SJDJR_SZXZ: '',
+        SJDJR_SDQD: '',
 
         //第四列实时反馈
-        SFJ_QT: '1', //送风机工频启动(0:停止,1:启动)
-        PFJ_QT: '0', //排风机工频启动(0:停止,1:启动)
-        YJDJR_QT: '0', //一级电加热启停(0:停止,1:启动)
-        EJDJR_QT: '0', //二级电加热启停(0:停止,1:启动)
-        SJDJR_QT: '0', //三级电加热启停(0:停止,1:启动)
-        SFF_KGKZ: '0', //送风阀开关控制(0:关闭,1:打开)
-        PFF_KGKZ: '0', //排风阀开关控制(0:关闭,1:打开)
-        FLZJ_QT: '0', //风冷主机启停(0:停止,1:启动)
+        SFJ_QT: '', //送风机工频启动(:停止,1:启动)
+        PFJ_QT: '', //排风机工频启动(:停止,1:启动)
+        YJDJR_QT: '', //一级电加热启停(:停止,1:启动)
+        EJDJR_QT: '', //二级电加热启停(:停止,1:启动)
+        SJDJR_QT: '', //三级电加热启停(:停止,1:启动)
+        SFF_KGKZ: '', //送风阀开关控制(:关闭,1:打开)
+        PFF_KGKZ: '', //排风阀开关控制(:关闭,1:打开)
+        FLZJ_QT: '', //风冷主机启停(0:停止,1:启动)
 
         //上部三个按钮
       },
@@ -829,7 +839,7 @@ export default {
           id: '290'
         }
       }).then((res) => {
-        this.formData.SFF_KGKZ = res.data.data.deviceParam.value;
+        this.formData.SFF_SZXZ = res.data.data.deviceParam.value;
       })
     },
     getShouZiDongSFFSD() {
@@ -1343,6 +1353,33 @@ export default {
 </script>
 
 <style scoped>
+.All {
+  padding: 0px;
+  border: 1px solid #545c64;
+  margin-top: 16px
+}
+
+.BUT {
+  display: flex;
+  flex-direction: column;
+  margin-left: 600px
+}
+
+
+.Blue_button {
+  background-color: #007AFF;
+  color: white;
+  border: 0px
+}
+
+.Green_button {
+  background-color: green !important;
+}
+
+.Red_button {
+  background-color: crimson !important;
+}
+
 .head {
   font-weight: 500;
   align-items: center;

sources/client/vrv-platform/src/views/runningState/runningState.vue

@@ -30,7 +30,7 @@
               <template>
                 <el-button type="danger" size="mini" @click="stopAndStart"
                            class="Moren_button"
-                           :class="{'KGJ_button' :setTableData[0].JZ_KGJ == 1}">开关按钮
+                           :class="{'KGJ_button' :setTableData[0].JZ_KGJ == 0}">开关按钮
                 </el-button>
               </template>
             </el-table-column>
@@ -48,28 +48,28 @@
               <template>
                 <el-button
                     class="Moren_button"
-                    :class="{'KGJ_button' :stateTable[0].YJDJR_QT == 1}"
+                    :class="{'KGJ_button' :stateTable[0].YJDJR_QT == 0}"
                     type="primary"
                     size="small">
                   一
                 </el-button>
                 <el-button
                     class="Moren_button"
-                    :class="{'KGJ_button' :stateTable[0].EJDJR_QT == 1}"
+                    :class="{'KGJ_button' :stateTable[0].EJDJR_QT == 0}"
                     type="primary"
                     size="small">
                   二
                 </el-button>
                 <el-button
                     class="Moren_button"
-                    :class="{'KGJ_button' :stateTable[0].SJDJR_QT == 1}"
+                    :class="{'KGJ_button' :stateTable[0].SJDJR_QT == 0}"
                     type="primary"
                     size="small">
                   三
                 </el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="jsq" label="加湿器"></el-table-column>
+            <el-table-column prop="JSF" label="加湿器"></el-table-column>
             <el-table-column prop="cxlw" label="初效滤网">
               <template>
                 <el-button
@@ -157,7 +157,7 @@ export default {
         SD_SD: '',
         HSL_SD: '',
         JZ_YSTZ: '',
-        JZ_KGJ: '0', //设备开关机(0:停止,1:启动)
+        JZ_KGJ: '', //设备开关机(0:停止,1:启动)
       }],
 
       stateTable: [{
@@ -165,10 +165,10 @@ export default {
         LSF: '',
         JSF: '',
 
-        GW_BJ: '0', //高温报警(0:正常,1:报警)
-        QFYC_BJ: '1', //缺风压差(0:正常,1:报警)
-        LWDS_CX: '0', //初效故障报警(0:正常,1:故障)
-        LWDS_ZX: '1', //中效故障报警(0:正常,1:故障)
+        GW_BJ: '', //高温报警(0:正常,1:报警)
+        QFYC_BJ: '', //缺风压差(0:正常,1:报警)
+        LWDS_CX: '', //初效故障报警(0:正常,1:故障)
+        LWDS_ZX: '', //中效故障报警(0:正常,1:故障)
 
         YJDJR_QT: '', //一级电加热启停(0:停止,1:启动)
         EJDJR_QT: '', //二级电加热启停(0:停止,1:启动)

sources/client/vrv-platform/src/views/systemParam/systemParam.vue

@@ -51,7 +51,7 @@
           </el-form>
 
           <div>
-            <el-button type="primary" class="button" :class="{'Active_button' :formData.HF_CC == 1}"
+            <el-button type="primary" class="button" :class="{'Active_button' :formData.HF_CC == 0}"
                        @click="updateHFCC">恢复出厂设置
             </el-button>
           </div>

sources/server/vrv/run/application.pid

@@ -1 +1 @@
-9420
+14968

sources/server/vrv/vrv-platform/Dockerfile

@@ -0,0 +1,9 @@
+FROM openjdk:8
+WORKDIR /usr/share/app
+ENTRYPOINT ["java", "-jar", "/usr/share/app/lib/app.jar","--spring.config.location=/usr/share/app/conf/"]
+
+ADD ./target/*-SNAPSHOT.jar /usr/share/app/lib/app.jar
+ADD ./src/main/resources /usr/share/app/conf
+ADD ./static/ /usr/share/app/static/
+
+