Просмотр исходного кода

feat(core): change api for server

gemercheung 3 лет назад
Родитель
Сommit
70c57b8e10

+ 9 - 1
src/api/corporation/list.ts

@@ -10,7 +10,15 @@ import {
 import { Result, UploadFileParams } from '/#/axios';
 
 enum Api {
-  selectCompanyNum = '/zfb-api/zfb/company/selectCompanyNum',
+  // selectCompanyNum = '/zfb-api/zfb/company/selectCompanyNum',
+  // listAllCompany = '/zfb-api/zfb/company/getListAll',
+  // selectCompanyByType = '/zfb-api/zfb/company/selectCompanyByType',
+  // uploadLogo = '/zfb-api/zfb/company/uploadLogo',
+  // updateCompany = '/zfb-api/zfb/company/updateCompany',
+  // selectCompanyDevice = '/zfb-api/zfb/company/selectCompanyDevice',
+  // unbindDevice = '/zfb-api/zfb/company/unbindDevice',
+
+  selectCompanyNum = '/kankan-api/api/manager/company/list',
   listAllCompany = '/zfb-api/zfb/company/getListAll',
   selectCompanyByType = '/zfb-api/zfb/company/selectCompanyByType',
   uploadLogo = '/zfb-api/zfb/company/uploadLogo',

+ 2 - 1
src/api/device/list.ts

@@ -2,7 +2,8 @@ import { defHttp } from '/@/utils/http/axios';
 import { PageParams, RentListGetResultModel, addCamerParams } from './model';
 
 enum Api {
-  pageList = '/zfb-api/zfb/camera/pageList',
+  // pageList = '/zfb-api/zfb/camera/pageList',
+  pageList = '/kankan-api/api/manager/camera/list',
   addCamera = '/zfb-api/zfb/camera/add',
   allCompany = '/zfb-api/zfb/company/listAll',
 }

+ 6 - 1
src/api/scene/list.ts

@@ -9,7 +9,12 @@ import {
 import { Result } from '/#/axios';
 
 enum Api {
-  pageList = '/zfb-api/zfb/scene/pageList',
+  // pageList = '/zfb-api/zfb/scene/pageList',
+  // generateSceneEditToken = '/zfb-api/zfb/api/platform/generateSceneEditToken',
+  // downloadSceneData = '/zfb-api/zfb/scene/downloadSceneData',
+  // getDownloadProcess = '/zfb-api/zfb/scene/getDownloadProcess',
+
+  pageList = '/kankan-api/api/manager/scene/list',
   generateSceneEditToken = '/zfb-api/zfb/api/platform/generateSceneEditToken',
   downloadSceneData = '/zfb-api/zfb/scene/downloadSceneData',
   getDownloadProcess = '/zfb-api/zfb/scene/getDownloadProcess',

+ 4 - 3
src/api/sys/model/userModel.ts

@@ -10,9 +10,10 @@ import type { UserInfo } from '/#/store';
 
 export interface LoginParams {
   password: string;
-  phoneNum: string;
-  randomcode: string;
-  rememberMe: boolean;
+  phoneNum?: string;
+  randomcode?: string;
+  rememberMe?: boolean;
+  userName?: string;
 }
 
 export interface RoleInfo {

+ 1 - 0
src/api/sys/user.ts

@@ -9,6 +9,7 @@ enum Api {
   // Login = '/basic-api/sys/login',
   // Login = '/zfb-api/zfb/loginBackground',
   Login = '/kankan-api/api/sso/user/login',
+  // Login = '/kankan-api/api/sso/manager/login',
   Logout = '/logout',
   // GetUserInfo = '/zfb-api/zfb/shop/sys/user/infoAnon',
   GetUserInfo = '/kankan-api/api/user/getUserInfo',

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

@@ -150,8 +150,8 @@
   const isDragValidate = ref(false);
 
   const formData = reactive({
-    account: '',
-    password: '',
+    account: '18819272208',
+    password: 'Aa123456',
     // password: encodeStr(window.btoa('zfb123456')),
     // captcha: '',
   });
@@ -183,6 +183,7 @@
       loading.value = true;
       const userInfo = await userStore.login({
         password: data.password,
+        // userName: data.account,
         phoneNum: data.account,
         randomcode: data.captcha,
         rememberMe: false,