From ae4e85fcc7c4b80a8cb626a72aee6601a8311e16 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 16:18:15 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E3=80=81=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect_information/package.json | 3 +- collect_information/src/app.config.ts | 16 +- .../src/pages/police/index/index.vue | 23 +- collect_information/src/store/daily.ts | 41 +++ .../dailyInspection/dailyInspection.scss | 40 +++ .../police/dailyInspection/dailyInspection.ts | 3 + .../dailyInspection/dailyInspection.vue | 324 ++++++++++++++++++ .../subPages/select/dailyLife/dailyLife.scss | 26 ++ .../subPages/select/dailyLife/dailyLife.ts | 3 + .../subPages/select/dailyLife/dailyLife.vue | 124 +++++++ .../subPages/select/signature/signature.scss | 0 .../subPages/select/signature/signature.ts | 3 + .../subPages/select/signature/signature.vue | 53 +++ 13 files changed, 643 insertions(+), 16 deletions(-) create mode 100644 collect_information/src/store/daily.ts create mode 100644 collect_information/src/subPages/police/dailyInspection/dailyInspection.scss create mode 100644 collect_information/src/subPages/police/dailyInspection/dailyInspection.ts create mode 100644 collect_information/src/subPages/police/dailyInspection/dailyInspection.vue create mode 100644 collect_information/src/subPages/select/dailyLife/dailyLife.scss create mode 100644 collect_information/src/subPages/select/dailyLife/dailyLife.ts create mode 100644 collect_information/src/subPages/select/dailyLife/dailyLife.vue create mode 100644 collect_information/src/subPages/select/signature/signature.scss create mode 100644 collect_information/src/subPages/select/signature/signature.ts create mode 100644 collect_information/src/subPages/select/signature/signature.vue 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 @@ + + From a5ac612c5fb255ae80e546e975f6b63d29c97b3d Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 16:23:16 +0800 Subject: [PATCH 02/10] Update index.vue --- collect_information/src/pages/police/index/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collect_information/src/pages/police/index/index.vue b/collect_information/src/pages/police/index/index.vue index 96e78b1..3ab9781 100644 --- a/collect_information/src/pages/police/index/index.vue +++ b/collect_information/src/pages/police/index/index.vue @@ -69,8 +69,8 @@ const subModuleList = ref([ { id: 1, icon: icon02, - name: '整改工单', - url: '', + name: '监督考核', + url: '/subPages/police/dailyInspection/dailyInspection', }, { id: 2, From 13e96aef22d7d2d5f64a6091d8d78ab37ffcb7fd Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 16:38:41 +0800 Subject: [PATCH 03/10] Update dailyInspection.vue --- .../subPages/police/dailyInspection/dailyInspection.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 3e3d151..6c57e10 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -246,7 +246,9 @@ const _showToast = function (title) { */ interface Item { itemList: any[] // 根据实际情况调整类型 + snowFlakeId: string } + const assessmentRecordDetails = ref([]) const onSubmit = async function () { if (_form.enterprisesUnitId === '') { @@ -269,12 +271,13 @@ const onSubmit = async function () { title: '加载中...', mask: true, }) + submitData.value.forEach((element) => { element?.itemList.forEach((item) => { item.standardList.forEach((ele) => { if (ele.snowFlakeId === item.selectedID && !item.hasOwnProperty('selectedGroup') && item.selectedID != 'null') { assessmentRecordDetails.value.push({ - ckGroupId: item.snowFlakeId, //选项的雪花Id + ckGroupId: element.snowFlakeId, //选项的雪花Id ckItemId: ele.ckItemId, //已选择的ID ckStandardId: item.selectedID, //已选择的雪花ID }) @@ -285,7 +288,7 @@ const onSubmit = async function () { console.log(selectedItem) if (selectedItem != 'null') { assessmentRecordDetails.value.push({ - ckGroupId: item.snowFlakeId, //选项的雪花Id + ckGroupId: element.snowFlakeId, //选项的雪花Id ckItemId: item.snowFlakeId, //已选择的ID ckStandardId: selectedItem, //已选择的雪花ID }) From 59d96b7d1745f63e9d14a454cd6941e91d294f64 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 16:52:10 +0800 Subject: [PATCH 04/10] Update dailyInspection.vue --- .../src/subPages/police/dailyInspection/dailyInspection.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 6c57e10..06ae8f1 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -80,7 +80,7 @@ import './dailyInspection.scss' import { ref, computed, reactive, watch } from 'vue' import api from '@/request/index' import { useDailyStore } from '@/store/daily' - +const starRating = ref([]) const store = useDailyStore() const daily = computed(() => store.getdailyinspection) const base64_1 = computed(() => store.get_base64_1) @@ -124,7 +124,7 @@ const mydailycolorschools = ref('') useLoad(async () => { await getUnitEnterprisesUnitList() }) -const starRating = ref([]) + const Onrating = function (name: string, snowFlakeId: string) { let index = starRating.value.findIndex((item) => item.snowFlakeId === snowFlakeId) Taro.navigateTo({ From 5369190b1db4b7ae52192ebcfc0f1b45901ee7c2 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 17:07:47 +0800 Subject: [PATCH 05/10] Update dailyInspection.vue --- .../dailyInspection/dailyInspection.vue | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 06ae8f1..5cb8791 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -282,19 +282,20 @@ const onSubmit = async function () { ckStandardId: item.selectedID, //已选择的雪花ID }) } + if (item.hasOwnProperty('selectedGroup')) { + item.selectedGroup.forEach((selectedItem) => { + // console.log(selectedItem) + // console.log(ele) + if (ele.ckItemId != 'null' && selectedItem != 'null') { + assessmentRecordDetails.value.push({ + ckGroupId: element.snowFlakeId, //选项的雪花Id + ckItemId: ele.ckItemId, //已选择的ID + ckStandardId: selectedItem, //已选择的雪花ID + }) + } + }) + } }) - if (item.hasOwnProperty('selectedGroup')) { - item.selectedGroup.forEach((selectedItem) => { - console.log(selectedItem) - if (selectedItem != 'null') { - assessmentRecordDetails.value.push({ - ckGroupId: element.snowFlakeId, //选项的雪花Id - ckItemId: item.snowFlakeId, //已选择的ID - ckStandardId: selectedItem, //已选择的雪花ID - }) - } - }) - } }) }) From e2bc9ea50addd2bb888988f9d4b2914fcb355ed6 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 17:21:50 +0800 Subject: [PATCH 06/10] Update dailyInspection.vue --- .../dailyInspection/dailyInspection.vue | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 5cb8791..4e4512a 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -85,7 +85,7 @@ const store = useDailyStore() const daily = computed(() => store.getdailyinspection) const base64_1 = computed(() => store.get_base64_1) const base64_2 = computed(() => store.get_base64_2) - +const currentCkProjectId = ref('') const submitData = ref([]) // watch( // daily, @@ -206,11 +206,13 @@ const ckProjectListByType = async function (type) { const res = await api.get(`/assessmentCriteria/ckProjectListByType`, { type }) selectorType.value = res.data } + const onChangeType = function (e: any) { let index = Number(e.detail.value) selectorCheckedType.value = selectorType.value?.[index].label as string - let ckProjectId = selectorType.value?.[index].value - assessmentCriteriaRulesByCkProjectId(ckProjectId) + currentCkProjectId.value = selectorType.value?.[index].value as string + // let ckProjectId = selectorType.value?.[index].value + assessmentCriteriaRulesByCkProjectId(currentCkProjectId.value) _form.ckProjectId = selectorType.value?.[index].value as string } @@ -282,20 +284,19 @@ const onSubmit = async function () { ckStandardId: item.selectedID, //已选择的雪花ID }) } - if (item.hasOwnProperty('selectedGroup')) { - item.selectedGroup.forEach((selectedItem) => { - // console.log(selectedItem) - // console.log(ele) - if (ele.ckItemId != 'null' && selectedItem != 'null') { - assessmentRecordDetails.value.push({ - ckGroupId: element.snowFlakeId, //选项的雪花Id - ckItemId: ele.ckItemId, //已选择的ID - ckStandardId: selectedItem, //已选择的雪花ID - }) - } - }) - } }) + if (item.hasOwnProperty('selectedGroup')) { + item.selectedGroup.forEach((selectedItem) => { + console.log(selectedItem) + if (selectedItem != 'null') { + assessmentRecordDetails.value.push({ + ckGroupId: element.snowFlakeId, //选项的雪花Id + ckItemId: item.snowFlakeId, //已选择的ID + ckStandardId: selectedItem, //已选择的雪花ID + }) + } + }) + } }) }) @@ -309,6 +310,8 @@ const onSubmit = async function () { const result = await api.post('/assessmentCriteria/submitAssessmentRecord', assessmentRecordParams) console.log('🚀 ~ onSubmit ~ result:', result) Taro.hideLoading() + store.dailyinspectionList([]) //清空数据 + assessmentCriteriaRulesByCkProjectId(currentCkProjectId.value) //重新获取数据 if (result.code === 200) { Taro.showToast({ title: result.message, From 627b76fe42af7ecde317e366bfd005f188726be5 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 17:26:53 +0800 Subject: [PATCH 07/10] Update dailyInspection.vue --- .../src/subPages/police/dailyInspection/dailyInspection.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 4e4512a..f10c0ad 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -311,6 +311,7 @@ const onSubmit = async function () { console.log('🚀 ~ onSubmit ~ result:', result) Taro.hideLoading() store.dailyinspectionList([]) //清空数据 + assessmentRecordParams.assessmentRecordDetails = [] assessmentCriteriaRulesByCkProjectId(currentCkProjectId.value) //重新获取数据 if (result.code === 200) { Taro.showToast({ From efc96a7effbdcef30890ef6b2eadf126fe24d982 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 17:29:05 +0800 Subject: [PATCH 08/10] Update dailyInspection.vue --- .../src/subPages/police/dailyInspection/dailyInspection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index f10c0ad..46aae12 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -311,7 +311,7 @@ const onSubmit = async function () { console.log('🚀 ~ onSubmit ~ result:', result) Taro.hideLoading() store.dailyinspectionList([]) //清空数据 - assessmentRecordParams.assessmentRecordDetails = [] + assessmentRecordDetails.value = [] assessmentCriteriaRulesByCkProjectId(currentCkProjectId.value) //重新获取数据 if (result.code === 200) { Taro.showToast({ From f0aedc78f8468ecb5d84accdf696759f6932c0b9 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Fri, 8 Nov 2024 17:36:44 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E6=97=A7=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dailyInspection/dailyInspection.vue | 26 ++----------------- .../subPages/select/dailyLife/dailyLife.vue | 13 ---------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 46aae12..0c5a5ca 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -87,15 +87,7 @@ const base64_1 = computed(() => store.get_base64_1) const base64_2 = computed(() => store.get_base64_2) const currentCkProjectId = ref('') const submitData = ref([]) -// watch( -// daily, -// (newData) => { -// console.log('watch_______________', newData) -// if (newData.length > 0) starRating.value = newData -// submitData.value = newData -// }, -// { immediate: true } -// ) + const _form = reactive({ enterprisesUnitId: '', //企事业单位id ckProjectId: '', //考核项目 @@ -129,15 +121,6 @@ const Onrating = function (name: string, snowFlakeId: string) { let index = starRating.value.findIndex((item) => item.snowFlakeId === snowFlakeId) Taro.navigateTo({ url: `/subPages/select/dailyLife/dailyLife?name=${name}&index=${index}`, - // url: `/subPages/select/dailyLife/dailyLife`, - // success: function (res) { - // try { - // if (process.env.TARO_ENV === 'weapp') { - // res.eventChannel.emit('starRating', { data: selectedItemList }) - // } - // } catch (error) { - // } - // }, }) } interface UnitEnterprisesUnitList { @@ -311,7 +294,7 @@ const onSubmit = async function () { console.log('🚀 ~ onSubmit ~ result:', result) Taro.hideLoading() store.dailyinspectionList([]) //清空数据 - assessmentRecordDetails.value = [] + assessmentRecordDetails.value = [] //清空数据 assessmentCriteriaRulesByCkProjectId(currentCkProjectId.value) //重新获取数据 if (result.code === 200) { Taro.showToast({ @@ -324,9 +307,4 @@ const onSubmit = async function () { _showToast(result.message) } } - -// useDidShow(() => { -// // 测试 pinia 数据是否更新 -// console.log('onShow_______________测试 pinia 数据是否更新', submitData.value) -// }) diff --git a/collect_information/src/subPages/select/dailyLife/dailyLife.vue b/collect_information/src/subPages/select/dailyLife/dailyLife.vue index 7b8d1a8..25d9754 100644 --- a/collect_information/src/subPages/select/dailyLife/dailyLife.vue +++ b/collect_information/src/subPages/select/dailyLife/dailyLife.vue @@ -44,23 +44,10 @@ useLoad((options) => { }) findIndex.value = options.index - // console.log('starRating.value_______________', starRating.value) - - // if (process.env.TARO_ENV === 'weapp') { - // const instance = Taro.getCurrentInstance() - // const eventChannel = instance.page.getOpenerEventChannel() - // eventChannel.on('starRating', function (data) { - // Taro.setNavigationBarTitle({ - // title: data.data.name, - // }) - // airdefenceEnumdata.value = [...data.data.itemList] - // }) - // } }) const daily = computed(() => store.getdailyinspection) - watch( daily, (newData) => { From 535d509445efaa1db319c2856e35a08d1b1ae597 Mon Sep 17 00:00:00 2001 From: TimSpan Date: Mon, 11 Nov 2024 11:25:08 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=EF=BC=88=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=81=E6=95=B0=E6=8D=AE=E7=AD=89=E7=AD=89?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dailyInspection/dailyInspection.scss | 13 +-- .../dailyInspection/dailyInspection.vue | 92 +++++++++++-------- .../subPages/select/signature/signature.vue | 17 +++- 3 files changed, 74 insertions(+), 48 deletions(-) diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss index a3676d8..4773363 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss @@ -1,10 +1,11 @@ -// page { -// background-color: #e9eef4; -// } +page { + position: relative; +} -// .container { -// background-color: #e9eef4; -// } +.container { + width: 100%; + +} .picker { padding: 30rpx 30rpx; diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue index 0c5a5ca..c4e5a64 100644 --- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue +++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue @@ -37,40 +37,31 @@ - - - - - - + + + + - 考核人员签字 + + 考核人员签字 - - - - - + - 被考评学校负责人 + + 被考评学校负责人 - - - - - - - 确认提交 - - + + + 确认提交 +