Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity

collect_information/package.json

@@ -2,7 +2,7 @@
   "name": "collect_information",
   "version": "1.0.0",
   "private": true,
-  "description": "小程序",
+  "description": "智慧派出所信息采集小程序",
   "templateInfo": {
     "name": "default",
     "typescript": true,

collect_information/project.config.json

@@ -6,7 +6,7 @@
     "urlCheck": false,
     "es6": false,
     "enhance": false,
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "postcss": false,
     "minified": false,
     "babelSetting": {
@@ -27,5 +27,6 @@
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
-  }
+  },
+  "appid": "wx8902ddbfddb820d1"
 }

collect_information/project.private.config.json

@@ -7,6 +7,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/projectManager/myProject/myProject",
+          "pathName": "pages/projectManager/myProject/myProject",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "",
           "pathName": "pages/mine/mine",

collect_information/src/app.config.ts

@@ -6,6 +6,7 @@ export default defineAppConfig({
     'pages/policeManager/index/index',
     'pages/mine/mine',
     'pages/employeeInfo/employeeInfo',
+    'pages/projectManager/myProject/myProject'
   ],
   window: {
     backgroundTextStyle: 'light',

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

@@ -11,7 +11,7 @@
       <nut-grid :column-num="3">
         <nut-grid-item
             text="我的项目"
-            @click="Taro.navigateTo({url: '/pages/index/dataEntry/buildFloorEntry/buildFloorEntry'})">
+            @click="Taro.navigateTo({url: '/pages/projectManager/myProject/myProject'})">
         </nut-grid-item>
         <nut-grid-item
             text="警保风采"

collect_information/src/pages/projectManager/myProject/myproject.config.ts

@@ -0,0 +1,4 @@
+
+export default definePageConfig({
+    navigationBarTitleText: '我的项目',
+})

collect_information/src/pages/projectManager/myProject/myproject.scss

@@ -0,0 +1,4 @@
+.myProject{
+  background: red;
+  height: 100vh;
+}

collect_information/src/pages/projectManager/myProject/myproject.vue

@@ -0,0 +1,41 @@
+<template>
+   <view class="myProject">
+       <view>
+           <text></text>
+           <view>望月湖二期66666666望月湖二期111</view>
+       </view>
+   </view>
+</template>
+
+<script setup lang="ts">
+import api from "@/request/index";
+import {onMounted} from "vue";
+import Taro from "@tarojs/taro";
+
+const getMyServiceProject = async()=>{
+  console.log(11112)
+  const token = Taro.getStorageSync('token')
+  const resp =  await  api.get(`/projectManageIndex/getMyServiceProject`,{
+      token:token.value
+  })
+  console.log(resp.data)
+}
+
+
+const  dataList = [
+  {
+    address:'12313',
+    name:'望月湖',
+    provincename:'湖南省',
+    remark:'123123',
+    streetName:'望月湖街道'
+  }
+]
+onMounted(async ()=>{
+ await getMyServiceProject()
+})
+</script>
+
+<style scoped lang="scss">
+
+</style>

collect_information/src/request/index.ts

@@ -59,6 +59,7 @@ class CustomRequest {
             duration: 2000
           }).then()
           reject(res.errMsg);
+          console.log(res.errMsg,'000')
         }
       })
     })

securityManagement/src/views/serviceManagement/index.vue

@@ -239,7 +239,7 @@ const getAdministrativeDivisionTree = async ()=>{
 // 项目经理接口
 const userNameOptions = ref([])
 const projectManagerMiniProgram = async()=>{
-  const resp = await api.get('/securityUnit/listProjectManager')
+  const resp = await api.get('/management/security/listProjectManager')
   userNameOptions.value = resp.data as any
 }
 

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('/managementSecurityUnitUser/pager', params)  //分页
+const reqApi: TableProps['requestApi'] = (params) => api.post('/management/security/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('/managementSecurityUnitUser/deleteById', {
+                  const resp = await api.delete('/management/security/user/deleteById', {
                     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('/managementSecurityUnitUser/saveOrUpdate', managementSecurityUnitUserSaveOrUpdateParams)
+  const resp = await api.post('/management/security/user/saveOrUpdate', managementSecurityUnitUserSaveOrUpdateParams)
   message.success(resp.message)
   tableRef.value?.requestGetTableData()
   closeModal()