diff --git a/app/frontend/src/api/regionmodule/region/index.ts b/app/frontend/src/api/regionmodule/region/index.ts new file mode 100644 index 0000000..5d5c414 --- /dev/null +++ b/app/frontend/src/api/regionmodule/region/index.ts @@ -0,0 +1,64 @@ +import request from '@/utils/request'; + + +//查询行政区域列表 +export function queryRegionList(params:any){ + return request({ + url: '/base/region/queryRegionList' , + method: 'get', + params: params + }); +} +//查询行政区域树 +export function queryRegion(params:any){ + return request({ + url: '/base/region/queryRegion' , + method: 'get', + params: params + }); +} +//根据Id查询行政区域 +export function queryRegionById(params:any){ + return request({ + url: '/base/region/queryRegionById' , + method: 'get', + params: params + }); +} +//新增行政区域 +export function addRegion(data:any){ + return request({ + url:'/base/region/addRegion' , + method: 'post', + data: data + }); +} +//修改行政区域 +export function updateRegion(data:any){ + return request({ + url:'/base/region/updateRegion' , + method: 'post', + data: data + }); +} +//修改行政区域 +export function delRegion(queryParams:any){ + return request({ + url:'/base/region/delRegion' , + method: 'post', + params: queryParams + }); +} + + +//导出行政区域 +export function exportExcel(queryParams: any) { + return request({ + url: '/base/region/exportExcel', + method: 'get', + params: queryParams, + responseType: 'arraybuffer' + }); +} + + diff --git a/app/frontend/src/views/dashboard/index.vue b/app/frontend/src/views/dashboard/index.vue index 5bd44eb..87d4a04 100644 --- a/app/frontend/src/views/dashboard/index.vue +++ b/app/frontend/src/views/dashboard/index.vue @@ -6,596 +6,6 @@ export default { } diff --git a/app/frontend/src/views/system/user/index.vue b/app/frontend/src/views/system/user/index.vue index c3520dc..afa2a17 100644 --- a/app/frontend/src/views/system/user/index.vue +++ b/app/frontend/src/views/system/user/index.vue @@ -21,10 +21,10 @@ import { import { ElMessageBox, ElMessage } from "element-plus"; import { useAppStore } from '@/store/modules/app'; import Page from '@/components/Pagination/page.vue' -import VisionInstitution from './visionInstitution.vue' -import { queryVisionInstitutionById } from "@/api/regionmodule/visionInstitution"; +// import VisionInstitution from './visionInstitution.vue' +// import { queryVisionInstitutionById } from "@/api/regionmodule/visionInstitution"; import { Search } from '@element-plus/icons-vue' -import { queryVisionInstitutionNameList } from "@/api/regionmodule/visionInstitution"; +// import { queryVisionInstitutionNameList } from "@/api/regionmodule/visionInstitution"; import { useUserStore } from '@/store/modules/user'; const userStore = useUserStore(); // import { constant } from "lodash"; @@ -190,11 +190,11 @@ function editdepartment(row: any) { selectID.push(item.id) }) institutionName.value = "" - if(row.institution_id !=null && row.institution_id !=''){ - queryVisionInstitutionById({id:row.institution_id}).then((res) => { - institutionName.value = res.data.name - }); - } + // if(row.institution_id !=null && row.institution_id !=''){ + // queryVisionInstitutionById({id:row.institution_id}).then((res) => { + // institutionName.value = res.data.name + // }); + // } getOrgPower() info.value = JSON.parse(JSON.stringify(row)); info.value.roleinfo = selectID; @@ -453,23 +453,23 @@ function institutionClick(e:any){ } const queryName = ref('') function getTreeInit() { - queryName.value = queryName.value.replace(/\s+/g, ""); - let params = { - name: queryName.value - }; - treeloading.value = true - treedata.value = [] - queryVisionInstitutionNameList(params).then((res) => { - treedata.value = res.data - treedata.value.unshift({ - id:'', - name:'全部机构' - }) + // queryName.value = queryName.value.replace(/\s+/g, ""); + // let params = { + // name: queryName.value + // }; + // treeloading.value = true + // treedata.value = [] + // queryVisionInstitutionNameList(params).then((res) => { + // treedata.value = res.data + // treedata.value.unshift({ + // id:'', + // name:'全部机构' + // }) - treeloading.value = false - }).catch(()=>{ - treeloading.value = false - }); + // treeloading.value = false + // }).catch(()=>{ + // treeloading.value = false + // }); } @@ -600,10 +600,10 @@ function getTreeInit() { 保存 - - + --> diff --git a/app/frontend/vite.config.ts b/app/frontend/vite.config.ts index 60757b9..40d99a2 100644 --- a/app/frontend/vite.config.ts +++ b/app/frontend/vite.config.ts @@ -33,9 +33,9 @@ export default ({ mode }: ConfigEnv): UserConfig => { proxy: { [env.VITE_APP_BASE_API]: { //线上API地址 - target: 'https://edu.mmhyvision.com:8445', + // target: 'https://edu.mmhyvision.com:8445', // 本地API地址 - // target: 'http://192.168.1.60:8093', + target: 'http://localhost:8093', changeOrigin: true, rewrite: path => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') diff --git a/frontend/src/views/dashboard/index.vue b/frontend/src/views/dashboard/index.vue index b38d0e2..d0f23a2 100644 --- a/frontend/src/views/dashboard/index.vue +++ b/frontend/src/views/dashboard/index.vue @@ -4,98 +4,7 @@
- - - -
-
- -
-
-
访问数
-
1000
-
-
-
- - -
-
- -
-
-
消息数
-
1000
-
-
-
- - -
-
- -
-
-
收入金额
-
1000
-
-
-
- -
-
- -
-
-
订单数
-
1000
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - +