Bladeren bron

feat: adjust some operation confirmation

Casper Dai 2 jaren geleden
bovenliggende
commit
7abfc79bbd

+ 3 - 4
src/api/asset.js

@@ -11,7 +11,6 @@ import {
   update,
   submit,
   resolve,
-  reject,
   messageSend,
   confirmAndSend,
   addStatus,
@@ -140,12 +139,12 @@ export function resolveAsset ({ keyName, originalName }) {
   }, originalName)
 }
 
-export function rejectAsset ({ keyName, originalName }, remark) {
-  return reject({
+export function rejectAsset ({ keyName }, remark) {
+  return messageSend({
     url: '/minio-data/reject',
     method: 'POST',
     data: { keyName, remark }
-  }, originalName)
+  }, '驳回')
 }
 
 export function getAssetSubTags () {

+ 3 - 4
src/api/calendar.js

@@ -5,7 +5,6 @@ import {
   del,
   submit,
   resolve,
-  reject,
   send,
   messageSend,
   addStatus,
@@ -147,12 +146,12 @@ export function resolveSchedule ({ id, name }) {
   }, name)
 }
 
-export function rejectSchedule ({ id, name }, remark) {
-  return reject({
+export function rejectSchedule ({ id }, remark) {
+  return messageSend({
     url: `/content/calendar/${id}/reject`,
     method: 'POST',
     data: { remark }
-  }, name)
+  }, '驳回')
 }
 
 export function copySchedule (schedule) {

+ 3 - 4
src/api/program.js

@@ -5,7 +5,6 @@ import {
   del,
   submit,
   resolve,
-  reject,
   messageSend,
   addStatus,
   addStatusScope,
@@ -102,13 +101,13 @@ export function resolveProgram ({ id, name }) {
   }, name)
 }
 
-export function rejectProgram ({ id, name }, reason) {
-  return reject({
+export function rejectProgram ({ id }, reason) {
+  return messageSend({
     url: '/item/reject',
     method: 'GET',
     params: { id },
     data: { reason }
-  }, name)
+  }, '驳回')
 }
 
 export function copyProgram (program) {

+ 5 - 5
src/views/ad/applet/api.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 import {
   resolve,
-  reject
+  messageSend
 } from '@/api/base'
 
 export function getAssets (query, options) {
@@ -26,14 +26,14 @@ export function resolveAsset ({ keyName }) {
 }
 
 export function rejectAsset ({ keyName }, reason) {
-  return reject({
+  return messageSend({
     url: `/ad/tenant/asset/reject`,
     method: 'POST',
     data: {
       keyName,
       reason
     }
-  })
+  }, '驳回')
 }
 
 export function getOrders (query) {
@@ -69,14 +69,14 @@ export function resolveOrder ({ id }) {
 }
 
 export function rejectOrder ({ id }, reason) {
-  return reject({
+  return messageSend({
     url: `/ad/tenant/order/reject`,
     method: 'POST',
     data: {
       orderId: id,
       reason
     }
-  })
+  }, '驳回')
 }
 
 export function getOrdersByDevice (query) {

+ 24 - 24
src/views/external/box/settings/components/DeviceShadow.vue

@@ -64,30 +64,30 @@ export default {
       })
     },
     onSync () {
-      publish(
-        `${this.device.productId}/${this.device.id}/function/invoke`,
-        JSON.stringify({
-          timestamp: `${Date.now()}`,
-          'function': 'updateConfig',
-          inputs: [
-            { name: 'reboot', value: 1 }
-          ]
-        }),
-        true
-      ).then(
-        () => {
-          this.$message({
-            type: 'success',
-            message: '执行成功'
-          })
-        },
-        () => {
-          this.$message({
-            type: 'warning',
-            message: '正在连接,请稍后再试'
-          })
-        }
-      )
+      this.$confirm(
+        '同步数据将重启设备,是否同步?',
+        '操作确认',
+        { type: 'warning' }
+      ).then(() => {
+        publish(
+          `${this.device.productId}/${this.device.id}/restart/ask`,
+          JSON.stringify({ timestamp: `${Date.now()}` }),
+          true
+        ).then(
+          () => {
+            this.$message({
+              type: 'success',
+              message: '执行成功'
+            })
+          },
+          () => {
+            this.$message({
+              type: 'warning',
+              message: '正在连接,请稍后再试'
+            })
+          }
+        )
+      })
     }
   }
 }