zc

src/views/iotDevice/appManage/applyUpgradesQuest/index.vue

@@ -5,11 +5,11 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="" prop="appName">
+          <el-form-item label="" prop="deviceCode">
             <el-input
               maxLength="30"
-              v-model="queryParams.appName"
-              placeholder="app名称"
+              v-model="queryParams.deviceCode"
+              placeholder="设备码"
               style="width: 200px"
             />
           </el-form-item>
@@ -29,14 +29,6 @@
               style="width: 200px"
             />
           </el-form-item>
-          <el-form-item label="" prop="deviceName">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.deviceName"
-              placeholder="设备名称"
-              style="width: 200px"
-            />
-          </el-form-item>
           <el-form-item label="" prop="status">
             <el-select v-model="queryParams.status" placeholder="任务状态" clearable style="width:200px;">
               <el-option
@@ -69,7 +61,7 @@
           <el-table-column label="包名" prop="startLaunchPackage" width="120" show-overflow-tooltip/>
           <el-table-column label="状态" prop="status" width="90" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.status=='failed'?'失败':(scope.row.status=='downloaded'?'下载成功':(scope.row.status=='success'?'升级成功':''))}}
+              {{scope.row.status=='failed'?'失败':(scope.row.status=='downloaded'?'下载成功':(scope.row.status=='success'?'升级成功':(scope.row.status=='pending'?'待执行':'')))}}
             </template>
           </el-table-column>
           <el-table-column label="开始时间" prop="startTime" width="150" show-overflow-tooltip>
@@ -117,11 +109,10 @@
           page:1,
           pageSize:20,
           status:"",
-          appName :"",
+          deviceCode :"",
           batchNumber :"",
           appVersion :"",
           terminalType :"",
-          deviceName :"",
         },
         //列表数据
         dataList:[],
@@ -148,11 +139,10 @@
           page:1,
           pageSize:20,
           status:"",
-          appName :"",
+          deviceCode :"",
           batchNumber :"",
           appVersion :"",
           terminalType :"",
-          deviceName :"",
         });
         this.getList();
       },