From e9f6f61b2160db56c75bb73b0c734c8b196d1866 Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Sat, 14 Sep 2024 15:55:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/src/app.ts                | 38 +++++++++---------
 .../src/subPages/pages/form/form.vue          |  1 -
 .../subPages/pages/myProject/myProject.vue    | 39 ++++++++++++-------
 .../src/views/serviceManagement/index.vue     | 17 ++++----
 4 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/collect_information/src/app.ts b/collect_information/src/app.ts
index 150d716..95a2ac5 100644
--- a/collect_information/src/app.ts
+++ b/collect_information/src/app.ts
@@ -10,25 +10,25 @@ const pinia = createPinia()
 // pinia.use(piniaPluginPersistedstate)
 const App = createApp({
   onShow(options) {
-    try {
-      const store = useCounterStore()
-      const token = Taro.getStorageSync('token')
-      console.log(token)
-      if (token) {
-        Taro.switchTab({
-          url: '/pages/mine/mine'
-          // url: '/pages/projectManager/index/index'
-
-        })
-        store.setSelected(2)
-      } else {
-        console.log(2222)
-      }
-      console.log('App onShow.')
-    } catch (err) {
-      console.log(err)
-
-    }
+    // try {
+    //   const store = useCounterStore()
+    //   const token = Taro.getStorageSync('token')
+    //   console.log(token)
+    //   if (token) {
+    //     Taro.switchTab({
+    //       url: '/pages/mine/mine'
+    //       // url: '/pages/projectManager/index/index'
+    //
+    //     })
+    //     store.setSelected(2)
+    //   } else {
+    //     console.log(2222)
+    //   }
+    //   console.log('App onShow.')
+    // } catch (err) {
+    //   console.log(err)
+    //
+    // }
 
   },
   // 入口组件不需要实现 render 方法，即使实现了也会被 taro 所覆盖
diff --git a/collect_information/src/subPages/pages/form/form.vue b/collect_information/src/subPages/pages/form/form.vue
index 3fd8a3a..04281ae 100644
--- a/collect_information/src/subPages/pages/form/form.vue
+++ b/collect_information/src/subPages/pages/form/form.vue
@@ -1,6 +1,5 @@
 <template>
   <view class="form">
-    {{ formData }}
     <nut-form ref="formRef" :model-value="formData" :rules="rules">
       <nut-form-item label="姓名" prop="name">
         <nut-input v-model="formData.name" placeholder="请输入姓名" type="text"/>
diff --git a/collect_information/src/subPages/pages/myProject/myProject.vue b/collect_information/src/subPages/pages/myProject/myProject.vue
index a40568b..68aba24 100644
--- a/collect_information/src/subPages/pages/myProject/myProject.vue
+++ b/collect_information/src/subPages/pages/myProject/myProject.vue
@@ -1,23 +1,31 @@
 <template>
   <view class="myProject">
-    <view class="myProjectItem" v-for="(item,index) in myProjectList" :key="index">
-      <view style="display: flex;justify-content: space-between">
-        <text>{{ item?.name }}</text>
-        <!--<text>进行中</text>-->
-      </view>
-      <view class="myProjectIndex">地址：
-        <text>{{ item?.provinceName }}{{ item.cityName }}{{ item.districtsName }}{{ item.streetName }}</text>
-      </view>
-      <view style="display: flex;justify-content: space-between">
-        <text>联系人：{{ item?.contactPersonInfo.name }}</text>
-        <text>电话：{{ item?.contactPersonInfo.telephone }}</text>
-      </view>
-      <view class="project">
-        <view @click="projectClick(items,item?.name)" v-for="(items,index) in item.serviceProjectList" :key="index">
-          {{ items.name }}
+    <view v-if="myProjectList">
+      <view  class="myProjectItem" v-for="(item,index) in myProjectList" :key="index">
+        <view style="display: flex;justify-content: space-between">
+          <text>{{ item?.name }}</text>
+          <!--<text>进行中</text>-->
+        </view>
+        <view class="myProjectIndex">地址：
+          <text>{{ item?.provinceName }}{{ item.cityName }}{{ item.districtsName }}{{ item.streetName }}</text>
+        </view>
+        <view style="display: flex;justify-content: space-between">
+          <text>联系人：{{ item?.contactPersonInfo.name }}</text>
+          <text>电话：{{ item?.contactPersonInfo.telephone }}</text>
+        </view>
+        <view class="project">
+          <view @click="projectClick(items,item?.name)" v-for="(items,index) in item.serviceProjectList" :key="index">
+            {{ items.name }}
+          </view>
         </view>
       </view>
     </view>
+    <view v-else class="myProject" >
+      <nut-empty image="empty" description="暂无项目">
+        <div style="margin-top: 10px">
+        </div>
+      </nut-empty>
+    </view>
   </view>
 </template>
 
@@ -31,6 +39,7 @@ const myProjectList = ref<MyProjectList[]>()
 const getMyServiceProject = async () => {
   const resp = await api.get<MyProjectList[]>(`/projectManageIndex/getMyServiceProject`)
   myProjectList.value = resp.data
+  console.log(myProjectList.value.length)
 }
 
 const projectClick = (items: ServiceProjectList, name: string) => {
diff --git a/securityManagement/src/views/serviceManagement/index.vue b/securityManagement/src/views/serviceManagement/index.vue
index 22dd2e5..817c081 100644
--- a/securityManagement/src/views/serviceManagement/index.vue
+++ b/securityManagement/src/views/serviceManagement/index.vue
@@ -113,7 +113,8 @@ const columns: TableProps['columns'] = [
     dataIndex: 'enterprisesUnitName',
     title: '企事业单位名称',
     width: 150,
-    ellipsis: true
+    ellipsis: true,
+
   },
   {
     dataIndex:'type',
@@ -192,7 +193,7 @@ const columns: TableProps['columns'] = [
           <a-button type="primary" danger>删除</a-button>
         </a-popconfirm>
         <a-button type="primary" onClick={ async ()=>{
-          console.log(record)
+          // console.log(record)
           visible.value = true
           serviceTitle.value = '编辑服务项目'
           if(record.isRecruitSecurity === null ){
@@ -207,7 +208,7 @@ const columns: TableProps['columns'] = [
               idNumberDisabled.value = true
             }
           }
-          formParams.value.projectManagerMiniProgramUserId = record.projectManagerMiniProgramUserName
+          formParams.value.projectManagerMiniProgramUserId = record.projectManagerMiniProgramUserId
           formParams.value.snowFlakeId = record.snowFlakeId
           formParams.value.name = record.name
           formParams.value.type = record.type.value
@@ -218,9 +219,7 @@ const columns: TableProps['columns'] = [
           formParams.value.houseTotal = record.houseTotal
           formParams.value.staffTotal =  record.staffTotal
           formParams.value. securityUserTotal = record.securityUserTotal
-
           formParams.value.enterprisesUnitId = record.enterprisesUnitName
-          enterprisesUnitId.value = record.enterprisesUnitId
           formParams.value.administrativeDivisionCodes = record.enterprisesUnitAdministrativeDivisionCodes
         }}>编辑</a-button>
       </a-space>
@@ -278,7 +277,11 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
      label:'企事业单位',
      options:enterprisesUnitIdList,
      componentsProps:{
-      allowClear:true
+      allowClear:true,
+       onChange:async (value:string)=>{
+         console.log(value)
+         enterprisesUnitId.value = value
+       }
     }
   },
   type: {
@@ -368,10 +371,10 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
     label: '备注',
   }
 })
+const UnitId = ref('')
 const submit = async()=>{
   await formRef.value.validate()
   const snowFlakeId = ref('')
-  const UnitId = ref('')
   if (serviceTitle.value === '新增服务项目') {
     snowFlakeId.value = ''
     UnitId.value = formParams.value.enterprisesUnitId

From 70183bdde754ab80e6735ed209a097139ac77540 Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Sat, 14 Sep 2024 17:50:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/package.json              |   1 +
 collect_information/src/app.config.ts         |   1 -
 .../form/PersonnelInformationEntryForm.vue    | 225 ------------------
 .../subPages/pages/myProject/myProject.vue    |   6 +-
 .../pages/projectDetails/projectDetails.vue   |  11 +-
 5 files changed, 12 insertions(+), 232 deletions(-)
 delete mode 100644 collect_information/src/components/form/PersonnelInformationEntryForm.vue

diff --git a/collect_information/package.json b/collect_information/package.json
index b1af349..fe307ce 100644
--- a/collect_information/package.json
+++ b/collect_information/package.json
@@ -71,6 +71,7 @@
     "@tarojs/webpack5-runner": "3.6.25",
     "@types/jest": "^29.3.1",
     "@types/node": "^18.15.11",
+    "@types/qrcode": "^1.5.5",
     "@types/webpack-env": "^1.13.6",
     "@typescript-eslint/eslint-plugin": "^6.2.0",
     "@typescript-eslint/parser": "^6.2.0",
diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts
index 32cd338..c2b33bf 100644
--- a/collect_information/src/app.config.ts
+++ b/collect_information/src/app.config.ts
@@ -19,7 +19,6 @@ export default defineAppConfig({
       pages: [
         'pages/policeManager/index',
         'pages/policeDetails/index',
-
         'pages/myProject/myProject',
         'pages/projectDetails/projectDetails',
         'pages/form/form'
diff --git a/collect_information/src/components/form/PersonnelInformationEntryForm.vue b/collect_information/src/components/form/PersonnelInformationEntryForm.vue
deleted file mode 100644
index c283038..0000000
--- a/collect_information/src/components/form/PersonnelInformationEntryForm.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<template>
-  <view>
-    <nut-form ref="formRef" :model-value="formParams" :rules="rules">
-      <nut-form-item label="街道/社区：" prop="streetCommunity">
-        <view @click="streetCommunitySmallCommunityVisible = true">
-          {{ streetCommunitySmallCommunityLabel || "请选择街道/小区" }}
-        </view>
-      </nut-form-item>
-      <nut-form-item label="楼栋/门户：" prop="residentialDivision">
-        <view @click="buildingFloorHouseVisible = true">
-          {{ buildingFloorHouseLabel || "请选择楼栋/门户" }}
-        </view>
-      </nut-form-item>
-      <nut-form-item label="姓名：" prop="name">
-        <nut-input
-          v-model="formParams.name"
-          placeholder="请输入姓名"
-          type="text"
-        />
-      </nut-form-item>
-      <nut-form-item label="性别：" prop="sex">
-        <nut-radio-group v-model="formParams.sex" direction="horizontal">
-          <nut-radio v-for="item in SEX" :key="item.value" :label="item.value"
-            >{{ item.label }}
-          </nut-radio>
-        </nut-radio-group>
-      </nut-form-item>
-      <nut-form-item label="出生日期：" prop="dataOfBirth">
-        <view @click="dataOfBirthVisible = true">
-          {{
-            dayjs(formParams.dataOfBirth).format("YYYY-MM-DD") ||
-            "请选择出生日期"
-          }}
-        </view>
-      </nut-form-item>
-      <nut-form-item label="身份证：" prop="idCard">
-        <nut-input
-          v-model="formParams.idCard"
-          placeholder="请输入身份证"
-          type="text"
-        />
-      </nut-form-item>
-      <nut-form-item label="手机号：" prop="phone">
-        <nut-input
-          v-model="formParams.phone"
-          placeholder="请输入手机号码"
-          type="text"
-        />
-      </nut-form-item>
-      <nut-form-item label="户籍地：" prop="householdRegistrationAddress">
-        <nut-input
-          v-model="formParams.householdRegistrationAddress"
-          placeholder="请输入户籍地"
-          type="text"
-        />
-      </nut-form-item>
-    </nut-form>
-    <nut-cascader
-      v-model:visible="streetCommunitySmallCommunityVisible"
-      v-model="formParams.streetCommunitySmallCommunityIds"
-      :options="streetCommunitySmallCommunityTreeData"
-      title="选择街道/社区"
-      text-key="label"
-      @change="streetCommunitySmallCommunityChange"
-    ></nut-cascader>
-    <nut-cascader
-      v-model:visible="buildingFloorHouseVisible"
-      v-model="formParams.buildingFloorHouseIds"
-      :options="buildingFloorHouseTreeData"
-      title="选择楼栋/门户"
-      text-key="label"
-      @change="buildingFloorHouseChange"
-    ></nut-cascader>
-    <nut-popup v-model:visible="dataOfBirthVisible" position="bottom">
-      <nut-date-picker
-        v-model="formParams.dataOfBirth"
-        :min-date="min"
-        :max-date="max"
-        :three-dimensional="false"
-        @confirm="dataOfBirthVisible = false"
-      ></nut-date-picker>
-    </nut-popup>
-  </view>
-</template>
-<script setup lang="ts">
-import { SEX } from "@/enums";
-import dayjs from "dayjs";
-import { ref, watch } from "vue";
-import type { FormRules } from "@nutui/nutui-taro/dist/types/__VUE/form/types";
-import api from "@/request";
-import type { FormInstance } from "@nutui/nutui-taro";
-import { useLoad } from "@tarojs/taro";
-
-const emits = defineEmits(["update:modelValue"]);
-const props = withDefaults(
-  defineProps<{
-    modelValue: PersonnelInformation;
-  }>(),
-  {
-    modelValue: () => {
-      return {
-        name: "",
-        sex: 0,
-        dataOfBirth: new Date(),
-        idCard: "",
-        phone: "",
-        householdRegistrationAddress: "",
-        streetCommunitySmallCommunityIds: [],
-        buildingFloorHouseIds: [],
-      } as PersonnelInformation;
-    },
-  }
-);
-
-const defaultParams = { ...props.modelValue };
-
-const formRef = ref<FormInstance>();
-const formParams = ref<PersonnelInformation>({
-  ...props.modelValue,
-});
-const rules: FormRules = {
-  name: [
-    { required: true, message: "请输入姓名" },
-    {
-      validator: (value) => {
-        return !(value.length < 2 || value.length >= 20);
-      },
-      message: "名字在2~20字符之间",
-    },
-  ],
-  sex: [{ required: true, message: "请选择性别" }],
-  idCard: [
-    { required: true, message: "请输入身份证" },
-    {
-      regex:
-        /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-      message: "身份证格式错误",
-    },
-  ],
-  phone: [
-    { required: true, message: "请输入手机号码" },
-    {
-      regex: /^400(-?)[0-9]{7}$|^1\d{10}$|^0[0-9]{2,3}-[0-9]{7,8}$/,
-      message: "手机格式错误",
-    },
-  ],
-};
-
-watch(formParams.value, (n) => {
-  emits("update:modelValue", n);
-});
-
-const dataOfBirthVisible = ref(false);
-const min = new Date(1920, 0, 1);
-const max = new Date(2025, 10, 1);
-
-defineExpose<{
-  validate: () => Promise<unknown>;
-  resetForm: () => void;
-}>({
-  validate: async (): Promise<unknown> => {
-    const result = (await formRef.value?.validate()) as any;
-    if (result.valid) {
-      return Promise.resolve("校验通过");
-    }
-    return Promise.reject("校验不通过");
-  },
-  resetForm: () => {
-    for (let key in defaultParams) {
-      formParams.value[key] = defaultParams[key];
-    }
-    streetCommunitySmallCommunityLabel.value = "";
-    buildingFloorHouseLabel.value = "";
-    buildingFloorHouseTreeData.value = [];
-  },
-});
-
-const streetCommunitySmallCommunityTreeData = ref<TreeNode<string>[]>([]);
-const streetCommunitySmallCommunityVisible = ref<boolean>(false);
-const streetCommunitySmallCommunityLabel = ref<string>("");
-const streetCommunitySmallCommunityChange = (
-  value: string,
-  pathNodes: Record<string, any>[]
-) => {
-  buildingFloorHouseLabel.value = "";
-  formParams.value.buildingFloorHouseIds = [];
-  buildingFloorHouseTreeData.value = [];
-  streetCommunitySmallCommunityLabel.value = pathNodes
-    .map((e) => e.text)
-    .join(",");
-  getBuildingFloorHouseTreeBySmallCommunityId(value[value.length - 1]);
-};
-
-const buildingFloorHouseVisible = ref<boolean>(false);
-const buildingFloorHouseLabel = ref<string>("");
-const buildingFloorHouseChange = (
-  value: string,
-  pathNodes: Record<string, any>[]
-) => (buildingFloorHouseLabel.value = pathNodes.map((e) => e.text).join(","));
-const buildingFloorHouseTreeData = ref<TreeNode<string>[]>([]);
-
-const getBuildingFloorHouseTreeBySmallCommunityId = (
-  smallCommunityId: string
-) => {
-  api
-    .get<TreeNode<string>[]>(
-      "/residentialDivision/getBuildingFloorHouseTreeBySmallCommunityId",
-      { smallCommunityId }
-    )
-    .then((resp) => {
-      buildingFloorHouseTreeData.value = resp.data as TreeNode<string>[];
-    });
-};
-
-useLoad(() => {
-  api
-    .get<TreeNode<string>[]>(
-      "/residentialDivision/streetCommunitySmallCommunityTree"
-    )
-    .then((resp) => {
-      streetCommunitySmallCommunityTreeData.value =
-        resp.data as TreeNode<string>[];
-    });
-});
-</script>
diff --git a/collect_information/src/subPages/pages/myProject/myProject.vue b/collect_information/src/subPages/pages/myProject/myProject.vue
index 68aba24..06eedd0 100644
--- a/collect_information/src/subPages/pages/myProject/myProject.vue
+++ b/collect_information/src/subPages/pages/myProject/myProject.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="myProject">
-    <view v-if="myProjectList">
+    <view v-if="number !== 0">
       <view  class="myProjectItem" v-for="(item,index) in myProjectList" :key="index">
         <view style="display: flex;justify-content: space-between">
           <text>{{ item?.name }}</text>
@@ -36,10 +36,12 @@ import Taro from "@tarojs/taro";
 import './myproject.scss'
 
 const myProjectList = ref<MyProjectList[]>()
+
+const number = ref(0)
 const getMyServiceProject = async () => {
   const resp = await api.get<MyProjectList[]>(`/projectManageIndex/getMyServiceProject`)
   myProjectList.value = resp.data
-  console.log(myProjectList.value.length)
+  number.value = resp.data.length
 }
 
 const projectClick = (items: ServiceProjectList, name: string) => {
diff --git a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
index 8ce4b28..a04f043 100644
--- a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
@@ -110,21 +110,22 @@
   </view>
 </template>
 <script setup lang="ts">
-import Taro, {useLoad, useDidShow} from "@tarojs/taro";
+import Taro, {useDidShow, useLoad} from "@tarojs/taro";
 import './projectDetails.scss'
 import {ref} from "vue";
 import api from "@/request/index";
 import * as dayjs from 'dayjs'
 
+
 const serviceProjectDetails = ref()
 const nameValue = ref('')
 const projectData = ref<Records[]>([])
-
-
 const content = ref<Records>({} as any)
 // 控制模态框的显示状态
 const confirmVisible = ref(false);
 const detailVisible = ref(false)
+
+
 useLoad(async (options: MyProjectList) => {
   nameValue.value = options.name
   serviceProjectDetails.value = await JSON.parse(options.item)
@@ -209,7 +210,6 @@ const dialogOk = async () => {
   })
   initServiceProjectSecurityUserList()
 }
-
 // 详情
 const detail = (item) => {
   detailVisible.value = true
@@ -220,6 +220,9 @@ const projectEdit = (item) => {
   Taro.navigateTo({url: `/subPages/pages/form/form?item=${JSON.stringify(params)}`})
 }
 
+
+
+
 </script>
 <style scoped lang="scss">
 

From ce552b3e0ee0aab1cc15480b926a477db4950559 Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Sat, 14 Sep 2024 17:51:54 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/package.json        | 2 +-
 collect_information/project.config.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/collect_information/package.json b/collect_information/package.json
index fe307ce..f7d1452 100644
--- a/collect_information/package.json
+++ b/collect_information/package.json
@@ -2,7 +2,7 @@
   "name": "collect_information",
   "version": "1.0.0",
   "private": true,
-  "description": "智慧派出所信息采集小程序",
+  "description": "警保联勤联动小程序",
   "templateInfo": {
     "name": "default",
     "typescript": true,
diff --git a/collect_information/project.config.json b/collect_information/project.config.json
index 4850484..4959a1d 100644
--- a/collect_information/project.config.json
+++ b/collect_information/project.config.json
@@ -1,7 +1,7 @@
 {
   "miniprogramRoot": "dist/",
   "projectname": "collect_information",
-  "description": "智慧派出所信息采集小程序",
+  "description": "警保联勤联动小程序",
   "setting": {
     "urlCheck": false,
     "es6": false,
@@ -29,4 +29,4 @@
     "tabSize": 2
   },
   "appid": "wx8902ddbfddb820d1"
-}
\ No newline at end of file
+}

From 640d76faa877171a6d353ceee8be6312afd2872e Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Wed, 18 Sep 2024 10:03:53 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subPages/pages/policeDetails/index.scss   | 24 ++++++++++++++--
 .../subPages/pages/policeDetails/index.vue    | 28 +++++++++++++------
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/collect_information/src/subPages/pages/policeDetails/index.scss b/collect_information/src/subPages/pages/policeDetails/index.scss
index b495b04..3bddb3c 100644
--- a/collect_information/src/subPages/pages/policeDetails/index.scss
+++ b/collect_information/src/subPages/pages/policeDetails/index.scss
@@ -5,8 +5,7 @@
   display: flex;
   flex-direction: column;
   .projectDetailsItem{
-    height: 18%;
-    margin: 20px;
+    margin: 10px 20px 10px 20px;
     border-radius: 10px;
     background: #ffffff;
     padding: 15px;
@@ -14,6 +13,10 @@
     line-height: 65px;
     color: #333333;
     .projectDetailsIndex{
+      display: flex;
+      flex-wrap: wrap;
+      line-height: 44rpx;
+      margin-bottom: 20px;
       .content{
         color:  #9b9b9f;
       }
@@ -35,7 +38,16 @@
         align-items: center;
         flex-wrap: wrap;
         font-size: 24px;
-        margin-bottom: 15px
+        margin-bottom: 15px;
+        .projectDetailsTableIndex{
+          display: flex;
+          justify-content: flex-end;
+          text-align: center;
+          view{
+            width: 70px;
+            margin-right: 20px;
+          }
+        }
       }
     }
   }
@@ -48,6 +60,12 @@
     right: 0;
     width: 100%;
   }
+  .nutPopup{
+    width: 300px;
+    height: 100px;
+    display: flex;
+    flex-wrap: wrap;
+  }
 }
 
 
diff --git a/collect_information/src/subPages/pages/policeDetails/index.vue b/collect_information/src/subPages/pages/policeDetails/index.vue
index fd91676..c6d5ba6 100644
--- a/collect_information/src/subPages/pages/policeDetails/index.vue
+++ b/collect_information/src/subPages/pages/policeDetails/index.vue
@@ -1,11 +1,26 @@
 <template>
   <view class="projectDetails">
-    <view class="projectDetailsItem">
-      <view style="display: flex;justify-content: space-between">
-        <text style="font-size: 18px">{{ nameValue ? nameValue : '' }}{{ '-----' + detailsList?.name }}项目</text>
-        <!--<text>进行中</text>-->
+    <view class="projectDetailsItem" style="line-height: 50rpx">
+      <view>
+        <view style="display: flex;justify-content: space-between">
+          <text style="font-size: 18px">{{ nameValue ? nameValue : '' }}{{ '-----' + detailsList?.name }}项目</text>
+          <!--          <text>进行中</text>-->
+        </view>
+        <view>
+          <view style="float: left;width: 50%;" class="content">
+            经理名称:{{ detailsList?.projectManagerMiniProgramUserInfo.name }}
+          </view>
+          <view class="content">手机号:{{ detailsList?.projectManagerMiniProgramUserInfo.telephone }}</view>
+        </view>
       </view>
+    </view>
+    <view class="projectDetailsItem">
       <view class="projectDetailsIndex">
+        <nut-row>
+          <nut-col :span="24">
+            <view class="content">保安证件号：{{ detailsList?.idNumber }}</view>
+          </nut-col>
+        </nut-row>
         <nut-row>
           <nut-col :span="12">
             <view class="content">工作人员数量:{{ detailsList?.staffTotal }}</view>
@@ -23,10 +38,7 @@
           </nut-col>
         </nut-row>
         <nut-row>
-          <nut-col :span="16">
-            <view class="content">证件号：{{ detailsList?.idNumber }}</view>
-          </nut-col>
-          <nut-col :span="8">
+          <nut-col :span="4">
             <view class="content">户数:{{ detailsList?.houseTotal }}</view>
           </nut-col>
         </nut-row>

From bd47d8b3f54d54faf5982e5ddabc3e15f51b7d11 Mon Sep 17 00:00:00 2001
From: wangyilin <1454641981@qq.com>
Date: Thu, 19 Sep 2024 16:24:00 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/.env.development          |  2 +-
 .../src/subPages/pages/form/form.vue          | 40 +++++++++++-
 .../subPages/pages/myProject/myProject.vue    |  1 +
 .../pages/projectDetails/projectDetails.scss  | 21 +++++++
 .../pages/projectDetails/projectDetails.vue   | 61 +++++++++++++++++--
 collect_information/types/global.d.ts         | 16 +++++
 .../types/pages/form/index.d.ts               |  1 +
 .../types/pages/myProject/index.d.ts          |  1 +
 8 files changed, 134 insertions(+), 9 deletions(-)

diff --git a/collect_information/.env.development b/collect_information/.env.development
index f811773..c876df6 100644
--- a/collect_information/.env.development
+++ b/collect_information/.env.development
@@ -1,2 +1,2 @@
-TARO_APP_ID="wx8902ddbfddb820d1"
+TARO_APP_ID="wx0acd1c4fcf94bdd3"
 TARO_APP_BASE_API="http://172.10.10.93:8765"
diff --git a/collect_information/src/subPages/pages/form/form.vue b/collect_information/src/subPages/pages/form/form.vue
index 04281ae..012dc8f 100644
--- a/collect_information/src/subPages/pages/form/form.vue
+++ b/collect_information/src/subPages/pages/form/form.vue
@@ -24,6 +24,10 @@
       <nut-form-item label="工作岗位" prop="workPost">
         <nut-input v-model="formData.workPost" placeholder="请输入工作岗位" type="text"/>
       </nut-form-item>
+
+      <nut-form-item label="手机号" prop="telephone">
+        <nut-input v-model="formData.telephone" placeholder="请输入手机号" type="text"/>
+      </nut-form-item>
       <nut-form-item label="籍贯" prop="nativePlace">
         <nut-input v-model="formData.nativePlace" placeholder="请输入籍贯" type="text"/>
       </nut-form-item>
@@ -67,6 +71,8 @@ const showPicker = ref(false)
 const formData = ref<formDate>({} as any)
 const formRef = ref(null)
 
+const qrcodeId = ref()
+
 const rules: FormRules = {
   name: [
     {required: true, message: "请输入姓名"},
@@ -78,11 +84,33 @@ const rules: FormRules = {
       regex: /^(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))((0[1-9])|([12][0-9])|(30|31))\d{3}(\d|X)$)/,
       message: "身份证格式错误",
     },
+  ],
+  telephone:[
+    {required: true, message: "请输入手机号"},
   ]
 };
 
 useLoad((options) => {
-  formData.value = JSON.parse(options.item)
+  qrcodeId.value = options
+  console.log(JSON.parse(options.item))
+  if(options.id === '2'){
+    formData.value = {
+      serviceProjectId: JSON.parse(options.item).serviceProjectId,
+      securityUnitId:JSON.parse(options.item).securityUnitId,
+      name: '',
+      workPost: '',
+      sex: 0,
+      nativePlace: '',
+      idCard: '',
+      dateOfBirth: null,
+      securityNumber: '',
+      remark: '',
+      homeAddress: '',
+      telephone:''
+    }
+  }else{
+    formData.value = JSON.parse(options.item)
+  }
 })
 
 const idCardBlur = (e: any) => {
@@ -98,10 +126,17 @@ const idCardBlur = (e: any) => {
   formData.value.dateOfBirth = new Date(parseInt(year), parseInt(month) - 1, parseInt(day))
 }
 
+const url = ref('')
 const submit = () => {
   formRef.value?.validate().then(async ({valid}) => {
     if (valid) {
-      const resp = await api.post('/projectManageIndex/saveOrUpdateSecurityUser', formData.value)
+      if( qrcodeId.value.id === '1'){
+        url.value = '/projectManageIndex/saveOrUpdateSecurityUser'
+      }else{
+        url.value = '/miniProgramUser/qrCodeFormInputSecurityUser'
+      }
+      console.log(formData.value)
+      const resp = await api.post(`${ url.value}`, formData.value)
       Taro.showToast({
         title: resp.message,
         icon: 'success',
@@ -111,6 +146,7 @@ const submit = () => {
       formData.value = {
         snowFlakeId: undefined,
         serviceProjectId: formData.value.serviceProjectId,
+        securityUnitId:formData.value.securityUnitId,
         name: '',
         workPost: '',
         telephone: '',
diff --git a/collect_information/src/subPages/pages/myProject/myProject.vue b/collect_information/src/subPages/pages/myProject/myProject.vue
index 06eedd0..32eadff 100644
--- a/collect_information/src/subPages/pages/myProject/myProject.vue
+++ b/collect_information/src/subPages/pages/myProject/myProject.vue
@@ -45,6 +45,7 @@ const getMyServiceProject = async () => {
 }
 
 const projectClick = (items: ServiceProjectList, name: string) => {
+  console.log(items)
   Taro.navigateTo({
     url: `/subPages/pages/projectDetails/projectDetails?name=${name}&item=${JSON.stringify(items)}`,
   })
diff --git a/collect_information/src/subPages/pages/projectDetails/projectDetails.scss b/collect_information/src/subPages/pages/projectDetails/projectDetails.scss
index 958e0cf..5ede9f2 100644
--- a/collect_information/src/subPages/pages/projectDetails/projectDetails.scss
+++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.scss
@@ -66,6 +66,27 @@
      display: flex;
      flex-wrap: wrap;
   }
+  .qrcodeVisibleUrl{
+    margin-bottom: 5px;
+    image {
+      width: 100%;
+    }
+  }
+  .warp{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100vh;
+    .warpItem{
+      width: 90%;
+      height: 50%;
+      text-align: center;
+      .rect{
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
 }
 
 
diff --git a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
index a04f043..51231ab 100644
--- a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
@@ -85,9 +85,8 @@
     </view>
     <view class="projectDetailsButton">
       <nut-button style="width: 45%" type="info" @click="formAdd">项目人员录入</nut-button>
-      <nut-button style="width: 45%" type="info">二维码录入</nut-button>
+      <nut-button style="width: 45%" type="info" @click="generateMiniProgramQRCode">二维码录入</nut-button>
     </view>
-
     <view>
       <nut-dialog
         content="是否确认删除该用户?"
@@ -107,6 +106,27 @@
         </slot>
       </nut-dialog>
     </view>
+  <!-- 二维码-->
+      <view>
+          <nut-dialog no-cancel-btn content="二维码" v-model:visible="qrcodeVisible">
+              <slot>
+                  <view class="qrcodeVisibleUrl"  @click="showImage">
+                      <image style="width: 100%" show-menu-by-longpress='1' :lazy-load="true" :src="qrCodeImage" mode="aspectFit"  />
+                  </view>
+              </slot>
+          </nut-dialog>
+      </view>
+    <nut-overlay v-model:visible="showOverlay">
+      <view class="warp">
+          <view class="warpItem">
+            <movable-area :scale-area="true">
+              <movable-view direction="all" style="width: 348px; height: 300px;"  :scale="true" :scale-min="1" :scale-max="4" :scale-value="1" :x="2" :y="10">
+                <image  class="rect"  show-menu-by-longpress='1'  :src="qrCodeImage" mode="widthFix"  />
+              </movable-view>
+            </movable-area>
+          </view>
+      </view>
+    </nut-overlay>
   </view>
 </template>
 <script setup lang="ts">
@@ -116,7 +136,6 @@ import {ref} from "vue";
 import api from "@/request/index";
 import * as dayjs from 'dayjs'
 
-
 const serviceProjectDetails = ref()
 const nameValue = ref('')
 const projectData = ref<Records[]>([])
@@ -124,7 +143,8 @@ const content = ref<Records>({} as any)
 // 控制模态框的显示状态
 const confirmVisible = ref(false);
 const detailVisible = ref(false)
-
+const qrcodeVisible = ref(false)
+const showOverlay = ref(false)
 
 useLoad(async (options: MyProjectList) => {
   nameValue.value = options.name
@@ -155,6 +175,7 @@ const projectDetailsTable = async () => {
 const formAdd = () => {
   const params = {
     serviceProjectId: serviceProjectDetails.value.snowFlakeId,
+    securityUnitId:serviceProjectDetails.value.securityUnitId,
     snowFlakeId: undefined,
     name: '',
     workPost: '',
@@ -164,9 +185,10 @@ const formAdd = () => {
     dateOfBirth: null,
     securityNumber: '',
     remark: '',
-    homeAddress: ''
+    homeAddress: '',
+    telephone:''
   }
-  Taro.navigateTo({url: `/subPages/pages/form/form?item=${JSON.stringify(params)}`})
+  Taro.navigateTo({url: `/subPages/pages/form/form?item=${JSON.stringify(params)}&&id=${1}`})
 }
 const total = ref<any>(null)
 const current = ref(1)
@@ -220,7 +242,34 @@ const projectEdit = (item) => {
   Taro.navigateTo({url: `/subPages/pages/form/form?item=${JSON.stringify(params)}`})
 }
 
+const qrCodeImage = ref('')
+const generateMiniProgramQRCode =    ()=>{
+  const params = {
+    securityUnitId:serviceProjectDetails.value.securityUnitId,
+    serviceProjectId:serviceProjectDetails.value.snowFlakeId
+  }
+   const value =  JSON.stringify(params)
+    const paramsData = {
+      path:`/subPages/pages/form/form?item=${value}&id=${2}`,
+      width:200,
+     }
+     qrcodeVisible.value = true
+    Taro.request({
+        url: 'http://172.10.10.93:8765/projectManageIndex/shareForm_QR_Code',
+        method:'GET',
+        data:paramsData,
+        responseType: 'arraybuffer',
+        success(res) {
+            const base64 = Taro.arrayBufferToBase64(res.data);
+            qrCodeImage.value = 'data:image/jpeg;base64,' + base64
+        }
+    })
+}
 
+const showImage = ()=>{
+  showOverlay.value = true
+  qrcodeVisible.value = false
+}
 
 
 </script>
diff --git a/collect_information/types/global.d.ts b/collect_information/types/global.d.ts
index fe190e8..8a62d44 100644
--- a/collect_information/types/global.d.ts
+++ b/collect_information/types/global.d.ts
@@ -60,3 +60,19 @@ interface TreeNode<T> {
   extData?: Record<string, any>,
   children?: TreeNode<T>[]
 }
+
+
+interface TokenInfo<T = Record<string, any>> {
+  name: string;
+  value: string;
+  extData?: T
+}
+
+/**
+ * 基本枚举类型
+ */
+interface BaseEnum<T, E = Record<string, any>> {
+  value: T;
+  label: string;
+  extData: E;
+}
diff --git a/collect_information/types/pages/form/index.d.ts b/collect_information/types/pages/form/index.d.ts
index 4aed7ab..6c51ace 100644
--- a/collect_information/types/pages/form/index.d.ts
+++ b/collect_information/types/pages/form/index.d.ts
@@ -1,5 +1,6 @@
 interface formDate {
   snowFlakeId?: string;
+  securityUnitId:string;
   serviceProjectId: string;
   name?: string;
   workPost?: string;
diff --git a/collect_information/types/pages/myProject/index.d.ts b/collect_information/types/pages/myProject/index.d.ts
index d0d8d24..8b4c210 100644
--- a/collect_information/types/pages/myProject/index.d.ts
+++ b/collect_information/types/pages/myProject/index.d.ts
@@ -12,6 +12,7 @@
   remark?: string;
   serviceProjectList: ServiceProjectList[];
   snowFlakeId?: string;
+  securityUnitId:string;
   street?: string;
   streetName?:string;
 }