diff --git a/sub-government-affairs-service/package.json b/sub-government-affairs-service/package.json index 1620349..aa481ec 100644 --- a/sub-government-affairs-service/package.json +++ b/sub-government-affairs-service/package.json @@ -21,6 +21,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.6.5", + "dayjs": "^1.11.13", "echarts": "^5.6.0", "element-plus": "^2.7.2", "js-base64": "^3.7.6", diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js index 5a55baf..0c75ffd 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -90,12 +90,12 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'), meta: { title: '知识库', icon: 'Document' }, }, - // { - // path: '/sub-government-affairs-service/patrolCaseManage', - // name: 'patrolCaseManage', - // component: () => import('@/views/inputSuppliesManage/patrolCaseManage/index.vue'), - // meta: { title: '巡查与案件管理', icon: 'Document' }, - // }, + { + path: '/sub-government-affairs-service/patrolCaseManage', + name: 'patrolCaseManage', + component: () => import('@/views/inputSuppliesManage/patrolCaseManage/index.vue'), + meta: { title: '巡查与案件管理', icon: 'Document' }, + }, ], }, ]; diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/common/RecordModal.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/common/RecordModal.vue new file mode 100644 index 0000000..bc97fb8 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/common/RecordModal.vue @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue index d0de85c..da372cb 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue @@ -1,19 +1,354 @@ - 巡查与案件 + + + + + + + + (照片、视频) + + + + + + + + + + 填写笔录 + + + + + - - + diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue index 90ec6b8..8c476b7 100644 --- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue @@ -2,7 +2,7 @@ 点击上传 - 只能上传{{ props.format.join() }} 文件,且不超过20MB + 只能上传{{ props.format.join() }} 文件,且不超过20MB @@ -41,6 +41,10 @@ const props = defineProps({ type: String, default: 'view', }, + tips: { + type: Boolean, + default: true, + }, }); /* --------------- data --------------- */ diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue index be1de86..6d98283 100644 --- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue @@ -422,16 +422,7 @@ const examineForm = reactive({ proof: [], attrs: [], }); -watch( - () => examineForm, - () => { - console.log('examineForm', examineForm.attrs); - }, - { - deep: true, - immediate: true, - } -); + // #endregion /* --------------- methods --------------- */