zc

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

@@ -94,15 +94,6 @@
                          :value="item.appId"/>
             </el-select>
           </el-form-item>
-          <!--<el-form-item label="app包名" prop="package" label-width="90px">-->
-            <!--<el-input-->
-              <!--disabled-->
-              <!--v-model="dialogForm.package"-->
-              <!--maxLength="20"-->
-              <!--placeholder="请上传APK"-->
-              <!--style="width: 360px"-->
-            <!--/>-->
-          <!--</el-form-item>-->
           <el-form-item label="版本号" prop="versionCode" label-width="90px">
             <el-input
               disabled

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

@@ -46,7 +46,8 @@
           <el-table-column label="app名称" align="center" prop="appName" show-overflow-tooltip/>
           <el-table-column label="app版本" align="center" prop="appVersion" show-overflow-tooltip width="240"/>
           <el-table-column label="总设备数" align="center" prop="totalDevices" show-overflow-tooltip width="240"/>
-          <el-table-column label="分批升级数量" align="center" prop="batchSize" show-overflow-tooltip width="240"/>
+          <el-table-column label="分批数" align="center" prop="batchSize" show-overflow-tooltip width="240"/>
+          <el-table-column label="成功数" align="center" prop="successCount" show-overflow-tooltip width="240"/>
           <el-table-column label="状态" align="center" prop="status" show-overflow-tooltip width="180">
             <template slot-scope="scope">
               {{scope.row.status=='pending'?'待执行':(scope.row.status=='in_progress'?'进行中':(scope.row.status=='completed'?'已完成':(scope.row.status=='termination'?'终止':(scope.row.status=='failed'?'失败':''))))}}
@@ -114,14 +115,14 @@
               <el-radio :label="false">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="升级范围" prop="upRadius" style="display: block" label-width="120px">
-            <el-radio-group v-model="dialogForm.upRadius" style="width:320px;">
-              <el-radio :label="1">校区</el-radio>
-              <el-radio :label="2">楼栋</el-radio>
-              <el-radio :label="3">实验室</el-radio>
+          <el-form-item label="升级范围" prop="upgradeScope" style="display: block" label-width="120px">
+            <el-radio-group v-model="dialogForm.upgradeScope" style="width:320px;">
+              <el-radio :label="campus">校区</el-radio>
+              <el-radio :label="building">楼栋</el-radio>
+              <el-radio :label="laboratory">实验室</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="校区" prop="schoolId" style="display: block" label-width="120px" v-if="dialogForm.upRadius == 1 || dialogForm.upRadius == 2 || dialogForm.upRadius == 3">
+          <el-form-item label="校区" prop="schoolId" style="display: block" label-width="120px" v-if="dialogForm.upgradeScope == 'campus' || dialogForm.upgradeScope == 'building' || dialogForm.upgradeScope == 'laboratory'">
             <el-select v-model="dialogForm.schoolId" @change="changeSchool" filterable
                        placeholder="请选择校区" style="width: 360px">
               <el-option v-for="(item,index) in schoolOption"
@@ -130,7 +131,7 @@
                          :value="item.id"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="楼栋" prop="buildId" style="display: block" label-width="120px" v-if="dialogForm.upRadius == 2 || dialogForm.upRadius == 3">
+          <el-form-item label="楼栋" prop="buildId" style="display: block" label-width="120px" v-if="dialogForm.upgradeScope == 'building' || dialogForm.upgradeScope == 'laboratory'">
             <el-select v-model="dialogForm.buildId" @change="buildSchool" filterable
                        placeholder="请选择楼栋" style="width: 360px">
               <el-option v-for="(item,index) in buildOption"
@@ -139,7 +140,7 @@
                          :value="item.id"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="实验室" prop="subjectId" style="display: block" label-width="120px" v-if="dialogForm.upRadius == 3">
+          <el-form-item label="实验室" prop="subjectId" style="display: block" label-width="120px" v-if="dialogForm.upgradeScope == 3">
             <el-select v-model="dialogForm.subjectId" filterable
                        placeholder="请选择实验室" style="width: 360px">
               <el-option v-for="(item,index) in subjectOption"
@@ -194,7 +195,7 @@
           deviceCode:null,
           batchSize:null,
           isForceUpdate:null,
-          upRadius:null,
+          upgradeScope:null,
           schoolId:null,
           buildId:null,
           subjectId:null,
@@ -215,7 +216,7 @@
           isForceUpdate: [
             { required: true, message: "请选择是否强制更新", trigger: "blur" }
           ],
-          upRadius: [
+          upgradeScope: [
             { required: true, message: "请选择升级范围", trigger: "blur" },
           ],
           schoolId: [
@@ -252,7 +253,7 @@
           deviceCode:null,
           batchSize:null,
           isForceUpdate:null,
-          upRadius:null,
+          upgradeScope:null,
           schoolId:null,
           buildId:null,
           subjectId:null,
@@ -269,14 +270,21 @@
               deviceCode:this.dialogForm.deviceCode,
               batchSize:this.dialogForm.batchSize,
               isForceUpdate:this.dialogForm.isForceUpdate,
+              upgradeScope:this.dialogForm.upgradeScope,
               scope:{},
             }
-            if(this.dialogForm.upRadius == 1){
+            if(this.dialogForm.upgradeScope == "campus"){
               obj.scope.campusId = this.dialogForm.schoolId;
-            }else if(this.dialogForm.upRadius == 2){
+              obj.businessId = this.dialogForm.schoolId;
+            }else if(this.dialogForm.upgradeScope == "building"){
               obj.scope.buildingId = this.dialogForm.buildId;
-            }else if(this.dialogForm.upRadius == 3){
+              obj.businessId = this.dialogForm.schoolId;
+              obj.businessId = obj.businessId+','+this.dialogForm.buildId;
+            }else if(this.dialogForm.upgradeScope == "laboratory"){
               obj.scope.subId = this.dialogForm.subjectId;
+              obj.businessId = this.dialogForm.schoolId;
+              obj.businessId = obj.businessId+','+this.dialogForm.buildId;
+              obj.businessId = obj.businessId+','+this.dialogForm.subjectId;
             }
             terminalUpgradeWebPlanCreate(obj).then(response => {
               this.msgSuccess(response.message)