Browse Source

feat(应用赋能中台):

1.需改应用中台登录
胡荣基 9 months ago
parent
commit
162e552f24

+ 27 - 0
src/service/index.js

@@ -27,8 +27,19 @@ export const requestInstance_KJGL = axios.create({
 	headers:{
 		Systemtype:"4f2a211f473b4e39b9ccc1e04233c725"
 	},
+})
 
+// 应用赋能中台
+export const requestInstance_YYFN = axios.create({
+	baseURL: import.meta.env.VITE_BASE_API,
+	timeout: 60000,
+	method: 'post',
+	withCredentials:true,
+	headers:{
+		Systemtype:"47e0971bb15b4420bf1f351510378c73"
+	},
 })
+
 requestInstance_KJGL.interceptors.request.use((config) => {
 	// console.log(config)
 	return config
@@ -43,6 +54,22 @@ requestInstance_KJGL.interceptors.response.use(function (res) {
 })
 
 
+// 应用赋能中台请求体拦截
+requestInstance_YYFN.interceptors.request.use((config) => {
+	// console.log(config)
+	return config
+}, (error) => {
+	return new Error(error)
+})
+// 应用赋能中台返回体拦截
+requestInstance_YYFN.interceptors.response.use(function (res) {
+	return res.data
+}, function (error) {
+
+	throw new Error(error)
+})
+
+
 export const requestInstance_KJLL = axios.create({
 	baseURL: import.meta.env.VITE_BASE_API,
 	timeout: 60000,

+ 119 - 100
src/service/login.js

@@ -1,114 +1,133 @@
 import {
- requestInstance,
- requestInstance_login,
- requestInstance_KJGL,
- requestInstance_KJLL,
- requestInstance_FXFN, requestInstance_PTJK,requestInstance_CSTJ
+    requestInstance,
+    requestInstance_login,
+    requestInstance_KJGL,
+    requestInstance_KJLL,
+    requestInstance_FXFN, requestInstance_PTJK, requestInstance_CSTJ, requestInstance_YYFN
 } from "@/service/index";
+
 export function loginCim(params) {
- return requestInstance_login({
-  url:'/user/selectSystemByUsernameAanPasswordBySpace',
-  data:{
-   ...params
-  }
- })
+    return requestInstance_login({
+        url: '/user/selectSystemByUsernameAanPasswordBySpace',
+        data: {
+            ...params
+        }
+    })
 }
-export function loginInSpace(username,password,type,systemType){
- if(type == "1"){  //空间管理
-  return requestInstance_KJGL({
-   url:'/user/KJuserLogin',
-   data:{
-    "username":username,
-    "password":password,
-    "verifyCode":"30380d9498d64df9ad340121b369e202",
-    "TYPE":type
-   },
-  })
- }
- if(type == "2"){  //空间浏览
-  return requestInstance_KJLL({
-   url:'/user/KJuserLogin',
-   data:{
-    "username":username,
-    "password":password,
-    "verifyCode":"30380d9498d64df9ad340121b369e202",
-    "TYPE":type
-   },
-  })
- }
- if(type == "9"){  //城市体检
-  return requestInstance_CSTJ({
-   url:'/user/KJuserLogin',
-   data:{
-    "username":username,
-    "password":password,
-    "verifyCode":"30380d9498d64df9ad340121b369e202",
-    "TYPE":type
-   },
-  })
- }
+
+export function loginInSpace(username, password, type, systemType) {
+    if (type == "1") {  //空间管理
+        return requestInstance_KJGL({
+            url: '/user/KJuserLogin',
+            data: {
+                "username": username,
+                "password": password,
+                "verifyCode": "30380d9498d64df9ad340121b369e202",
+                "TYPE": type
+            },
+        })
+    }
+    if (type == "2") {  //空间浏览
+        return requestInstance_KJLL({
+            url: '/user/KJuserLogin',
+            data: {
+                "username": username,
+                "password": password,
+                "verifyCode": "30380d9498d64df9ad340121b369e202",
+                "TYPE": type
+            },
+        })
+    }
+    if (type == "9") {  //城市体检
+        return requestInstance_CSTJ({
+            url: '/user/KJuserLogin',
+            data: {
+                "username": username,
+                "password": password,
+                "verifyCode": "30380d9498d64df9ad340121b369e202",
+                "TYPE": type
+            },
+        })
+    }
 }
 
+// 应用赋能中台
+export function loginInYYFNZW(username, password, TYPE) {
+    return requestInstance_YYFN({
+        url: '/user/KJuserLogin',
+        data: {
+            "username": username,
+            "password": password,
+            "verifyCode": "30380d9498d64df9ad340121b369e202",
+        },
+    })
+}
 
-export function loginInZw(username,password,TYPE){
- return requestInstance_PTJK({
-  url:'/user/userLogin',
-  data:{
-   "USERNAME":username,
-   "PASSWORD":password,
-   "verifyCode":"30380d9498d64df9ad340121b369e202",
-   "TYPE":TYPE
-  }
- })
+export function loginInZw(username, password, TYPE) {
+    return requestInstance_PTJK({
+        url: '/user/userLogin',
+        data: {
+            "USERNAME": username,
+            "PASSWORD": password,
+            "verifyCode": "30380d9498d64df9ad340121b369e202",
+            "TYPE": TYPE
+        }
+    })
 }
-export function loginInSjfxfn(username,password,TYPE){
- return requestInstance_FXFN({
-  url:'/user/sjfxfn_userLogin',
-  data:{
-   "USERNAME":username,
-   "PASSWORD":password,
-   "verifyCode":"30380d9498d64df9ad340121b369e202",
-   "TYPE":TYPE
-  }
- })
+
+export function loginInSjfxfn(username, password, TYPE) {
+    return requestInstance_FXFN({
+        url: '/user/sjfxfn_userLogin',
+        data: {
+            "USERNAME": username,
+            "PASSWORD": password,
+            "verifyCode": "30380d9498d64df9ad340121b369e202",
+            "TYPE": TYPE
+        }
+    })
 }
-export function loginInSpaceLog(params){
- return requestInstance({
-  url:'/user/addLoginLog',
-  data:{
-   ...params
-  }
- })
+
+export function loginInSpaceLog(params) {
+    return requestInstance({
+        url: '/user/addLoginLog',
+        data: {
+            ...params
+        }
+    })
 }
-export function getUserMyRole(params){
- return requestInstance({
-  url:'user/selectUserRole',
-  data:{
-   ...params
-  }
- })
+
+export function getUserMyRole(params) {
+    return requestInstance({
+        url: 'user/selectUserRole',
+        data: {
+            ...params
+        }
+    })
 }
-export function getUserMyRoleModule(params){
- return requestInstance({
-  url:'user/selectUserModule',
-  data:{
-   ...params
-  }
- })
+
+export function getUserMyRoleModule(params) {
+    return requestInstance({
+        url: 'user/selectUserModule',
+        data: {
+            ...params
+        }
+    })
 }
-export function getUserMyRoleClass(params){
- return requestInstance_KJGL({
-  url:'user/selectUserClass',
-  data:{
-   ...params
-  }
- })
+
+export function getUserMyRoleClass(params) {
+    return requestInstance_KJGL({
+        url: 'user/selectUserClass',
+        data: {
+            ...params
+        }
+    })
 }
-export function editZwLoginState(params){
- return requestInstance_PTJK({
-  url:'/user/editUserinfoLoginStates',
-  data:{
-   ...params
-  }
- })
+
+export function editZwLoginState(params) {
+    return requestInstance_PTJK({
+        url: '/user/editUserinfoLoginStates',
+        data: {
+            ...params
+        }
+    })
 }

+ 12 - 10
src/service/power-home/basicMap.js

@@ -1,11 +1,12 @@
 import {
-    requestInstance
+    requestInstance_KJLL,
+    requestInstance_YYFN
 } from "@/service/index";
 
 export const baseUrl = 'http://10.81.66.9:9250'
 
 export function selectInterfaceKoolkitMainPageList(RESOURCE_NAME, INTERFACE_STATE, pageSize, pageIndex) {
-    return requestInstance({
+    return requestInstance_YYFN({
         url: '/ptjkInterface/selectInterfaceKoolkitMainPageList',
         data: {
             'RESOURCE_NAME': RESOURCE_NAME,
@@ -19,7 +20,7 @@ export function selectInterfaceKoolkitMainPageList(RESOURCE_NAME, INTERFACE_STAT
 
 
 export function selectInterfaceKoolkitNewMainPageList(RESOURCE_NAME, RESOURCE_TYPE, INTERFACE_STATE, TYPE, pageSize, pageIndex) {
-    return requestInstance({
+    return requestInstance_YYFN({
         url: '/ptjkInterface/selectInterfaceKoolkitNewMainPageList',
         data: {
             'RESOURCE_NAME': RESOURCE_NAME,
@@ -34,7 +35,7 @@ export function selectInterfaceKoolkitNewMainPageList(RESOURCE_NAME, RESOURCE_TY
 }
 
 export function selectInterfaceKoolkitParameter(UUID) {
-    return requestInstance({
+    return requestInstance_YYFN({
         url: '/ptjkInterface/selectInterfaceKoolkitParameter',
         data: {
             'INTERFACE_UUID': UUID,
@@ -44,7 +45,7 @@ export function selectInterfaceKoolkitParameter(UUID) {
 }
 
 export function selectInterfaceKooleitMainType() {
-    return requestInstance({
+    return requestInstance_YYFN({
         url: '/ptjkInterface/selectInterfaceKooleitMainType',
         data: {
             "appkey": localStorage.getItem("yml_userkeycode")
@@ -53,7 +54,7 @@ export function selectInterfaceKooleitMainType() {
 }
 
 export function selectInterfaceKoolkitMain(UUID) {
-    return requestInstance({
+    return requestInstance_YYFN({
         url: '/ptjkInterface/selectInterfaceKoolkitMain',
         data: {
             'UUID': UUID,
@@ -65,7 +66,7 @@ export function selectInterfaceKoolkitMain(UUID) {
 
 export function addInterfaceKoolkitApply(INTERFACE_UUID, SHARED_FREQUENCY, SHARED_STARTTIME, SHARED_ENDTIME, USE_TERM, IP_ADDRESS, CONCURRENCY, DAY_LIMIT, APPLY_USER, APPLY_UNIT, APPLY_TIME, APPYL_REASON
 ) {
-    return requestInstance({
+    return requestInstance_YYFN({
         url: '/ptjkInterface/addInterfaceKoolkitApply',
         data: {
             "INTERFACE_UUID": INTERFACE_UUID,
@@ -80,14 +81,15 @@ export function addInterfaceKoolkitApply(INTERFACE_UUID, SHARED_FREQUENCY, SHARE
             "APPLY_UNIT": APPLY_UNIT,
             "APPLY_TIME": APPLY_TIME,
             "APPYL_REASON": APPYL_REASON,
-            "appkey": localStorage.getItem("ywxt_userkeycode")
         }
     });
 }
 
 export function batchInterfaceKoolkitApply(data) {
-    return requestInstance({
+    return requestInstance_YYFN({
         url: '/ptjkInterface/batchInterfaceKoolkitApply',
-        data: Object.assign(data, localStorage.getItem("ywxt_userkeycode"))
+        data: data
     });
 }
+
+

File diff suppressed because it is too large
+ 823 - 616
src/views/home-page/HomePage.vue


+ 0 - 1
src/views/power-home/util/gis/gescene/basicMap.vue

@@ -146,7 +146,6 @@
 
 <script setup>
 import CardPage from '@/common/card-page.vue'
-import biasMapDetailsOrAdd from './biasMapDetailsOrAdd.vue'
 import {showMessage} from "@/unit/element-ui/tip";
 import {
   baseUrl,

+ 2 - 2
vite.config.js

@@ -14,8 +14,8 @@ export default defineConfig({
       '/api': {
 
         // 代理请求之后的请求地址(你的真实接口地址)
-        target: 'https://cimweb.zjw.sh.cegn.cn:2007/data-business-prod/',
-        //target: 'http://localhost:9250/',
+        // target: 'https://cimweb.zjw.sh.cegn.cn:2007/data-business-prod/',
+        target: 'http://localhost:9250/',
         secure: false,
         ws: true,
         // 跨域