diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts index a331b27..2e2f8bd 100644 --- a/collect_information/src/app.config.ts +++ b/collect_information/src/app.config.ts @@ -6,7 +6,6 @@ export default defineAppConfig({ 'pages/policeManager/index/index', 'pages/mine/mine', 'pages/employeeInfo/employeeInfo', - 'pages/myProject/myProject', ], window: { backgroundTextStyle: 'light', @@ -20,6 +19,9 @@ export default defineAppConfig({ root: "subPages", pages: [ 'pages/policeManager/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 b829183..e359902 100644 --- a/collect_information/src/app.ts +++ b/collect_information/src/app.ts @@ -1,5 +1,6 @@ import {createApp} from 'vue' import {createPinia} from 'pinia' +import {useCounterStore} from '@/store' import './app.scss' import './assets/scss/colorui.scss' import piniaPluginPersistedstate from 'pinia-plugin-persistedstate' @@ -9,9 +10,13 @@ const pinia = createPinia() pinia.use(piniaPluginPersistedstate) const App = createApp({ onShow(options) { + const store = useCounterStore() const token = Taro.getStorageSync('token') if(token){ - console.log(111) + Taro.switchTab({ + url:'/pages/mine/mine' + }) + store.setSelected(2) }else{ console.log(2222) } diff --git a/collect_information/src/assets/images/badge.jpg b/collect_information/src/assets/images/badge.jpg deleted file mode 100644 index ae19643..0000000 Binary files a/collect_information/src/assets/images/badge.jpg and /dev/null differ diff --git a/collect_information/src/enums/index.ts b/collect_information/src/enums/index.ts index f7b0445..3566495 100644 --- a/collect_information/src/enums/index.ts +++ b/collect_information/src/enums/index.ts @@ -7,6 +7,10 @@ export const SEX: SelectNode[] = [ value: 1, label: "女", }, + { + value: 2, + label: "隐藏", + } ]; export const IDENTITY: SelectNode[] = [ diff --git a/collect_information/src/pages/mine/mine.vue b/collect_information/src/pages/mine/mine.vue index e85d037..ba68e5e 100644 --- a/collect_information/src/pages/mine/mine.vue +++ b/collect_information/src/pages/mine/mine.vue @@ -1,6 +1,6 @@ diff --git a/collect_information/src/pages/policeManager/index/index.vue b/collect_information/src/pages/policeManager/index/index.vue index d2f2d65..27ee14c 100644 --- a/collect_information/src/pages/policeManager/index/index.vue +++ b/collect_information/src/pages/policeManager/index/index.vue @@ -29,7 +29,6 @@ const routerPush = (path) => { case 1: Taro.navigateTo({ url: '/subPages/pages/policeManager/index', - }) } diff --git a/collect_information/src/pages/projectManager/index/index.vue b/collect_information/src/pages/projectManager/index/index.vue index 775a9ab..0ffa443 100644 --- a/collect_information/src/pages/projectManager/index/index.vue +++ b/collect_information/src/pages/projectManager/index/index.vue @@ -11,7 +11,7 @@ + @click="Taro.navigateTo({url: '/subPages/pages/myProject/myProject'})"> - diff --git a/collect_information/src/request/index.ts b/collect_information/src/request/index.ts index b963f5a..d3df74f 100644 --- a/collect_information/src/request/index.ts +++ b/collect_information/src/request/index.ts @@ -7,7 +7,7 @@ const requestInterceptor = (chain: Taro.Chain) => { if (token) { requestParams.header = { ...requestParams.header, - token + token:token.value } } return chain.proceed(requestParams) diff --git a/collect_information/src/subPages/pages/form/form.config.ts b/collect_information/src/subPages/pages/form/form.config.ts new file mode 100644 index 0000000..7652664 --- /dev/null +++ b/collect_information/src/subPages/pages/form/form.config.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '项目人员录入', +}) diff --git a/collect_information/src/subPages/pages/form/form.scss b/collect_information/src/subPages/pages/form/form.scss new file mode 100644 index 0000000..93df7ae --- /dev/null +++ b/collect_information/src/subPages/pages/form/form.scss @@ -0,0 +1,8 @@ +.form{ + .formButton{ + display: flex; + margin-top: auto; + justify-content: space-around; + margin-bottom: 30px + } +} diff --git a/collect_information/src/subPages/pages/form/form.vue b/collect_information/src/subPages/pages/form/form.vue new file mode 100644 index 0000000..4511c94 --- /dev/null +++ b/collect_information/src/subPages/pages/form/form.vue @@ -0,0 +1,165 @@ + + + + diff --git a/collect_information/src/pages/myProject/myProject.vue b/collect_information/src/subPages/pages/myProject/myProject.vue similarity index 61% rename from collect_information/src/pages/myProject/myProject.vue rename to collect_information/src/subPages/pages/myProject/myProject.vue index e16bc4a..6741d9b 100644 --- a/collect_information/src/pages/myProject/myProject.vue +++ b/collect_information/src/subPages/pages/myProject/myProject.vue @@ -7,13 +7,9 @@ 地址: {{item?.provinceName}}{{item.cityName}}{{item.districtsName}}{{item.streetName}} - - - 项目负责人:{{item?.contactPersonInfo.name}} - 电话:{{item?.contactPersonInfo.telephone}} - {{items.name}} + {{items.name}} @@ -25,15 +21,16 @@ import {onMounted, ref} from "vue"; import Taro from "@tarojs/taro"; import './myproject.scss' - -const myProjectList = ref() +const myProjectList = ref() const getMyServiceProject = async () => { - const token = Taro.getStorageSync('token') - const resp = await api.get(`/projectManageIndex/getMyServiceProject`, { - token: token.value - }) + const resp = await api.get(`/projectManageIndex/getMyServiceProject`) myProjectList.value = resp.data - console.log(resp.data) +} + +const projectClick = (items:ServiceProjectList,name:string)=>{ + Taro.navigateTo({ + url:`/subPages/pages/projectDetails/projectDetails?name=${name}&item=${JSON.stringify(items)}`, + }) } onMounted(async () => { await getMyServiceProject() diff --git a/collect_information/src/pages/myProject/myproject.config.ts b/collect_information/src/subPages/pages/myProject/myproject.config.ts similarity index 100% rename from collect_information/src/pages/myProject/myproject.config.ts rename to collect_information/src/subPages/pages/myProject/myproject.config.ts diff --git a/collect_information/src/pages/myProject/myproject.scss b/collect_information/src/subPages/pages/myProject/myproject.scss similarity index 100% rename from collect_information/src/pages/myProject/myproject.scss rename to collect_information/src/subPages/pages/myProject/myproject.scss diff --git a/collect_information/src/subPages/pages/projectDetails/projectDetails.config.ts b/collect_information/src/subPages/pages/projectDetails/projectDetails.config.ts new file mode 100644 index 0000000..c155561 --- /dev/null +++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.config.ts @@ -0,0 +1,4 @@ +export default definePageConfig({ + navigationBarTitleText: '项目详情', + +}) diff --git a/collect_information/src/subPages/pages/projectDetails/projectDetails.scss b/collect_information/src/subPages/pages/projectDetails/projectDetails.scss new file mode 100644 index 0000000..c8e7651 --- /dev/null +++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.scss @@ -0,0 +1,50 @@ +.projectDetails{ + height: 100vh; + overflow: hidden; + background: #f1f1f1; + display: flex; + flex-direction: column; + .projectDetailsItem{ + margin: 20px; + border-radius: 10px; + background: #ffffff; + padding: 15px; + font-size: 28px; + line-height: 65px; + color: #333333; + .projectDetailsIndex{ + .content{ + color: #9b9b9f; + } + } + } + .projectDetailsTableDrop{ + height: 800px; + .projectDetailsTable{ + margin: 20px; + border-radius: 10px; + background: #ffffff; + padding: 15px; + font-size: 28px; + line-height: 65px; + color: #333333; + .projectDetailsTableItem{ + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; + font-size: 24px; + margin-bottom: 15px + } + } + } + + .projectDetailsButton{ + display: flex; + margin-top: auto; + justify-content: space-around; + margin-bottom: 30px + } +} + + diff --git a/collect_information/src/subPages/pages/projectDetails/projectDetails.vue b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue new file mode 100644 index 0000000..cfda983 --- /dev/null +++ b/collect_information/src/subPages/pages/projectDetails/projectDetails.vue @@ -0,0 +1,98 @@ + + + diff --git a/collect_information/types/pages/form/index.d.ts b/collect_information/types/pages/form/index.d.ts new file mode 100644 index 0000000..e760dcc --- /dev/null +++ b/collect_information/types/pages/form/index.d.ts @@ -0,0 +1,13 @@ +interface formDate { + snowFlakeId?:string; + serviceProjectId:string; + name: string; + workPost?:string; + sex:number; + nativePlace?:string; + idCard:string; + dateOfBirth?:string; + securityNumber?:string; + remark?:string; + homeAddress?: string +} diff --git a/collect_information/types/pages/myProject/index.d.ts b/collect_information/types/pages/myProject/index.d.ts index 1cac21e..cc5baea 100644 --- a/collect_information/types/pages/myProject/index.d.ts +++ b/collect_information/types/pages/myProject/index.d.ts @@ -1,26 +1,26 @@ - interface myProjectList { + interface MyProjectList { address?: string; city?: string; cityName?: string; - contactPersonInfo:contactPersonInfo; + contactPersonInfo:ContactPersonInfo; districts?: string; districtsName?: string; name: string; province?: string; provinceName: string; remark?: string; - serviceProjectList: serviceProjectList[]; + serviceProjectList: ServiceProjectList[]; snowFlakeId?: string; street?: string; streetName?:string; } -interface contactPersonInfo{ - name:string, +interface ContactPersonInfo{ + name:string; telephone:string } -interface serviceProjectList { +interface ServiceProjectList { buildingTotal?: number; houseTotal?: number; idNumber?: string; diff --git a/collect_information/types/pages/projectDetails/index.d.ts b/collect_information/types/pages/projectDetails/index.d.ts new file mode 100644 index 0000000..519cff3 --- /dev/null +++ b/collect_information/types/pages/projectDetails/index.d.ts @@ -0,0 +1,27 @@ +interface Records{ + createTime?: string; + dateOfBirth?: string; + homeAddress?: string; + idCard?: string; + name?: string; + nativePlace?: string; + remark?: string; + securityNumber?: string; + securityUnitId?: string; + securityUnitName?: string; + serviceProjectId?: string; + workPost?:string; + sex?:Sex +} +interface ProjectData { + current?:string; + pages?:string; + records?: Records[]; + size?: string; + total?: string; +} + +interface Sex { + value:number, + label:string +}