fix: some bugs

1. new tasks are enabled by default
2. unable to refresh the current page when obtaining abnormal list data
3. power status refresh in device info page
4. some prompts have been adjusted

src/components/dialog/TaskDialog/index.vue

@@ -5,47 +5,46 @@
     v-bind="$attrs"
     @confirm="onSave"
   >
-    <div
-      v-if="task"
-      class="c-grid-form auto u-align-self--center"
-    >
-      <div class="c-grid-form__label">重复方式</div>
-      <div>
-        <el-select v-model="task.freq">
-          <el-option
-            v-for="option in freqOptions"
-            :key="option.value"
-            :label="option.label"
-            :value="option.value"
-          />
-        </el-select>
-      </div>
-      <template v-if="isWeekly">
-        <div class="c-grid-form__label c-grid-form__auto u-required">每周</div>
-        <el-checkbox-group
-          v-model="task.dayOfWeek"
-          class="c-grid-form__auto l-flex--row"
-          size="mini"
-          fill="#1c5cb0"
-        >
-          <el-checkbox-button
-            v-for="week in weeks"
-            :key="week.value"
-            :label="week.value"
+    <template #default>
+      <div class="c-grid-form auto u-align-self--center">
+        <div class="c-grid-form__label">重复方式</div>
+        <div>
+          <el-select v-model="task.freq">
+            <el-option
+              v-for="option in freqOptions"
+              :key="option.value"
+              :label="option.label"
+              :value="option.value"
+            />
+          </el-select>
+        </div>
+        <template v-if="isWeekly">
+          <div class="c-grid-form__label c-grid-form__auto u-required">每周</div>
+          <el-checkbox-group
+            v-model="task.dayOfWeek"
+            class="c-grid-form__auto l-flex--row"
+            size="mini"
+            fill="#1c5cb0"
           >
-            {{ week.label }}
-          </el-checkbox-button>
-        </el-checkbox-group>
-      </template>
-      <div class="c-grid-form__label u-required">执行时间</div>
-      <el-time-picker
-        v-model="task.executeTime"
-        placeholder="请选择执行时间"
-        value-format="HH:mm:ss"
-        :clearable="false"
-      />
-      <slot :freq="task.freq" />
-    </div>
+            <el-checkbox-button
+              v-for="week in weeks"
+              :key="week.value"
+              :label="week.value"
+            >
+              {{ week.label }}
+            </el-checkbox-button>
+          </el-checkbox-group>
+        </template>
+        <div class="c-grid-form__label u-required">执行时间</div>
+        <el-time-picker
+          v-model="task.executeTime"
+          placeholder="请选择执行时间"
+          value-format="HH:mm:ss"
+          :clearable="false"
+        />
+        <slot :freq="task.freq" />
+      </div>
+    </template>
   </confirm-dialog>
 </template>
 

src/components/table/Table/index.vue

@@ -105,11 +105,15 @@
         :key="index"
         :schema="col"
       />
-      <status-wrapper
+      <slot
         slot="empty"
-        :error="options.error"
-        @click="onPagination"
-      />
+        name="empty"
+      >
+        <status-wrapper
+          :error="options.error"
+          @click="onPagination"
+        />
+      </slot>
     </el-table>
     <slot
       v-if="isNeedPagination"

src/components/table/mixins/table.js

@@ -171,10 +171,10 @@ export default {
       const options = this.options
       if (!options.loading) {
         options.loading = true
+        options.error = false
         this.onFetchList(options).then(
           ({ data, totalCount }) => {
             options.loading = false
-            options.error = false
             options.totalCount = totalCount || data.length
             if (this.isNeedPagination && this.isManualPagination) {
               const { pageNum, pageSize } = options.params
@@ -189,11 +189,12 @@ export default {
             const { transform } = this.schema
             options.list = transform ? data.map(transform) : data
           },
-          () => {
-            options.loading = false
-            options.error = true
-            options.totalCount = 0
-            options.list = []
+          e => {
+            if (!e?.isCancel) {
+              options.loading = false
+              options.error = true
+              options.list = []
+            }
           }
         ).finally(() => {
           !options.death && this.$emit('changed', options.list)

src/views/dashboard/components/Device.vue

@@ -191,7 +191,7 @@ export default {
     warningTip () {
       return this.isOnline
         ? this.powerStatus === Status.WARNING
-          ? `电源状态异常，最后上报时间<br/><br/>${this.timestamp}`
+          ? `电源状态异常，${this.switchStatus === Power.LOADING ? '检测' : '最后上报'}}时间<br/><br/>${this.timestamp}`
           : '屏幕未开启'
         : this.device.lastOnline
           ? `${this.device.lastOnline} 离线`

src/views/device/detail/components/DeviceInfo/components/Power.vue

@@ -5,7 +5,13 @@
       ref="powerTable"
       class="c-sibling-item--v near"
       :schema="powerSchema"
-    />
+    >
+      <template #empty>
+        <div class="u-font-size--md u-color--warning has-padding">
+          {{ emptyWarningTip }}
+        </div>
+      </template>
+    </schema-table>
     <template v-if="hasMulti">
       <div class="l-flex--row c-sibling-item--v u-color--black u-font-size--sm u-bold">
         <div class="c-sibling-item">定时任务</div>
@@ -64,6 +70,7 @@ export default {
   data () {
     return {
       actionInfo: ['开启', '关闭'],
+      emptyWarningTip: '',
       hasMulti: false,
       hasRelay: false,
       powerSchema: {
@@ -135,7 +142,7 @@ export default {
       })
     },
     onPowerMessage (value, key) {
-      if (this.hasMulti || key && key !== ThirdPartyDevice.MULTI_FUNCTION_CARD) {
+      if (key && key !== ThirdPartyDevice.MULTI_FUNCTION_CARD) {
         return
       }
       const multiCard = value[ThirdPartyDevice.MULTI_FUNCTION_CARD]
@@ -159,6 +166,7 @@ export default {
           }
         })
         this.$typeMap = map
+        this.emptyWarningTip = `直至 ${timestamp} 未收到上报数据`
         this.hasMulti = multiCard.status === Status.OK
         this.$refs.powerTable?.pageTo()
       }
@@ -244,9 +252,6 @@ export default {
       }
       let tableData = []
       switch (message.function) {
-        case GET_POWER_STATUS:
-          tableData = this.setPowerStatus(data)
-          break
         case GET_MULTI_POWER_TIMING:
           tableData = this.setMultiPowerTasks(data.data)
           break
@@ -256,42 +261,6 @@ export default {
       this.$tableData[status.key] = tableData
       status.resolve({ data: tableData })
     },
-    getPowers () {
-      return this.getData(GET_POWER_STATUS)
-    },
-    setPowerStatus ({ current_status_info }) {
-      const map = {}
-      const powers = []
-      let hasMulti = false
-      let hasRelay = false
-      current_status_info.forEach(({ connectIndex, portIndex, updatePowerIndexStates }) => {
-        updatePowerIndexStates.forEach(({ powerIndex, type, action }) => {
-          if (portIndex === RELAY_KEY) {
-            return
-          }
-          const key = portIndex === RELAY_KEY ? RELAY_KEY : `${connectIndex}_${portIndex}_${type}`
-          if (!map[key]) {
-            map[key] = {
-              connectIndex,
-              portIndex,
-              type,
-              label: portIndex === RELAY_KEY ? '' : `${portIndex} ${type}`
-            }
-            if (portIndex === RELAY_KEY) {
-              hasRelay = true
-            } else {
-              hasMulti = true
-            }
-          }
-          powers.push({ connectIndex, portIndex, powerIndex, type, action })
-        })
-      })
-      this.$typeMap = map
-      this.hasMulti = hasMulti
-      this.hasRelay = !hasMulti && hasRelay
-      this.$hasRelay = hasRelay
-      return powers
-    },
     getMultiTasks () {
       return this.getData(GET_MULTI_POWER_TIMING)
     },

src/views/device/detail/components/DeviceInvoke/MultifunctionCardPowerSwitch.vue

@@ -967,7 +967,7 @@ export default {
         params: JSON.stringify({
           id: this.device.id,
           name: this.device.name,
-          tasks: this.$tasks.map(({ action, enable, freqInfo, startTime, endTime, executeTime, type }) => `${enable ? '启用' : '禁用'} ${startTime === endTime ? startTime : `${startTime} - ${endTime}`} ${freqInfo} ${executeTime} ${['开启', '关闭'][action]} ${type}`).join(';')
+          tasks: this.$tasks.map(({ action, enable, freqInfo, startTime, endTime, executeTime, type }) => `${enable ? '启用' : '禁用'} ${startTime === endTime ? startTime : `${startTime} - ${endTime} ${freqInfo}`} ${executeTime} ${['开启', '关闭'][action]} ${type}`).join(';')
         })
       })
       return data.filter(({ conditions }) => conditions.length)

src/views/device/detail/components/DeviceInvoke/ScreenLight.vue

@@ -49,15 +49,17 @@
       :title="dialogTitle"
       @confirm="onSave"
     >
-      <span class="c-grid-form__label u-required">{{ tip }}</span>
-      <div class="l-flex--row">
-        <el-input-number
-          v-model="task"
-          :min="0"
-          :max="100"
-          step-strictly
-        />&nbsp;%
-      </div>
+      <template #default>
+        <span class="c-grid-form__label u-required">{{ tip }}</span>
+        <div class="l-flex--row">
+          <el-input-number
+            v-model="task"
+            :min="0"
+            :max="100"
+            step-strictly
+          />&nbsp;%
+        </div>
+      </template>
     </task-dialog>
   </div>
 </template>

src/views/device/detail/components/DeviceInvoke/ScreenVolume.vue

@@ -54,15 +54,17 @@
       :title="dialogTitle"
       @confirm="onSave"
     >
-      <span class="c-grid-form__label u-required">{{ tip }}</span>
-      <div class="l-flex--row">
-        <el-input-number
-          v-model="task"
-          :min="0"
-          :max="100"
-          step-strictly
-        />&nbsp;%
-      </div>
+      <template #default>
+        <span class="c-grid-form__label u-required">{{ tip }}</span>
+        <div class="l-flex--row">
+          <el-input-number
+            v-model="task"
+            :min="0"
+            :max="100"
+            step-strictly
+          />&nbsp;%
+        </div>
+      </template>
     </task-dialog>
   </div>
 </template>

src/views/device/detail/components/DeviceInvoke/mixins/task.js

@@ -15,7 +15,7 @@ export default {
       isAdd: false,
       active: 'immediate',
       options: null,
-      task: {}
+      task: null
     }
   },
   computed: {
@@ -90,6 +90,7 @@ export default {
       return addTask({
         deviceId: this.deviceId,
         functionKey: this.$refs.table.getCondition().functionKey,
+        status: 1,
         ...task,
         ...this.getTask()
       }).then(() => {
@@ -145,7 +146,7 @@ export default {
           task.type = '每天'
           break
         case 1:
-          task.type = `每周${task.dayOfWeek.split(',').map(val => ['一', '二', '三', '四', '五', '六', '日'][val])}`
+          task.type = `每周${task.dayOfWeek.split(',').map(val => ['', '日', '一', '二', '三', '四', '五', '六'][val])}`
           break
         default:
           break

src/views/external/mesh/index.vue

@@ -266,7 +266,6 @@ const sensors = Object.values(SensorToThirdPartyMap)
 
 const PortThirdPartyDevices = [
   ThirdPartyDevice.PLC,
-  ThirdPartyDevice.MULTI_FUNCTION_CARD,
   ...sensors
 ]