diff --git a/src/api/dike/index.js b/src/api/dike/index.js new file mode 100644 index 0000000..14c387d --- /dev/null +++ b/src/api/dike/index.js @@ -0,0 +1,10 @@ +// 堤防相关接口 +import request from '@/utils/request' + +// 巡查记录-巡查记录详情 +export function getDikePatrolDetails(id) { + return request({ + url: `/run/df/record/${id}`, + method: 'get', + }) +} diff --git a/src/views/dike/runManage/enginerring/components/Drawer.vue b/src/views/dike/runManage/enginerring/components/Drawer.vue index 9f0307b..8d77e16 100644 --- a/src/views/dike/runManage/enginerring/components/Drawer.vue +++ b/src/views/dike/runManage/enginerring/components/Drawer.vue @@ -1,5 +1,7 @@ @@ -121,9 +138,9 @@ export default { - - + diff --git a/src/views/dike/runManage/enginerring/components/GaoDeMap.vue b/src/views/dike/runManage/enginerring/components/GaoDeMap.vue index 57fae35..195fecd 100644 --- a/src/views/dike/runManage/enginerring/components/GaoDeMap.vue +++ b/src/views/dike/runManage/enginerring/components/GaoDeMap.vue @@ -193,12 +193,12 @@ export default { this.map = new AMap.Map("container", { // 设置地图容器id viewMode: "3D", // 是否为3D地图模式 - zoom: 18, // 初始化地图级别 + zoom: 15, // 初始化地图级别 doubleClickZoom: false, // 禁用双击放大 layers: [ satellite, ], - center: [113.43094, 23.10346], // 初始化地图中心点位置 + center: [112.90,23.36], // 初始化地图中心点位置 }); // 在地图加载完成后执行操作 diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue index e3e5031..2438ea3 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue @@ -6,6 +6,7 @@ import { postDFInspectionPlanlist, deleteDFInspectionPlan, listUser } from '@/api/management' import { uploadFileData } from '@/api/system/upload' + export default { name: 'InspectionItems', data() { @@ -32,6 +33,7 @@ export default { isReminder: false, reminderTime: '', operators: [], + files: [],//依据 otherConfig: { week: '', time: '', @@ -55,6 +57,9 @@ export default { isReminder: [ { required: true, message: '请选择消息提醒', trigger: 'change' } ], + 'otherConfig.time': [ + { required: true, message: '请选择检查时间', trigger: 'change' } + ], reminderTime: [ { required: true, message: '请选择提醒时间', trigger: 'change' } ], @@ -64,6 +69,11 @@ export default { } } }, + computed: { + disabledUpload(){ + return this.ruleForm?.files?.length >= 9 + } + }, methods: { // 编辑巡查项目 editTableItem(row) { @@ -115,6 +125,7 @@ export default { }, // 保存巡查项目 submitForm(formName) { + console.log('保存 >>> ', this.ruleForm) this.$refs[formName].validate((valid) => { if (valid) { let user = [] @@ -233,24 +244,24 @@ export default { // 上传前 beforeUpload(e){ console.log('beforeUpload >>>>> ', e) + if(this.ruleForm.files?.length>=9){ + return false + } return true }, handleUpload(e){ - console.log('e >>>>> ', e) const {file} = e let formData = new FormData() formData.append('file',file) uploadFileData(formData).then(res=>{ - console.log('res >>>>> ', res) - + console.log('上传结果 >>>>> ', res) + this.ruleForm.files.push(res.url) }).catch(err=>{ console.log('err >>>>> ', err) - }) }, - // 文件上传后 - handleChange(e){ - console.log('handleChange >>>>> ', e) + handleDelFile(_url,index){ + this.ruleForm.files.splice(index,1) }, // 重置搜索 resetSearch() { @@ -350,7 +361,7 @@ export default { :key="item.id"> /日期 - + @@ -380,24 +391,28 @@ export default { - + +
+
+
{{ item && item.split('/').slice(-1)[0] || ''}}
+ +
+
上传 - @@ -452,4 +467,10 @@ export default { } } + +.myflex{ + display: flex; + align-items: center; + justify-content: space-between; +} \ No newline at end of file diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue index 16babc6..534eeca 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue @@ -30,6 +30,10 @@ export default { timeField: "create_time" } }, + params: { + sort:'desc', + orderBy: 'create_time' + }, cv: { name: "name", type: "like", diff --git a/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue b/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue index 829b15e..6546c5e 100644 --- a/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue +++ b/src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue @@ -13,6 +13,9 @@ export default { }, methods: { + }, + created(){ + } } diff --git a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue index 3c7682f..7bd6102 100644 --- a/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/sluice/runManage/enginerring/inspectionPlan/index.vue @@ -29,6 +29,7 @@ export default { isReminder: false, reminderTime: '', operators: [], + files: [],//依据 otherConfig: { week: '', time: '', @@ -52,6 +53,9 @@ export default { isReminder: [ { required: true, message: '请选择消息提醒', trigger: 'change' } ], + 'otherConfig.time': [ + { required: true, message: '请选择检查时间', trigger: 'change' } + ], reminderTime: [ { required: true, message: '请选择提醒时间', trigger: 'change' } ], @@ -61,6 +65,11 @@ export default { } } }, + computed: { + disabledUpload(){ + return this.ruleForm?.files?.length >= 9 + } + }, methods: { // 编辑巡查项目 editTableItem(row) { @@ -229,6 +238,28 @@ export default { } }) }, + // 上传前 + beforeUpload(e){ + console.log('beforeUpload >>>>> ', e) + if(this.ruleForm.files?.length>=9){ + return false + } + return true + }, + handleUpload(e){ + const {file} = e + let formData = new FormData() + formData.append('file',file) + uploadFileData(formData).then(res=>{ + console.log('上传结果 >>>>> ', res) + this.ruleForm.files.push(res.url) + }).catch(err=>{ + console.log('err >>>>> ', err) + }) + }, + handleDelFile(_url,index){ + this.ruleForm.files.splice(index,1) + }, // 重置搜索 resetSearch() { this.searchInput = '' @@ -371,22 +402,28 @@ export default { - + +
+
+
{{ item && item.split('/').slice(-1)[0] || ''}}
+ +
+
上传 -