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/package.json b/collect_information/package.json
index b1af349..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,
@@ -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/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
+}
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/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/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 @@
-
-
-
-
-
- {{ streetCommunitySmallCommunityLabel || "请选择街道/小区" }}
-
-
-
-
- {{ buildingFloorHouseLabel || "请选择楼栋/门户" }}
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
- {{
- dayjs(formParams.dataOfBirth).format("YYYY-MM-DD") ||
- "请选择出生日期"
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/collect_information/src/subPages/pages/form/form.vue b/collect_information/src/subPages/pages/form/form.vue
index 3fd8a3a..012dc8f 100644
--- a/collect_information/src/subPages/pages/form/form.vue
+++ b/collect_information/src/subPages/pages/form/form.vue
@@ -1,6 +1,5 @@
- {{ formData }}
@@ -25,6 +24,10 @@
+
+
+
+
@@ -68,6 +71,8 @@ const showPicker = ref(false)
const formData = ref({} as any)
const formRef = ref(null)
+const qrcodeId = ref()
+
const rules: FormRules = {
name: [
{required: true, message: "请输入姓名"},
@@ -79,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) => {
@@ -99,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',
@@ -112,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 a40568b..32eadff 100644
--- a/collect_information/src/subPages/pages/myProject/myProject.vue
+++ b/collect_information/src/subPages/pages/myProject/myProject.vue
@@ -1,23 +1,31 @@
-
-
- {{ item?.name }}
-
-
- 地址:
- {{ item?.provinceName }}{{ item.cityName }}{{ item.districtsName }}{{ item.streetName }}
-
-
- 联系人:{{ item?.contactPersonInfo.name }}
- 电话:{{ item?.contactPersonInfo.telephone }}
-
-
-
- {{ items.name }}
+
+
+
+ {{ item?.name }}
+
+
+ 地址:
+ {{ item?.provinceName }}{{ item.cityName }}{{ item.districtsName }}{{ item.streetName }}
+
+
+ 联系人:{{ item?.contactPersonInfo.name }}
+ 电话:{{ item?.contactPersonInfo.telephone }}
+
+
+
+ {{ items.name }}
+
+
+
+
+
+
+
@@ -28,12 +36,16 @@ import Taro from "@tarojs/taro";
import './myproject.scss'
const myProjectList = ref()
+
+const number = ref(0)
const getMyServiceProject = async () => {
const resp = await api.get(`/projectManageIndex/getMyServiceProject`)
myProjectList.value = resp.data
+ number.value = resp.data.length
}
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/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 @@
-
-
- {{ nameValue ? nameValue : '' }}{{ '-----' + detailsList?.name }}项目
-
+
+
+
+ {{ nameValue ? nameValue : '' }}{{ '-----' + detailsList?.name }}项目
+
+
+
+
+ 经理名称:{{ detailsList?.projectManagerMiniProgramUserInfo.name }}
+
+ 手机号:{{ detailsList?.projectManagerMiniProgramUserInfo.telephone }}
+
+
+
+
+
+ 保安证件号:{{ detailsList?.idNumber }}
+
+
工作人员数量:{{ detailsList?.staffTotal }}
@@ -23,10 +38,7 @@
-
- 证件号:{{ detailsList?.idNumber }}
-
-
+
户数:{{ detailsList?.houseTotal }}
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 8ce4b28..51231ab 100644
--- a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
+++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue
@@ -85,9 +85,8 @@
项目人员录入
- 二维码录入
+ 二维码录入
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+