tangning 7 달 전
부모
커밋
29cf043af0
5개의 변경된 파일24개의 추가작업 그리고 10개의 파일을 삭제
  1. 6 4
      src/api/operate/index.ts
  2. 3 1
      src/locales/lang/json/en.json
  3. 3 1
      src/locales/lang/json/ja.json
  4. 3 1
      src/locales/lang/json/zh.json
  5. 9 3
      src/views/scene/list.vue

+ 6 - 4
src/api/operate/index.ts

@@ -41,7 +41,8 @@ enum Api {
   sceneCopy = '/service/agent/scene/copy',
   checkDownLoad = '/service/manage/scene/checkDownLoad',
   downloadProcess = '/service/manage/scene/downloadProcess',
-  rebuildScene = '/service/agent/scene/rebuildScene',
+  // rebuildScene = '/service/agent/scene/rebuildScene',
+  rebuildScene = '/xse/xspace/updateSync',
   overallList = '/service/manage/overall/list',
   overallDelete = '/service/manage/overall/delete',
   agentAuditList = '/service/manage/agentAudit/list',
@@ -334,12 +335,13 @@ export const sceneMove = (params: sceneMoveParams) =>
     },
   });
 export const rebuildScene = (params: sceneControlParams) =>
-  defHttp.get<Result>({
-    url: Api.rebuildScene,
+  defHttp.post<Result>({
+    url: Api.rebuildScene + '?id=' + params.id,
+
     params: params,
-    // data: params,
     headers: {
       // @ts-ignore
+      // 忽略取消令牌的TypeScript错误
       ignoreCancelToken: true,
     },
   });

+ 3 - 1
src/locales/lang/json/en.json

@@ -492,7 +492,9 @@
             "transferTips": "Please select the Transfer Scene!",
             "transferSccuse": "Transfer Scene successful",
             "shotTime": "Shooting time",
-            "createUserName": "Creator"
+            "createUserName": "Creator",
+            "updataTextTips": "Are you sure to update?",
+            "updataText": "update"
         },
         "system": {
             "roleBut": "Permissions",

+ 3 - 1
src/locales/lang/json/ja.json

@@ -563,7 +563,9 @@
             "transferTips": "移行シーンをチェックしてください!",
             "transferSccuse": "移行成功",
             "shotTime": "撮影時間",
-            "createUserName": "担当者"
+            "createUserName": "担当者",
+            "updataTextTips": "アップデートを確定しますか?",
+            "updataText": "アップデート"
         },
         "system": {
             "roleBut": "権限",

+ 3 - 1
src/locales/lang/json/zh.json

@@ -443,7 +443,9 @@
             "transferTips": "请勾选同步场景!",
             "transferSccuse": "迁移成功",
             "createUserName": "创建人",
-            "shotTime": "拍摄时间"
+            "shotTime": "拍摄时间",
+            "updataTextTips": "是否确定更新?",
+            "updataText": "更新"
         },
         "system": {
             "roleBut": "权限",

+ 9 - 3
src/views/scene/list.vue

@@ -38,6 +38,11 @@
                 onClick: handleSee.bind(null, record),
               },
               {
+                label: t('routes.scene.updataText'),
+                disabled: record.status != 1 && record.status != -1,
+                onClick: handleReset.bind(null, record),
+              },
+              {
                 label: t('common.delText'),
                 disabled: record.status != 1 && record.status != -1,
                 color: 'error',
@@ -436,10 +441,11 @@
       }
       function handleReset(record: Recordable) {
         createConfirm({
-          title: t('routes.scene.reset'),
-          content: t('routes.scene.resetTips'),
+          iconType: 'warning',
+          title: t('common.tips'),
+          content: t('routes.scene.updataTextTips'),
           onOk: async () => {
-            rebuildScene({ num: record.num }).then(() => {
+            rebuildScene({ id: record.id }).then(() => {
               message.success({
                 content: t('common.optSuccess'),
               });