1.1 耗材随新风设备 balabalbal

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

@@ -9,6 +9,24 @@
 				></el-input>
 			</div>
 		</div>
+		<div class="form-item">
+			<div class="label">耗材规格</div>
+			<div class="cotent">
+				<el-input
+						v-model="opreateModelForm.apparatus_specs_name"
+						placeholder
+				></el-input>
+			</div>
+		</div>
+		<div class="form-item">
+			<div class="label">消耗周期</div>
+			<div class="cotent">
+				<el-input
+						v-model="opreateModelForm.apparatus_consumption_cycle"
+						placeholder
+				></el-input>
+			</div>
+		</div>
 
 		<div
 			class="form-item"

src/views/equip-lib/equip-manager/opreate-pannel.vue

@@ -166,7 +166,7 @@
     </el-dialog>
 
     <el-dialog
-      title="编辑设备型号"
+      title="编辑设备型号1"
       :visible.sync="editModelDialog"
       width="35%"
       top="20vh"

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

@@ -173,7 +173,7 @@
 <!--                    >立即升级</el-button>-->
 <!--                </div>-->
             </div>
-            <el-table :data="updateRecordList">
+            <el-table :data="updateList">
                 <el-table-column label="序号" width="60" align="center">
                     <template slot-scope="scope">
                         {{scope.$index+1}}
@@ -292,11 +292,11 @@
                 show:false,
                 download_url:'',
                 firmware_download_url:'',
-                updateRecordList:[{
-                    box_id:'xx:xx:xx:xx:xx:xx',
-                    ToGatewayVersion:'1.11',
-                    update_result:'成功',
-                    box_name:'namexx'
+                updateList:[{
+                    // box_id:'xx:xx:xx:xx:xx:xx',
+                    // ToGatewayVersion:'1.11',
+                    // update_result:'成功',
+                    // box_name:'namexx'
                 }],
                 randomKey: Math.random(),
                 currentRow:{},
@@ -389,7 +389,7 @@
                 });
 
                 if (res.code === 200) {
-                    this.updateBoxList = res.result.data
+                    this.updateList = res.result.data
                     console.log('res.code === 200')
                 } else {
                     this.$notify({
@@ -398,12 +398,12 @@
                     });
                 }
 
-                setTimeout(() => {
-                    console.log('500ms后执行的方法');
-                    var car = { box_id : '222'}
-                    this.updateBoxList.push(car)
-                    console.log('res is:', res.result.data)
-                }, 500);
+                // setTimeout(() => {
+                //     console.log('500ms后执行的方法');
+                //     var car = { box_id : '222'}
+                //     this.updateList.push(car)
+                //     console.log('res is:', res.result.data)
+                // }, 500);
 
             },
             deleteRowButton(row) {
@@ -425,7 +425,7 @@
                 });
             },
             removeRowButton(row) {
-                this.$confirm("确定删除吗", "提示", {
+                this.$confirm("确定删除吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "warning"
@@ -433,7 +433,7 @@
                     console.log('///////remove from task',row)
                     const res = await versionUpdateRemove({
                         task_id: row.task_id,
-                        btk_gateway_version_auto_id: row.btk_gateway_version_auto_id,
+                        btk_gateway_version_auto_id: row.BtkGatewayVersionAutoID,
                     });
                     if (res.code === 200) {
                         this.$notify({
@@ -443,11 +443,11 @@
 
 
                         const res = await updateBoxList({
-                            task_id: row.task_id,
+                            task_id: this.currentRow.task_id,
                         });
 
                         if (res.code === 200) {
-                            this.updateBoxList = res.result.data
+                            this.updateList = res.result.data
                             console.log('res.code === 200')
                         } else {
                             this.$notify({
@@ -456,12 +456,12 @@
                             });
                         }
 
-                        setTimeout(() => {
-                            console.log('500ms后执行的方法');
-                            var car = { box_id : '222'}
-                            this.updateBoxList.push(car)
-                            console.log('res is:', res.result.data)
-                        }, 500);
+                        // setTimeout(() => {
+                        //     console.log('500ms后执行的方法');
+                        //     var car = { box_id : '222'}
+                        //     this.updateList.push(car)
+                        //     console.log('res is:', res.result.data)
+                        // }, 500);
                     }
                 });
             },