1.1 未关联盒子

src/views/equip-management/online-box/index.vue

@@ -1,75 +1,75 @@
 <template>
 	<div class="box-management-container">
-		<div class="title">盒子管理</div>
+		<div class="title">为关联盒子</div>
 		<div class="bottom">
 			<!-- 搜索start -->
-			<div class="search-tab">
-				<el-form class="search-form">
-					<el-form-item
-						class="form-item"
-						label="盒子ID"
-						label-width="80px"
-					>
-						<el-input v-model="BoxMac"></el-input>
-					</el-form-item>
+<!--			<div class="search-tab">-->
+<!--				<el-form class="search-form">-->
 <!--					<el-form-item-->
 <!--						class="form-item"-->
-<!--						label="所属项目"-->
-<!--						label="所属项目"-->
+<!--						label="盒子ID"-->
 <!--						label-width="80px"-->
 <!--					>-->
+<!--						<el-input v-model="BoxMac"></el-input>-->
+<!--					</el-form-item>-->
+<!--&lt;!&ndash;					<el-form-item&ndash;&gt;-->
+<!--&lt;!&ndash;						class="form-item"&ndash;&gt;-->
+<!--&lt;!&ndash;						label="所属项目"&ndash;&gt;-->
+<!--&lt;!&ndash;						label="所属项目"&ndash;&gt;-->
+<!--&lt;!&ndash;						label-width="80px"&ndash;&gt;-->
+<!--&lt;!&ndash;					>&ndash;&gt;-->
+<!--&lt;!&ndash;						<el-select&ndash;&gt;-->
+<!--&lt;!&ndash;							v-model="searchProject"&ndash;&gt;-->
+<!--&lt;!&ndash;							placeholder="请选择"&ndash;&gt;-->
+<!--&lt;!&ndash;						>&ndash;&gt;-->
+<!--&lt;!&ndash;							<el-option&ndash;&gt;-->
+<!--&lt;!&ndash;								v-for="item in pojectListOption"&ndash;&gt;-->
+<!--&lt;!&ndash;								:label="item.label"&ndash;&gt;-->
+<!--&lt;!&ndash;								:value="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;								:key="item.value"&ndash;&gt;-->
+<!--&lt;!&ndash;							></el-option>&ndash;&gt;-->
+<!--&lt;!&ndash;						</el-select>&ndash;&gt;-->
+<!--&lt;!&ndash;					</el-form-item>&ndash;&gt;-->
+<!--					<el-form-item-->
+<!--						class="form-item"-->
+<!--						label="运营商"-->
+<!--						label-width="80px"-->
+<!--						v-if="modeShow === 'all' && operatorListOption.length > 1"-->
+<!--					>-->
 <!--						<el-select-->
-<!--							v-model="searchProject"-->
+<!--							v-model="searchOperate"-->
 <!--							placeholder="请选择"-->
 <!--						>-->
 <!--							<el-option-->
-<!--								v-for="item in pojectListOption"-->
-<!--								:label="item.label"-->
-<!--								:value="item.value"-->
-<!--								:key="item.value"-->
+<!--								v-for="(item, index) in operatorListOption"-->
+<!--								:label="item.name"-->
+<!--								:value="item.btk_operator_auto_id"-->
+<!--								:key="+new Date() + index"-->
 <!--							></el-option>-->
 <!--						</el-select>-->
 <!--					</el-form-item>-->
-					<el-form-item
-						class="form-item"
-						label="运营商"
-						label-width="80px"
-						v-if="modeShow === 'all' && operatorListOption.length > 1"
-					>
-						<el-select
-							v-model="searchOperate"
-							placeholder="请选择"
-						>
-							<el-option
-								v-for="(item, index) in operatorListOption"
-								:label="item.name"
-								:value="item.btk_operator_auto_id"
-								:key="+new Date() + index"
-							></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item>
-						<el-button
-							type="primary"
-							class="search-btn"
-							@click="filterBoxListFnc()"
-						>搜 索</el-button>
-					</el-form-item>
-				</el-form>
-<!--				<el-button-->
-<!--					type="primary"-->
-<!--					circle-->
-<!--					class="el-icon-refresh-right refresh-button"-->
-<!--					@click="refreshList()"-->
-<!--				></el-button>-->
+<!--					<el-form-item>-->
+<!--						<el-button-->
+<!--							type="primary"-->
+<!--							class="search-btn"-->
+<!--							@click="filterBoxListFnc()"-->
+<!--						>搜 索</el-button>-->
+<!--					</el-form-item>-->
+<!--				</el-form>-->
+<!--&lt;!&ndash;				<el-button&ndash;&gt;-->
+<!--&lt;!&ndash;					type="primary"&ndash;&gt;-->
+<!--&lt;!&ndash;					circle&ndash;&gt;-->
+<!--&lt;!&ndash;					class="el-icon-refresh-right refresh-button"&ndash;&gt;-->
+<!--&lt;!&ndash;					@click="refreshList()"&ndash;&gt;-->
+<!--&lt;!&ndash;				></el-button>&ndash;&gt;-->
 
-<!--				<el-button-->
-<!--					type="danger"-->
-<!--					class="add-new-button"-->
-<!--					@click="addBoxFnc()"-->
-<!--					v-if="modeShow === 'all'"-->
-<!--				>新 建</el-button>-->
-			</div>
+<!--&lt;!&ndash;				<el-button&ndash;&gt;-->
+<!--&lt;!&ndash;					type="danger"&ndash;&gt;-->
+<!--&lt;!&ndash;					class="add-new-button"&ndash;&gt;-->
+<!--&lt;!&ndash;					@click="addBoxFnc()"&ndash;&gt;-->
+<!--&lt;!&ndash;					v-if="modeShow === 'all'"&ndash;&gt;-->
+<!--&lt;!&ndash;				>新 建</el-button>&ndash;&gt;-->
+<!--			</div>-->
 			<!-- 搜索end -->
 			<!-- 列表start -->
 			<el-table

src/views/inner-management/gateway/index.vue

@@ -206,6 +206,7 @@
                         <div class="label">升级时间</div>
                         <div>
                             <el-date-picker
+                                    value-format=" yyyy-MM-dd HH:mm:ss"
                                     v-model="batch_update_time"
                                     type="datetime"
                                     placeholder="选择日期时间">
@@ -457,7 +458,7 @@
                 else if (val === 'now'){
                     this.formData.select_time = 'now'
                 }
-
+                console.log('this.formData.select_time is:',this.formData.select_time )
                 this.formData.name = this.name;
                 this.formData.version = this.version;
                 this.formData.gateway_version = this.download_url;

src/views/inner-management/version-update/index.vue

@@ -196,7 +196,7 @@
                         align="center"
                 ></el-table-column>
                 <el-table-column
-                        label="网关版本"
+                        label="目标版本"
                         prop="ToGatewayVersion"
                         align="center"
                 ></el-table-column>

src/views/oa-management/consumble-watch/index.vue

@@ -111,7 +111,18 @@
 					align="center"
           sortable
 					:show-overflow-tooltip="true"
-				></el-table-column>
+				>
+					<template slot-scope="scope">
+
+					<span>
+{{scope.row.name}}{{scope.row.newtrend_order}}
+					</span>
+
+
+					</template>
+
+				</el-table-column>
+
 
 				<el-table-column
 					label="项目名称"
@@ -128,7 +139,7 @@
           sortable
 					:show-overflow-tooltip="true"
 				></el-table-column>
-				<el-table-column label="设备单机" prop="newtrend_order"></el-table-column>
+<!--				<el-table-column label="设备单机" prop="newtrend_order"></el-table-column>-->
 				<el-table-column
 					label="使用率"
 					prop="utilization_rate"
@@ -332,6 +343,8 @@ import OperateConsumble from "./operate-consumble";
 import DeleteIcon from "@/assets/consumable/Delete.png";
 import EditIcon from "@/assets/consumable/edit-button.png";
 import RefreshIcon from "@/assets/consumable/refresh.png";
+import {pulishRunStat} from "@/api/box-debug-mqtt";
+import {sendCtrlMessage} from "@/views/equip-management/box-debug-rebuild/public-method";
 export default {
 	components: {
 		OperateConsumble
@@ -519,21 +532,33 @@ export default {
 				type: "warning"
 			}).then(async () => {
 				//下发mqtt，value=0给盒子
-
-				const res = await resetConsumable({
-					box_id: row.box_id,
-					id: row.id,
-					order:row.newtrend_order,
-					value: "0",
-				});
+				const res = await sendCtrlMessage(
+						row.box_id,
+						row.newtrend_order,
+						"newtrend",
+						[{ key: 'consumables', value: 0 }]
+				);
 				if (res.code === 200) {
 					this.$notify({
-						message: "重置耗材使用率成功",
+						message: "恢复耗材使用率成功",
 						type: "success"
 					});
 					await this.consumablesListFunc();
-					//1.1下发mqtt给盒子 value=0
 				}
+				// const res = await resetConsumable({
+				// 	box_id: row.box_id,
+				// 	id: row.id,
+				// 	order:row.newtrend_order,
+				// 	value: "0",
+				// });
+				// if (res.code === 200) {
+				// 	this.$notify({
+				// 		message: "重置耗材使用率成功",
+				// 		type: "success"
+				// 	});
+				// 	await this.consumablesListFunc();
+				// 	//1.1下发mqtt给盒子 value=0
+				// }
 			});
 		},
 		async resumeConsumableFnc(row) {
@@ -542,22 +567,55 @@ export default {
 				cancelButtonText: "取消",
 				type: "warning"
 			}).then(async () => {
-				//下发mqtt，value=!0给盒子
-
-				const res = await resetConsumable({
-					box_id: row.box_id,
-					id: row.id,
-					order:row.newtrend_order,
-					value: "13",
-				});
+				const res = await sendCtrlMessage(
+						row.box_id,
+						row.newtrend_order,
+						"newtrend",
+						[{ key: 'consumables', value: 13 }]
+				);
 				if (res.code === 200) {
-					this.$notify({
-						message: "恢复耗材使用率成功",
-						type: "success"
-					});
-					await this.consumablesListFunc();
-					//1.1下发mqtt给盒子 value=0
+						this.$notify({
+							message: "恢复耗材使用率成功",
+							type: "success"
+						});
+						await this.consumablesListFunc();
 				}
+				//下发mqtt，value=!0给盒子
+				// 	const req = {
+				// 		box_id:row.box_id,
+				// 		content: JSON.stringify({
+				// 			order:row.newtrend_order,
+				// 			ctrl:"newtrend",
+				// 			content: [{ key: 'consumables', value: 13 }]
+				// 		}),
+				// 		client: 'vue-' + +new Date()
+				// 	}
+				// 	console.log({ box_id, order, ctrl, body })
+                //    const res = await resetConsumable({
+				// 	req
+				// });
+				// if (res.code === 200) {
+				// 	this.$notify({
+				// 		message: "恢复耗材使用率成功",
+				// 		type: "success"
+				// 	});
+				// 	await this.consumablesListFunc();
+				// 	//1.1下发mqtt给盒子 value=0
+				// }
+				// 	const res = await resetConsumable(req)({
+				// 		if (res.code === 200) {
+				// 	this.$notify({
+				// 		message: "恢复耗材使用率成功",
+				// 		type: "success"
+				// 	});
+				// 	await this.consumablesListFunc();
+				// 	//1.1下发mqtt给盒子 value=0
+				// }
+				// 	})
+
+					//return res
+
+
 			});
 		},
 		async consumablesDetail(row) {