diff --git a/collect_information/package.json b/collect_information/package.json index 1830680..3efb25d 100644 --- a/collect_information/package.json +++ b/collect_information/package.json @@ -58,7 +58,8 @@ "@tarojs/taro": "3.6.26", "dayjs": "^1.11.13", "pinia": "^2.2.2", - "vue": "^3.0.0" + "vue": "^3.0.0", + "vuex": "^4.0.2" }, "devDependencies": { "@babel/core": "^7.8.0", diff --git a/collect_information/src/app.config.ts b/collect_information/src/app.config.ts index 3690c73..20ebb39 100644 --- a/collect_information/src/app.config.ts +++ b/collect_information/src/app.config.ts @@ -1,4 +1,4 @@ -import {MINI_PROGRAM_USER_CONFIG} from "@/config"; +import { MINI_PROGRAM_USER_CONFIG } from "@/config"; const tabBarItems = Object.values(MINI_PROGRAM_USER_CONFIG).map(item => item.tabBarList).flat() @@ -17,14 +17,24 @@ export default defineAppConfig({ 'myProject/projectDetails/projectDetails', 'securityUserForm/securityUserForm', ] - }, { + }, + { root: "subPages/police", pages: [ + 'dailyInspection/dailyInspection', 'myEnterprisesUnit/myEnterprisesUnit', 'myEnterprisesUnit/projectDetails/projectDetails' ] - } + }, + { + root: "subPages/select", + pages: [ + 'dailyLife/dailyLife', + 'signature/signature' + ] + }, ], + window: { backgroundTextStyle: 'light', navigationBarBackgroundColor: '#4e87ff', diff --git a/collect_information/src/pages/police/index/index.vue b/collect_information/src/pages/police/index/index.vue index 9c1ef37..6bbe713 100644 --- a/collect_information/src/pages/police/index/index.vue +++ b/collect_information/src/pages/police/index/index.vue @@ -3,7 +3,7 @@ - + @@ -18,40 +18,39 @@ - {{ item.name }} + {{ item.name }} diff --git a/collect_information/src/store/daily.ts b/collect_information/src/store/daily.ts new file mode 100644 index 0000000..844ed89 --- /dev/null +++ b/collect_information/src/store/daily.ts @@ -0,0 +1,41 @@ +import { defineStore } from 'pinia' + +export const useDailyStore = defineStore('daily', { + state: () => ({ + userdailyinspection: [], + base64_1: '', + base64_2: '', + + }), + actions: { + dailyinspectionList(data) { + this.userdailyinspection = [...data] + }, + change_base64_1(data) { + // console.log("🚀 ~ change_base64_1 ~ data:", data) + this.base64_1 = data + }, + change_base64_2(data) { + this.base64_2 = data + }, + cleardailtcolour() { + this.userdailyinspection = { + ...this.userdailyinspection, + markColor: this.userdailyinspection.markColor, + markColor1: this.userdailyinspection.markColor, + comment: '' + } + } + }, + getters: { + getdailyinspection(state) { + return state.userdailyinspection + }, + get_base64_1(state) { + return state.base64_1 + }, + get_base64_2(state) { + return state.base64_2 + } + } +}) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss new file mode 100644 index 0000000..a3676d8 --- /dev/null +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss @@ -0,0 +1,40 @@ +// page { +// background-color: #e9eef4; +// } + +// .container { +// background-color: #e9eef4; +// } + +.picker { + padding: 30rpx 30rpx; + display: flex; + justify-content: space-between; +} + +.exit { + height: 100rpx; + line-height: 40px; + border-bottom: solid 0.5px #ebebf7; + box-sizing: border-box; + display: flex; + justify-content: space-between; + align-items: center; + + .exitItem { + display: flex; + align-items: center; + } + + .iconoscope { + z-index: 9999; + width: 8px; + height: 8px; + display: inline-block; + border: solid 2px #c2c2c2; + margin-left: 10px; + transform: rotate(45deg); + border-bottom: white; + border-left: white; + } +} diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.ts b/collect_information/src/subPages/police/dailyInspection/dailyInspection.ts new file mode 100644 index 0000000..99bd791 --- /dev/null +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '监督考核', +}) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue new file mode 100644 index 0000000..3e3d151 --- /dev/null +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -0,0 +1,324 @@ + + diff --git a/collect_information/src/subPages/select/dailyLife/dailyLife.scss b/collect_information/src/subPages/select/dailyLife/dailyLife.scss new file mode 100644 index 0000000..64337a3 --- /dev/null +++ b/collect_information/src/subPages/select/dailyLife/dailyLife.scss @@ -0,0 +1,26 @@ +.userinform { + height: 100%; + width: 100%; +} + +.userItem { + color: #7b7b7b; + font-size: 14px; + margin-bottom: 8px; + + .textIndex { + margin-left: 20rpx; + } +} + +.text { + width: 96%; +} + +.singleChoice { + width: 90%; +} + +.label { + margin: 0 20px; +} diff --git a/collect_information/src/subPages/select/dailyLife/dailyLife.ts b/collect_information/src/subPages/select/dailyLife/dailyLife.ts new file mode 100644 index 0000000..457d7f4 --- /dev/null +++ b/collect_information/src/subPages/select/dailyLife/dailyLife.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '', +}) diff --git a/collect_information/src/subPages/select/dailyLife/dailyLife.vue b/collect_information/src/subPages/select/dailyLife/dailyLife.vue new file mode 100644 index 0000000..7b8d1a8 --- /dev/null +++ b/collect_information/src/subPages/select/dailyLife/dailyLife.vue @@ -0,0 +1,124 @@ + + + diff --git a/collect_information/src/subPages/select/signature/signature.scss b/collect_information/src/subPages/select/signature/signature.scss new file mode 100644 index 0000000..e69de29 diff --git a/collect_information/src/subPages/select/signature/signature.ts b/collect_information/src/subPages/select/signature/signature.ts new file mode 100644 index 0000000..0192ec1 --- /dev/null +++ b/collect_information/src/subPages/select/signature/signature.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '签名', +}) diff --git a/collect_information/src/subPages/select/signature/signature.vue b/collect_information/src/subPages/select/signature/signature.vue new file mode 100644 index 0000000..0375b27 --- /dev/null +++ b/collect_information/src/subPages/select/signature/signature.vue @@ -0,0 +1,53 @@ + +