1.1 耗材随新风设备 balabalbal

src/api/consumble.js

@@ -24,8 +24,11 @@ export async function updateConsumable(data) {
 
 //刷新耗材使用率
 export async function resetConsumable(data) {
-  return post(base + "consumables_management/reset", data);
+  return post('http://linksee-mqtt-transport.linkseeiot.com/api/publish/syncStatus', data);
 }
+//export function syncConf(data) {
+//   return post('http://linksee-mqtt-transport.linkseeiot.com/api/publish/synConf', data)
+// }
 
 //耗材详情
 export async function consumableDetail(data) {

src/views/equip-lib/equip-manager/operate-model.vue

@@ -13,7 +13,7 @@
 			<div class="label">耗材规格</div>
 			<div class="cotent">
 				<el-input
-						v-model="opreateModelForm.apparatus_specs_name"
+						v-model="opreateModelForm.specsName"
 						placeholder
 				></el-input>
 			</div>
@@ -22,7 +22,7 @@
 			<div class="label">消耗周期</div>
 			<div class="cotent">
 				<el-input
-						v-model="opreateModelForm.apparatus_consumption_cycle"
+						v-model="opreateModelForm.consumption_cycle"
 						placeholder
 				></el-input>
 			</div>
@@ -252,6 +252,8 @@ export default {
 				cbHeTempSetStep: 0,
                 cbCoEquipCtrl: 0,
 				cbHeEquipCtrl: 0,
+				specsName:"",
+				consumption_cycle:0,
 			},
 			supportAssistOptions: [
 				{
@@ -293,6 +295,8 @@ export default {
 							cbHeTempSetStep: 0,
 							cbCoEquipCtrl: 0,
 							cbHeEquipCtrl: 0,
+							specsName:"",
+							consumption_cycle:0,
 						};
 					} else {
 						this.opreateModelForm = {
@@ -308,6 +312,8 @@ export default {
 							cbHeTempSetStep: 0,
 							cbCoEquipCtrl: 0,
 							cbHeEquipCtrl: 0,
+							specsName:"",
+							consumption_cycle:0,
 						};
 					}
 				}
@@ -332,6 +338,9 @@ export default {
 						cbHeTempSetStep: n.cbHeTempSetStep || 0,
 						cbCoEquipCtrl: n.cbCoEquipCtrl || 0,
 						cbHeEquipCtrl: n.cbHeEquipCtrl || 0,
+						specsName: n.specsName || "",
+						consumption_cycle: n.consumption_cycle || 0,
+
 					};
 				}
 			},
@@ -359,7 +368,8 @@ export default {
 					cbHeTempSetStep,
 					cbCoEquipCtrl,
 					cbHeEquipCtrl,
-
+					specsName,
+					consumption_cycle,
 				} = this.opreateModelForm;
 				const res = await createApparatusModel({
 					cbAddrOffset,
@@ -375,6 +385,8 @@ export default {
 					cbHeTempSetStep,
 					cbCoEquipCtrl,
 					cbHeEquipCtrl,
+					specsName,
+					consumption_cycle,
 				});
 				if (res.code === 200) {
 					this.$message({
@@ -403,6 +415,8 @@ export default {
 					cbHeTempSetStep,
 					cbCoEquipCtrl,
 					cbHeEquipCtrl,
+					specsName,
+					consumption_cycle,
 				} = this.opreateModelForm;
 				const res = await editApparatusModel({
 					cbAddrOffset,
@@ -419,10 +433,12 @@ export default {
 					cbHeTempSetStep,
 					cbCoEquipCtrl,
 					cbHeEquipCtrl,
+					specsName,
+					consumption_cycle,
 				});
 				if (res.code === 200) {
 					this.$message({
-						message: "新增设备型号成功",
+						message: "操作成功",
 						type: "success"
 					});
 				} else {

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

@@ -234,12 +234,12 @@
             	size="mini"
             	@click="showEditConsumbleDialog(scope.row)"
             >编辑</el-button>
-<!--						<el-button-->
-<!--								type="text"-->
-<!--								style="color: #FF4949;"-->
-<!--								size="mini"-->
-<!--								@click="resumeConsumableFnc(scope.row)"-->
-<!--						>恢复</el-button>-->
+						<el-button
+								type="text"
+								style="color: #FF4949;"
+								size="mini"
+								@click="resumeConsumableFnc(scope.row)"
+						>恢复</el-button>
             <el-button
             	type="text"
               style="color: #FF4949;"
@@ -521,9 +521,10 @@ export default {
 				//下发mqtt，value=0给盒子
 
 				const res = await resetConsumable({
-					box_auto_id: row.box_auto_id,
+					box_id: row.box_id,
 					id: row.id,
-					newtrend_order:row.newtrend_order,
+					order:row.newtrend_order,
+					value: "0",
 				});
 				if (res.code === 200) {
 					this.$notify({
@@ -543,19 +544,20 @@ export default {
 			}).then(async () => {
 				//下发mqtt，value=!0给盒子
 
-				// const res = await resetConsumable({
-				// 	box_auto_id: row.box_auto_id,
-				// 	id: row.id,
-				// 	newtrend_order:row.newtrend_order,
-				// });
-				// if (res.code === 200) {
-				// 	this.$notify({
-				// 		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: "13",
+				});
+				if (res.code === 200) {
+					this.$notify({
+						message: "恢复耗材使用率成功",
+						type: "success"
+					});
+					await this.consumablesListFunc();
+					//1.1下发mqtt给盒子 value=0
+				}
 			});
 		},
 		async consumablesDetail(row) {