diff --git a/src/api/assess/clue.js b/src/api/assess/clue.js new file mode 100644 index 0000000..dd5d6df --- /dev/null +++ b/src/api/assess/clue.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' + +export function listclue(data) { + return request({ + url: '/api/admin/clue/index', + method: 'get', + data + }) +} + +export function get(id) { + return request({ + url: '/api/admin/clue/show', + method: 'get', + params: { id } + }) +} + +export function save(data) { + return request({ + url: '/api/admin/clue/save', + method: 'post', + data + }) +} + +export function del(id) { + return request({ + url: '/api/admin/clue/destroy', + method: 'get', + params:{ id } + }) +} diff --git a/src/api/inspectionmanagement/index.js b/src/api/inspectionmanagement/index.js index ea534c2..b0a4bd1 100644 --- a/src/api/inspectionmanagement/index.js +++ b/src/api/inspectionmanagement/index.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function listcommon(data) { +export function listplan(data) { return request({ - url: '/api/admin/common-inspection/index', + url: '/api/admin/plan/index', method: 'get', data }) @@ -10,23 +10,23 @@ export function listcommon(data) { export function get(id) { return request({ - url: '/api/admin/common-inspection/show', - method: 'post', + url: '/api/admin/plan/show', + method: 'get', params: { id } }) } export function save(data) { return request({ - url: '/api/admin/common-inspection/save', + url: '/api/admin/plan/save', method: 'post', data }) } -export function update(data) { +export function store(data) { return request({ - url: '/api/admin/common-inspection/update-status', + url: '/api/admin/plan/store', method: 'post', data }) @@ -34,7 +34,7 @@ export function update(data) { export function del(id) { return request({ - url: '/api/admin/common-inspection/destroy', + url: '/api/admin/plan/destroy', method: 'get', params:{ id } }) diff --git a/src/api/maintainmanagement/index.js b/src/api/maintainmanagement/index.js index 88d6628..879bcf3 100644 --- a/src/api/maintainmanagement/index.js +++ b/src/api/maintainmanagement/index.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function listplan(data) { return request({ - url: '/api/admin/plan/index', + url: '/api/admin/maintain-plan/index', method: 'get', data }) @@ -10,23 +10,23 @@ export function listplan(data) { export function get(id) { return request({ - url: '/api/admin/plan/show', - method: 'post', + url: '/api/admin/maintain-plan/show', + method: 'get', params: { id } }) } export function save(data) { return request({ - url: '/api/admin/plan/save', + url: '/api/admin/maintain-plan/save', method: 'post', data }) } -export function update(data) { +export function store(data) { return request({ - url: '/api/admin/plan/update-status', + url: '/api/admin/maintain-plan/store', method: 'post', data }) @@ -34,7 +34,7 @@ export function update(data) { export function del(id) { return request({ - url: '/api/admin/plan/destroy', + url: '/api/admin/maintain-plan/destroy', method: 'get', params:{ id } }) diff --git a/src/api/rain/order.js b/src/api/rain/order.js new file mode 100644 index 0000000..cbd2f09 --- /dev/null +++ b/src/api/rain/order.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +export function listorder(data) { + return request({ + url: '/api/admin/worksheet/index', + method: 'get', + data + }) +} + +export function get(id) { + return request({ + url: '/api/admin/worksheet/show', + method: 'get', + params: { id } + }) +} + +export function del(id) { + return request({ + url: '/api/admin/worksheet/destroy', + method: 'get', + params:{ id } + }) +} + +export function store(data) { + return request({ + url: '/api/admin/worksheet/store', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/admin/worksheet/save', + method: 'post', + data + }) +} diff --git a/src/views/assess/clue.vue b/src/views/assess/clue.vue new file mode 100644 index 0000000..6fca30f --- /dev/null +++ b/src/views/assess/clue.vue @@ -0,0 +1,572 @@ + + + + + diff --git a/src/views/assess/daily.vue b/src/views/assess/daily.vue index 219d1cd..2d5f1f8 100644 --- a/src/views/assess/daily.vue +++ b/src/views/assess/daily.vue @@ -348,7 +348,7 @@ import AvueMap from 'avue-plugin-map' }else{ this.normalstatus=1 this.otherstatus=2 - that.mapform = ['','','']; + this.mapform = ['','','']; } this.dialogFormVisible = true; }, diff --git a/src/views/basic/site.vue b/src/views/basic/site.vue index 753156d..d3f9b4a 100644 --- a/src/views/basic/site.vue +++ b/src/views/basic/site.vue @@ -327,6 +327,7 @@ // this.$set(that.form,res) console.log(result) that.form = result; + that.form.type = parseInt(result.type); that.mapform = [result.longitude,result.latitude,result.address] }).catch(error => { diff --git a/src/views/maintain/plan.vue b/src/views/maintain/plan.vue index 7e06615..b4c47d8 100644 --- a/src/views/maintain/plan.vue +++ b/src/views/maintain/plan.vue @@ -15,15 +15,18 @@
- + + :label="column.title" :width="column.width" :fixed="column.fixed"> @@ -47,28 +50,66 @@ - - + + + + + - - + + + + + - - + + + + + + - - + + + - - + + + + + @@ -94,12 +135,19 @@ - \ No newline at end of file + + + + + diff --git a/src/views/rain/maintain.vue b/src/views/rain/maintain.vue index 704cc40..06f5d15 100644 --- a/src/views/rain/maintain.vue +++ b/src/views/rain/maintain.vue @@ -785,7 +785,6 @@ files_deal_list:[], date:"", address:"", - files_list:[], }, formdetail:{ @@ -1106,7 +1105,7 @@ that.form = {}; that.rainMaintainLogs = [] that.end_types = 0; - this.$refs[formName].resetFields(); + // this.$refs[formName].resetFields(); that.dialogFormVisible = false; that.dialogFormDetailVisible = false; }, diff --git a/src/views/rain/order.vue b/src/views/rain/order.vue new file mode 100644 index 0000000..5816c45 --- /dev/null +++ b/src/views/rain/order.vue @@ -0,0 +1,439 @@ + + + + + diff --git a/vue.config.js b/vue.config.js index 89252fa..9672647 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,7 +46,7 @@ module.exports = { //before: require('./mock/mock-server.js') proxy: { [process.env.VUE_APP_BASE_API]: { - target: 'http://118.31.104.155:9003/', + target: 'http://patrol.115.langye.net/', changeOrigin: true, //配置跨域 pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''