diff --git a/src/api/assess/assessRule.js b/src/api/assess/assessRule.js index ff509d5..8a3b0cf 100644 --- a/src/api/assess/assessRule.js +++ b/src/api/assess/assessRule.js @@ -11,7 +11,7 @@ // 设置考核规则 export function updateAssessFactor(params) { return request({ - url: '/assess/assessFactor/', + url: '/assess/updateAssessFactor', method: 'post', params }) diff --git a/src/api/assess/assessRule.js b/src/api/assess/assessRule.js index ff509d5..8a3b0cf 100644 --- a/src/api/assess/assessRule.js +++ b/src/api/assess/assessRule.js @@ -11,7 +11,7 @@ // 设置考核规则 export function updateAssessFactor(params) { return request({ - url: '/assess/assessFactor/', + url: '/assess/updateAssessFactor', method: 'post', params }) diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png new file mode 100644 index 0000000..4d694a8 --- /dev/null +++ b/src/assets/global_images/header.png Binary files differ diff --git a/src/api/assess/assessRule.js b/src/api/assess/assessRule.js index ff509d5..8a3b0cf 100644 --- a/src/api/assess/assessRule.js +++ b/src/api/assess/assessRule.js @@ -11,7 +11,7 @@ // 设置考核规则 export function updateAssessFactor(params) { return request({ - url: '/assess/assessFactor/', + url: '/assess/updateAssessFactor', method: 'post', params }) diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png new file mode 100644 index 0000000..4d694a8 --- /dev/null +++ b/src/assets/global_images/header.png Binary files differ diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/bg-blue.png Binary files differ diff --git a/src/api/assess/assessRule.js b/src/api/assess/assessRule.js index ff509d5..8a3b0cf 100644 --- a/src/api/assess/assessRule.js +++ b/src/api/assess/assessRule.js @@ -11,7 +11,7 @@ // 设置考核规则 export function updateAssessFactor(params) { return request({ - url: '/assess/assessFactor/', + url: '/assess/updateAssessFactor', method: 'post', params }) diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png new file mode 100644 index 0000000..4d694a8 --- /dev/null +++ b/src/assets/global_images/header.png Binary files differ diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/bg-blue.png Binary files differ diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/bg1.png Binary files differ diff --git a/src/api/assess/assessRule.js b/src/api/assess/assessRule.js index ff509d5..8a3b0cf 100644 --- a/src/api/assess/assessRule.js +++ b/src/api/assess/assessRule.js @@ -11,7 +11,7 @@ // 设置考核规则 export function updateAssessFactor(params) { return request({ - url: '/assess/assessFactor/', + url: '/assess/updateAssessFactor', method: 'post', params }) diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png new file mode 100644 index 0000000..4d694a8 --- /dev/null +++ b/src/assets/global_images/header.png Binary files differ diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/bg-blue.png Binary files differ diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/bg1.png Binary files differ diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue index 910e58f..028986c 100644 --- a/src/components/Map/arcgisMap.vue +++ b/src/components/Map/arcgisMap.vue @@ -179,6 +179,7 @@ center: [116.597, 28.24], // 初始显示的地图中心点，经纬度 zoom: 3 // 当前地图缩放等级 }) + this.view.ui._removeComponents(['zoom']) const that = this this.view.on('click', function(event) { @@ -217,8 +218,10 @@ query.units = 'meters' query.returnGeometry = true query.outFields = ['BGID', 'COMMUID', 'COMMUNAME'] + console.log(that.layers.dx2wGrid) that.layers.dx2wGrid.queryFeatures(query) .then(function(response) { + console.log(response) const result = response.features[0].attributes // 赋值 @@ -334,7 +337,7 @@ id: 'dxbjMph' }) this.layers.dx2wGrid = new this.esriObj.FeatureLayer({ - url: serverConfig.mapUrlBase + '/1', + url: serverConfig.mapUrlBase + '/6', id: 'gridLayer' }) @@ -513,8 +516,8 @@ diff --git a/src/api/assess/assessRule.js b/src/api/assess/assessRule.js index ff509d5..8a3b0cf 100644 --- a/src/api/assess/assessRule.js +++ b/src/api/assess/assessRule.js @@ -11,7 +11,7 @@ // 设置考核规则 export function updateAssessFactor(params) { return request({ - url: '/assess/assessFactor/', + url: '/assess/updateAssessFactor', method: 'post', params }) diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png new file mode 100644 index 0000000..4d694a8 --- /dev/null +++ b/src/assets/global_images/header.png Binary files differ diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/bg-blue.png Binary files differ diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/bg1.png Binary files differ diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue index 910e58f..028986c 100644 --- a/src/components/Map/arcgisMap.vue +++ b/src/components/Map/arcgisMap.vue @@ -179,6 +179,7 @@ center: [116.597, 28.24], // 初始显示的地图中心点，经纬度 zoom: 3 // 当前地图缩放等级 }) + this.view.ui._removeComponents(['zoom']) const that = this this.view.on('click', function(event) { @@ -217,8 +218,10 @@ query.units = 'meters' query.returnGeometry = true query.outFields = ['BGID', 'COMMUID', 'COMMUNAME'] + console.log(that.layers.dx2wGrid) that.layers.dx2wGrid.queryFeatures(query) .then(function(response) { + console.log(response) const result = response.features[0].attributes // 赋值 @@ -334,7 +337,7 @@ id: 'dxbjMph' }) this.layers.dx2wGrid = new this.esriObj.FeatureLayer({ - url: serverConfig.mapUrlBase + '/1', + url: serverConfig.mapUrlBase + '/6', id: 'gridLayer' }) @@ -513,8 +516,8 @@ diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index bac9652..3e518ed 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -253,6 +253,13 @@ callback(new Error('举报人电话不能为空')) } } + const verifyPersonValidator = (rule, value, callback) => { + if (value <= 0 && this.caseForm.isNeedVerify === '1') { + callback(new Error('请选择监督员')) + } else { + callback() + } + } return { caseForm: { reporterName: '', // 举报人姓名 @@ -278,22 +285,22 @@ description: '', // 案件描述 fieldintro: '', // 位置描述 verifyPersonId: '', // 核实人员id - photos: '' // 图片存储的地址 + fileIdVerify: '' // 图片存储的地址 }, // 表单 rules: { reporterName: [{ required: true, message: '举报人姓名不能为空', trigger: ['blur'] }], reporterPhone: [{ required: true, trigger: ['blur'], validator: phoneValidator }], - source: [{ required: true, message: '信息来源不能为空', trigger: ['change'] }], - caseLevel: [{ required: true, message: '案卷等级不能为空', trigger: ['change'] }], - eorc: [{ required: true, message: '案卷类别不能为空', trigger: ['change'] }], - casetypeCode: [{ required: true, message: '案卷大类不能为空', trigger: ['change'] }], - casetypeDetailCode: [{ required: true, message: '案卷小类不能为空', trigger: ['change'] }], + source: [{ required: true, message: '信息来源不能为空', trigger: ['blur'] }], + caseLevel: [{ required: true, message: '案卷等级不能为空', trigger: ['blur'] }], + eorc: [{ required: true, message: '案卷类别不能为空', trigger: ['blur'] }], + casetypeCode: [{ required: true, message: '案卷大类不能为空', trigger: ['blur'] }], + casetypeDetailCode: [{ required: true, message: '案卷小类不能为空', trigger: ['blur'] }], description: [{ required: true, message: '案卷描述不能为空', trigger: ['blur'] }], - fieldintro: [{ required: true, message: '位置描述不能为空', trigger: ['blur'] }] + fieldintro: [{ required: true, message: '位置描述不能为空', trigger: ['blur'] }], + verifyPersonId: [{ required: false, trigger: ['blur'], validator: verifyPersonValidator }] }, // 表单验证 hideUpload: false, fileList: [], - imageList: [], uploadPath: process.env.BASE_API + 'imageUpload', // 图片上传路径 dialogImageUrl: '', dialogVisible: false, @@ -353,6 +360,30 @@ this.initVerifyPerson() }, methods: { + initCaseForm: function() { + this.caseForm.reporterName = '' + this.caseForm.reporterPhone = '' + this.caseForm.isNeedVerify = '1' + this.caseForm.isNeedRevisit = '1' + this.caseForm.lng = '' + this.caseForm.lat = '' + this.caseForm.communityCode = '' + this.caseForm.communityName = '' + this.caseForm.gridId = '' + this.caseForm.componentId = '' + this.caseForm.casetypesTimeId = '' + this.caseForm.bzhours = 0 + this.caseForm.bzminis = 0 + this.caseForm.description = '' + this.caseForm.fieldintro = '' + this.caseForm.verifyPersonId = '' + this.caseForm.fileIdVerify = '' + this.caseForm.eorc = '' + this.caseForm.casetypeCode = '' + this.caseForm.casetypeDetailCode = '' + + this.$refs.upload.clearFiles() + }, initCaseSource: function() { getCaseSource().then(response => { this.caseSourceOpts = [] @@ -386,7 +417,6 @@ initVerifyPerson: function() { getVerifyPerson().then(response => { this.verifyPersonOpts = [] - console.log(response) for (const opt of response.data) { this.verifyPersonOpts.push(opt) } @@ -467,7 +497,6 @@ if (typeDetailId > 0) { getCaseTypesTime(typeDetailId).then(response => { - console.log(response) for (const opt of response.data) { this.caseTypeTimeOpts.push(opt) } @@ -544,11 +573,10 @@ this.fileList.forEach(photo => { photos += photo.url + ',' }) - this.caseForm.photos = photos.substring(0, photos.length - 1) + this.caseForm.fileIdVerify = photos.substring(0, photos.length - 1) } this.$refs['dataForm'].validate((valid) => { - console.log(valid) if (valid) { addCase(this.caseForm).then(function(response) { if (response.code === 200) { @@ -557,7 +585,10 @@ type: 'success' }) - that.$router.push({ path: '/dashboard' }) + // 重新赋值 + that.initCaseForm() + + that.$router.push({ path: '/supWork' }) } else { that.$message({ message: '添加案卷失败', @@ -573,7 +604,6 @@ console.log('uploadFile:' + file.file.name) // const base_url = process.env.BASE_API + '/static/' Uploadimg(file).then(res => { - console.log(res) if (res.code === 200) { this.fileList.push({ name: file.file.name, url: res.data }) } @@ -633,7 +663,6 @@ }, handleSuccess(response, file, fileList) { console.log('handleSuccess') - console.log(response) const base_url = process.env.BASE_API + '/static/' if (response.code === 200) { this.fileList.push({ name: file.file.name, url: base_url + response.data }) diff --git a/src/api/assess/assessRule.js b/src/api/assess/assessRule.js index ff509d5..8a3b0cf 100644 --- a/src/api/assess/assessRule.js +++ b/src/api/assess/assessRule.js @@ -11,7 +11,7 @@ // 设置考核规则 export function updateAssessFactor(params) { return request({ - url: '/assess/assessFactor/', + url: '/assess/updateAssessFactor', method: 'post', params }) diff --git a/src/assets/global_images/header.png b/src/assets/global_images/header.png new file mode 100644 index 0000000..4d694a8 --- /dev/null +++ b/src/assets/global_images/header.png Binary files differ diff --git a/src/assets/login_images/bg-blue.png b/src/assets/login_images/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/bg-blue.png Binary files differ diff --git a/src/assets/login_images/bg1.png b/src/assets/login_images/bg1.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/bg1.png Binary files differ diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue index 910e58f..028986c 100644 --- a/src/components/Map/arcgisMap.vue +++ b/src/components/Map/arcgisMap.vue @@ -179,6 +179,7 @@ center: [116.597, 28.24], // 初始显示的地图中心点，经纬度 zoom: 3 // 当前地图缩放等级 }) + this.view.ui._removeComponents(['zoom']) const that = this this.view.on('click', function(event) { @@ -217,8 +218,10 @@ query.units = 'meters' query.returnGeometry = true query.outFields = ['BGID', 'COMMUID', 'COMMUNAME'] + console.log(that.layers.dx2wGrid) that.layers.dx2wGrid.queryFeatures(query) .then(function(response) { + console.log(response) const result = response.features[0].attributes // 赋值 @@ -334,7 +337,7 @@ id: 'dxbjMph' }) this.layers.dx2wGrid = new this.esriObj.FeatureLayer({ - url: serverConfig.mapUrlBase + '/1', + url: serverConfig.mapUrlBase + '/6', id: 'gridLayer' }) @@ -513,8 +516,8 @@ diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue index bac9652..3e518ed 100644 --- a/src/views/callCase/callCase.vue +++ b/src/views/callCase/callCase.vue @@ -253,6 +253,13 @@ callback(new Error('举报人电话不能为空')) } } + const verifyPersonValidator = (rule, value, callback) => { + if (value <= 0 && this.caseForm.isNeedVerify === '1') { + callback(new Error('请选择监督员')) + } else { + callback() + } + } return { caseForm: { reporterName: '', // 举报人姓名 @@ -278,22 +285,22 @@ description: '', // 案件描述 fieldintro: '', // 位置描述 verifyPersonId: '', // 核实人员id - photos: '' // 图片存储的地址 + fileIdVerify: '' // 图片存储的地址 }, // 表单 rules: { reporterName: [{ required: true, message: '举报人姓名不能为空', trigger: ['blur'] }], reporterPhone: [{ required: true, trigger: ['blur'], validator: phoneValidator }], - source: [{ required: true, message: '信息来源不能为空', trigger: ['change'] }], - caseLevel: [{ required: true, message: '案卷等级不能为空', trigger: ['change'] }], - eorc: [{ required: true, message: '案卷类别不能为空', trigger: ['change'] }], - casetypeCode: [{ required: true, message: '案卷大类不能为空', trigger: ['change'] }], - casetypeDetailCode: [{ required: true, message: '案卷小类不能为空', trigger: ['change'] }], + source: [{ required: true, message: '信息来源不能为空', trigger: ['blur'] }], + caseLevel: [{ required: true, message: '案卷等级不能为空', trigger: ['blur'] }], + eorc: [{ required: true, message: '案卷类别不能为空', trigger: ['blur'] }], + casetypeCode: [{ required: true, message: '案卷大类不能为空', trigger: ['blur'] }], + casetypeDetailCode: [{ required: true, message: '案卷小类不能为空', trigger: ['blur'] }], description: [{ required: true, message: '案卷描述不能为空', trigger: ['blur'] }], - fieldintro: [{ required: true, message: '位置描述不能为空', trigger: ['blur'] }] + fieldintro: [{ required: true, message: '位置描述不能为空', trigger: ['blur'] }], + verifyPersonId: [{ required: false, trigger: ['blur'], validator: verifyPersonValidator }] }, // 表单验证 hideUpload: false, fileList: [], - imageList: [], uploadPath: process.env.BASE_API + 'imageUpload', // 图片上传路径 dialogImageUrl: '', dialogVisible: false, @@ -353,6 +360,30 @@ this.initVerifyPerson() }, methods: { + initCaseForm: function() { + this.caseForm.reporterName = '' + this.caseForm.reporterPhone = '' + this.caseForm.isNeedVerify = '1' + this.caseForm.isNeedRevisit = '1' + this.caseForm.lng = '' + this.caseForm.lat = '' + this.caseForm.communityCode = '' + this.caseForm.communityName = '' + this.caseForm.gridId = '' + this.caseForm.componentId = '' + this.caseForm.casetypesTimeId = '' + this.caseForm.bzhours = 0 + this.caseForm.bzminis = 0 + this.caseForm.description = '' + this.caseForm.fieldintro = '' + this.caseForm.verifyPersonId = '' + this.caseForm.fileIdVerify = '' + this.caseForm.eorc = '' + this.caseForm.casetypeCode = '' + this.caseForm.casetypeDetailCode = '' + + this.$refs.upload.clearFiles() + }, initCaseSource: function() { getCaseSource().then(response => { this.caseSourceOpts = [] @@ -386,7 +417,6 @@ initVerifyPerson: function() { getVerifyPerson().then(response => { this.verifyPersonOpts = [] - console.log(response) for (const opt of response.data) { this.verifyPersonOpts.push(opt) } @@ -467,7 +497,6 @@ if (typeDetailId > 0) { getCaseTypesTime(typeDetailId).then(response => { - console.log(response) for (const opt of response.data) { this.caseTypeTimeOpts.push(opt) } @@ -544,11 +573,10 @@ this.fileList.forEach(photo => { photos += photo.url + ',' }) - this.caseForm.photos = photos.substring(0, photos.length - 1) + this.caseForm.fileIdVerify = photos.substring(0, photos.length - 1) } this.$refs['dataForm'].validate((valid) => { - console.log(valid) if (valid) { addCase(this.caseForm).then(function(response) { if (response.code === 200) { @@ -557,7 +585,10 @@ type: 'success' }) - that.$router.push({ path: '/dashboard' }) + // 重新赋值 + that.initCaseForm() + + that.$router.push({ path: '/supWork' }) } else { that.$message({ message: '添加案卷失败', @@ -573,7 +604,6 @@ console.log('uploadFile:' + file.file.name) // const base_url = process.env.BASE_API + '/static/' Uploadimg(file).then(res => { - console.log(res) if (res.code === 200) { this.fileList.push({ name: file.file.name, url: res.data }) } @@ -633,7 +663,6 @@ }, handleSuccess(response, file, fileList) { console.log('handleSuccess') - console.log(response) const base_url = process.env.BASE_API + '/static/' if (response.code === 200) { this.fileList.push({ name: file.file.name, url: base_url + response.data }) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 7a18a96..c7fdd18 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,5 +1,5 @@