Browse Source

feat(core): change

gemercheung 3 years ago
parent
commit
b4e5ac314e

+ 1 - 1
.env.development

@@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = /
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
 # http://192.168.0.38:8190/shop
-VITE_PROXY = [["/basic-api","https://cszfb.4dkankan.com/basic-api"],["/kankan-api","http://test.4dkankan.com"],["/zfb-api","https://cszfb.4dkankan.com"]]
+VITE_PROXY = [["/basic-api","https://cszfb.4dkankan.com/basic-api"],["/kankan-api","http://test.4dkankan.jp"],["/zfb-api","https://cszfb.4dkankan.com"]]
 #["/zfb-api","http://192.168.0.47:7081"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 

+ 23 - 2
src/api/scene/list.ts

@@ -16,8 +16,10 @@ enum Api {
 
   pageList = '/kankan-api/api/manager/scene/list',
   generateSceneEditToken = '/kankan-api/api/manager/platform/generateSceneEditToken',
-  downloadSceneData = '/kankan-api/api/manager/scene/downloadSceneData',
-  getDownloadProcess = '/kankan-api/api/manager/scene/getDownloadProcess',
+  downloadSceneData = '/kankan-api/api/manager/user/downloadSceneData',
+  getDownloadProcess = '/kankan-api/api/manager/user/downloadProcess',
+  addDownloadNum = '/kankan-api/api/scene/addDownloadNum',
+  checkDownload = '/kankan-api/api/manager/user/checkDownload',
 }
 
 /**
@@ -62,3 +64,22 @@ export const generateSceneEditTokenApi = (params: SceneEditParam) =>
       ignoreCancelToken: true,
     },
   });
+
+export const addDownloadNumApi = (params: SceneDownloadParam) =>
+  defHttp.get<Result>({
+    url: Api.addDownloadNum,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+export const checkDownloadApi = (params: SceneDownloadParam) =>
+  defHttp.post<Result>({
+    url: Api.checkDownload,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });

+ 1 - 1
src/views/devices/list.vue

@@ -39,7 +39,7 @@
         />
       </template>
     </BasicTable>
-    <AddModal @getList="reload" @register="registerAddModal" />
+    <AddModal @get-list="reload" @register="registerAddModal" />
   </div>
 </template>
 <script lang="ts">

+ 3 - 1
src/views/scenes/list.vue

@@ -65,6 +65,8 @@
   // import { uploadApi } from '/@/api/sys/upload';
   // import { Progress } from 'ant-design-vue';
   // import { h } from 'vue';
+  // addDownloadNumApi,
+  // checkDownloadApi,
   import { ListApi, generateSceneEditTokenApi, downloadSceneDataAPi } from '/@/api/scene/list';
   import { useI18n } from '/@/hooks/web/useI18n';
   import {
@@ -149,7 +151,7 @@
           title: t('common.operation'),
           dataIndex: '',
           slots: { customRender: 'action' },
-          width: 240,
+          width: 200,
           fixed: 'right',
         },
       ];

+ 3 - 2
src/views/sys/login/LoginForm.vue

@@ -150,8 +150,9 @@
   const isDragValidate = ref(false);
 
   const formData = reactive({
-    account: '18819272208',
-    password: 'Aa123456',
+    account: '767383594@qq.com',
+    password: '4DAge123456',
+
     // password: encodeStr(window.btoa('zfb123456')),
     // captcha: '',
   });