Merge remote-tracking branch 'origin/main'

collect_information/src/pages/projectManager/index/index.vue

@@ -53,8 +53,8 @@ import icon02 from '@/assets/images/工单.jpg'
 import icon03 from '@/assets/images/排名.jpg'
 import icon04 from '@/assets/images/法制宣传.jpg'
 import icon06 from '@/assets/images/警保风采.jpg'
-
 import './index.scss'
+
 const list = ref([process.env.TARO_APP_MINIO_URL + '/police-security/2024/11/5/dunpai.jpg'])
 const swiperRef = ref() //轮播图
 const subModuleList = ref([

collect_information/src/pages/register/register.vue

@@ -160,7 +160,7 @@ const register = async () => {
           identity: formData.value.identity,
           unitId: formData.value.unitId
         }
-        const resp = await api.post<string>('/miniProgramUser/register', miniProgramUserRegisterParams, {loading: true})
+        const resp = await api.post<string>('/mp/user/register', miniProgramUserRegisterParams, {loading: true})
         Taro.showToast({
           title: "注册成功",
           icon: 'success',

collect_information/src/subPages/projectManager/myProject/myProject.vue

@@ -48,7 +48,7 @@ import {MyProjectList, ServiceProjectList} from "@/types/subPages/projectManager
 const myProjectList = ref<MyProjectList[]>()
 const number = ref(0)
 const getMyServiceProject = async () => {
-  const resp = await api.get<MyProjectList[]>(`/projectManageIndex/getMyServiceProject`)
+  const resp = await api.get<MyProjectList[]>(`/mp/pmi/get_my_sp`)
   myProjectList.value = resp.data
   number.value = (resp.data?.length || 0)
 }

collect_information/src/subPages/projectManager/myProject/projectDetails/projectDetails.vue

@@ -169,7 +169,7 @@ const projectDetailsTable = async () => {
       current: current.value
     }
   }
-  const resp = await api.post<PagerVo<ServiceProjectSecurityUserPagerVo>>('/miniProgramUser/securityUserPager', queryParams)
+  const resp = await api.post<PagerVo<ServiceProjectSecurityUserPagerVo>>('/mp/user/securityUserPager', queryParams)
   securityUserList.value = [...securityUserList.value, ...resp.data!.records]
   total.value = resp.data!.total
   isRefresher.value = false
@@ -228,7 +228,7 @@ const deleteUssrID = (snowFlakeId: string) => {
 }
 // 二次删除
 const dialogOk = async () => {
-  await api.delete(`/projectManageIndex/deleteSecurityUserByServiceProjectId`, {securityUserId: securityUserId.value})
+  await api.delete(`/mp/user/del_security_user_id`, {securityUserId: securityUserId.value})
   initServiceProjectSecurityUserList()
 }
 // 详情
@@ -248,7 +248,7 @@ const generateMiniProgramQRCode = async () => {
     width: 200,
   }
   qrcodeVisible.value = true
-  const resp = await api.get('/projectManageIndex/shareForm_QR_Code', paramsData, {
+  const resp = await api.get('/wx/qrCode', paramsData, {
     header: {
       "content-type": 'application/x-www-form-urlencoded'
     },

collect_information/src/subPages/projectManager/securityUserForm/securityUserForm.vue

@@ -129,9 +129,9 @@ const submit = () => {
     if (valid) {
       let url: string;
       if (type.value === 'formInput') {
-        url = '/projectManageIndex/saveOrUpdateSecurityUser'
+        url = '/mp/user/add_security_user_upd'
       } else {
-        url = '/miniProgramUser/qrCodeFormInputSecurityUser'
+        url = '/mp/user/qrCodeFormInputSecurityUser'
       }
       const resp = await api.post(url, formData.value)
       Taro.showToast({

securityManagement/src/config/index.ts

@@ -23,7 +23,7 @@ export const SYSTEM_MENUS: SystemMenu[] = [
         type: 'dir',
         children: [
             {
-                title: '后台管理',
+                title: '后台用户',
                 name: 'bgManagement',
                 path: '/bgManagement',
                 icon:'icon-guanlianbaoan',

securityManagement/src/views/serviceManagement/index.vue

@@ -42,7 +42,7 @@ type TableProps = TableProMaxProps<serviceProjectSaveOrUpdateParams>  //需要
 
 const tableRef = ref<ComponentExposed<typeof TableProMax>>(null!)
 // table表格
-const reqApi: TableProps['requestApi'] = (params) => api.post('/serviceProject/pager', params)  //分页
+const reqApi: TableProps['requestApi'] = (params) => api.post('/m3/sp/pager', params)  //分页
 
 
 const searchFormOptions: TableProps["searchFormOptions"] = {
@@ -196,7 +196,7 @@ const columns: TableProps['columns'] = [
         <a-popconfirm
             title="确认删除账号吗?"
             onConfirm={async () => {
-              const resp = await api.delete('/serviceProject/deleteById', {
+              const resp = await api.delete('/m3/sp/del_id', {
                 serviceProjectId: record.snowFlakeId,
               })
               message.success(resp.message)
@@ -243,7 +243,7 @@ const getAdministrativeDivisionTree = async ()=>{
 // 项目经理接口
 const userNameOptions = ref([])
 const projectManagerMiniProgram = async()=>{
-  const resp = await api.get('/management/security/listProjectManager')
+  const resp = await api.get('/m3/list_p_m')
   userNameOptions.value = resp.data as any
 }
 
@@ -276,7 +276,7 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
     componentsProps:{
       showSearch:true,
       onChange: async (values:any)=>{
-          const resp = await  api.post<SelectNodeVo<string>[]>('/enterprisesUnit/queryListByAdministrativeDivisionCodes',values)
+          const resp = await  api.post<SelectNodeVo<string>[]>('/eu/list_ad_codes',values)
           enterprisesUnitIdList.value = resp.data
       },
     }
@@ -425,7 +425,7 @@ const submit = async()=>{
     securityUserTotal:formParams.value.securityUserTotal,
     remark: formParams.value.remark,
   }
-  const resp = await  api.post('/serviceProject/saveOrUpdate',serviceProjectSaveOrUpdateParams)
+  const resp = await  api.post('/m3/sp/add_upd',serviceProjectSaveOrUpdateParams)
   message.success(resp.message)
   await tableRef.value?.requestGetTableData()
   await closeModal()

securityManagement/src/views/userManagement/bgManagement/index.vue

@@ -43,7 +43,7 @@ type TableProps = TableProMaxProps<BgManagementPagerQueryParams>
 
 const tableRef = ref<ComponentExposed<typeof TableProMax>>(null!)
 // table表格
-const reqApi: TableProps['requestApi'] = (params) => api.post('/management/security/user/pager', params)  //分页
+const reqApi: TableProps['requestApi'] = (params) => api.post('/m3/user/pager', params)  //分页
 const columns: TableProps['columns'] = [
   {
     dataIndex: 'account',
@@ -95,7 +95,7 @@ const columns: TableProps['columns'] = [
                 style="width:100%"
                 title="确认删除账号吗?"
                 onConfirm={async () => {
-                  const resp = await api.delete('/management/security/user/deleteById', {
+                  const resp = await api.delete('/m3/user/del_id', {
                     managementSecurityUnitUserId: record.snowFlakeId,
                   })
                   message.success(resp.message)
@@ -215,7 +215,7 @@ const submit = async () => {
     isEnable: formParams.value.isEnable,
     remark: formParams.value.remark
   }
-  const resp = await api.post('/management/security/user/saveOrUpdate', managementSecurityUnitUserSaveOrUpdateParams)
+  const resp = await api.post('/m3/user/add_upd', managementSecurityUnitUserSaveOrUpdateParams)
   message.success(resp.message)
   tableRef.value?.requestGetTableData()
   closeModal()