Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/views/iot/device/dossier/index.vue

@@ -6,14 +6,6 @@
 					<el-input v-model="params.keyWord" placeholder="请输入名称" clearable size="default" style="width: 240px" />
 				</el-form-item>
 
-				<el-form-item label="运行状态" prop="status" style="width: 200px">
-					<el-select v-model="params.status" placeholder="运行状态" clearable size="default" style="width: 240px">
-						<el-option label="全部" :value="-1" />
-						<el-option label="启用" :value="1" />
-						<el-option label="禁用" :value="0" />
-					</el-select>
-				</el-form-item>
-
 				<el-form-item>
 					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
 						<el-icon>

src/views/iot/ota-update/update/component/check.vue

@@ -173,10 +173,10 @@ export default defineComponent({
       //   state.ruleForm.push = '2';
       //   state.ruleForm.pushDisabled = true;
       // }
-      // if (state.ruleForm.method === '3'){
-      //   state.ruleForm.pushDisabled = false;
-      //   state.ruleForm.push = '1';
-      // }
+      if (state.ruleForm.method === '3'){
+        state.ruleForm.pushDisabled = false;
+        state.ruleForm.push = '1';
+      }
     };
     const getProductList = () => {
       api.batch.getDeviceList({ productId: state.ruleForm.productId}).then((res: any) => {

src/views/system/monitor/lastLinesLog/index.vue

@@ -122,9 +122,11 @@ const view = (row: any) => {
   });
   api.lastLinesLog.detail({name: row.name, types: types.value}).then((res: any) => {
     if (types.value == 'run') {
-        runButtonShow.value = true;
         runMessage.value = res.list;
         runLoading.value = false;
+        if (res.list.length > 0) {
+          runButtonShow.value = true;
+        }
     } else {
       errorMessage.value = res.list;
       dialogVisible.value = true;