diff --git a/sub-government-affairs-service/package.json b/sub-government-affairs-service/package.json index 34b5385..2fa4fe3 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..96c6867 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -23,10 +23,10 @@ const inputSuppliesRoutes = [ meta: { title: '物资管理', icon: 'Document' }, children: [ { - path: '/sub-government-affairs-service/material/pesticide', - name: 'input-supplies-pesticide', - component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - meta: { title: '农药管理', icon: 'Document' }, + path: '/sub-government-affairs-service/material/seed', + name: 'input-supplies-seed', + component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), + meta: { title: '种源管理', icon: 'Document' }, }, { path: '/sub-government-affairs-service/material/fertilizer', @@ -34,18 +34,18 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), meta: { title: '肥料管理', icon: 'Document' }, }, + { + path: '/sub-government-affairs-service/material/pesticide', + name: 'input-supplies-pesticide', + component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), + meta: { title: '农药管理', icon: 'Document' }, + }, { path: '/sub-government-affairs-service/material/ratPoison', name: 'input-supplies-ratPoison', component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), meta: { title: '兽药管理', icon: 'Document' }, }, - { - path: '/sub-government-affairs-service/material/seed', - name: 'input-supplies-seed', - component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), - meta: { title: '种源管理', icon: 'Document' }, - }, { path: '/sub-government-affairs-service/material/farmMachinery', name: 'input-supplies-farmMachinery', @@ -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 @@ 点击上传