diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 6a15c31..55a7378 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -59,7 +59,7 @@ - + @@ -162,6 +162,12 @@ type: String, default: 'small' }, // 表格大小，默认，small,mini等，与el-table条件仙童 + checkFunc: { + type: Function, + default: function(row,index) { + return true + } + }, toolsOption: { type: Object, default: function() { diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 6a15c31..55a7378 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -59,7 +59,7 @@ - + @@ -162,6 +162,12 @@ type: String, default: 'small' }, // 表格大小，默认，small,mini等，与el-table条件仙童 + checkFunc: { + type: Function, + default: function(row,index) { + return true + } + }, toolsOption: { type: Object, default: function() { diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 163df71..28253ef 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -55,10 +55,10 @@ } } }, - interactions:{ + interactions: { type: Array, - default: ()=>{ - return ['keyboardpan','boxzoom'] + default: () => { + return ['keyboardpan', 'boxzoom'] } }, symbols: { @@ -93,7 +93,7 @@ latitude: '0', // 事件纬度 fmap: null, // fMap mapUrls: { - vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=6Q22E5RXMN&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' + vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=01N2EJWF4L&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' }, // 底图urls bgLayers: { vectorLayer: null // 矢量 diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 6a15c31..55a7378 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -59,7 +59,7 @@ - + @@ -162,6 +162,12 @@ type: String, default: 'small' }, // 表格大小，默认，small,mini等，与el-table条件仙童 + checkFunc: { + type: Function, + default: function(row,index) { + return true + } + }, toolsOption: { type: Object, default: function() { diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 163df71..28253ef 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -55,10 +55,10 @@ } } }, - interactions:{ + interactions: { type: Array, - default: ()=>{ - return ['keyboardpan','boxzoom'] + default: () => { + return ['keyboardpan', 'boxzoom'] } }, symbols: { @@ -93,7 +93,7 @@ latitude: '0', // 事件纬度 fmap: null, // fMap mapUrls: { - vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=6Q22E5RXMN&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' + vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=01N2EJWF4L&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' }, // 底图urls bgLayers: { vectorLayer: null // 矢量 diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index 6b0fbba..ebe3d04 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -49,7 +49,8 @@ - + + @@ -117,11 +118,11 @@ - - - - - + + + + + @@ -166,6 +167,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 6a15c31..55a7378 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -59,7 +59,7 @@ - + @@ -162,6 +162,12 @@ type: String, default: 'small' }, // 表格大小，默认，small,mini等，与el-table条件仙童 + checkFunc: { + type: Function, + default: function(row,index) { + return true + } + }, toolsOption: { type: Object, default: function() { diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 163df71..28253ef 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -55,10 +55,10 @@ } } }, - interactions:{ + interactions: { type: Array, - default: ()=>{ - return ['keyboardpan','boxzoom'] + default: () => { + return ['keyboardpan', 'boxzoom'] } }, symbols: { @@ -93,7 +93,7 @@ latitude: '0', // 事件纬度 fmap: null, // fMap mapUrls: { - vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=6Q22E5RXMN&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' + vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=01N2EJWF4L&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' }, // 底图urls bgLayers: { vectorLayer: null // 矢量 diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index 6b0fbba..ebe3d04 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -49,7 +49,8 @@ - + + @@ -117,11 +118,11 @@ - - - - - + + + + + @@ -166,6 +167,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 51a98d1..c27827b 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -49,7 +49,8 @@ - + + @@ -116,11 +117,11 @@ - - - - - + + + + + @@ -165,6 +166,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 6a15c31..55a7378 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -59,7 +59,7 @@ - + @@ -162,6 +162,12 @@ type: String, default: 'small' }, // 表格大小，默认，small,mini等，与el-table条件仙童 + checkFunc: { + type: Function, + default: function(row,index) { + return true + } + }, toolsOption: { type: Object, default: function() { diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 163df71..28253ef 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -55,10 +55,10 @@ } } }, - interactions:{ + interactions: { type: Array, - default: ()=>{ - return ['keyboardpan','boxzoom'] + default: () => { + return ['keyboardpan', 'boxzoom'] } }, symbols: { @@ -93,7 +93,7 @@ latitude: '0', // 事件纬度 fmap: null, // fMap mapUrls: { - vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=6Q22E5RXMN&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' + vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=01N2EJWF4L&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' }, // 底图urls bgLayers: { vectorLayer: null // 矢量 diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index 6b0fbba..ebe3d04 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -49,7 +49,8 @@ - + + @@ -117,11 +118,11 @@ - - - - - + + + + + @@ -166,6 +167,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 51a98d1..c27827b 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -49,7 +49,8 @@ - + + @@ -116,11 +117,11 @@ - - - - - + + + + + @@ -165,6 +166,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue index 9c2474b..386f93d 100644 --- a/src/views/caseManage/caseCommon/caseRecord.vue +++ b/src/views/caseManage/caseCommon/caseRecord.vue @@ -156,7 +156,7 @@ align: 'center' }, { - text: '备注', + text: '反馈结果', value: 'remarks', align: 'center' } diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 6a15c31..55a7378 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -59,7 +59,7 @@ - + @@ -162,6 +162,12 @@ type: String, default: 'small' }, // 表格大小，默认，small,mini等，与el-table条件仙童 + checkFunc: { + type: Function, + default: function(row,index) { + return true + } + }, toolsOption: { type: Object, default: function() { diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 163df71..28253ef 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -55,10 +55,10 @@ } } }, - interactions:{ + interactions: { type: Array, - default: ()=>{ - return ['keyboardpan','boxzoom'] + default: () => { + return ['keyboardpan', 'boxzoom'] } }, symbols: { @@ -93,7 +93,7 @@ latitude: '0', // 事件纬度 fmap: null, // fMap mapUrls: { - vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=6Q22E5RXMN&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' + vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=01N2EJWF4L&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' }, // 底图urls bgLayers: { vectorLayer: null // 矢量 diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index 6b0fbba..ebe3d04 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -49,7 +49,8 @@ - + + @@ -117,11 +118,11 @@ - - - - - + + + + + @@ -166,6 +167,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 51a98d1..c27827b 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -49,7 +49,8 @@ - + + @@ -116,11 +117,11 @@ - - - - - + + + + + @@ -165,6 +166,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue index 9c2474b..386f93d 100644 --- a/src/views/caseManage/caseCommon/caseRecord.vue +++ b/src/views/caseManage/caseCommon/caseRecord.vue @@ -156,7 +156,7 @@ align: 'center' }, { - text: '备注', + text: '反馈结果', value: 'remarks', align: 'center' } diff --git a/src/views/caseManage/caseCommon/caseSearch.vue b/src/views/caseManage/caseCommon/caseSearch.vue index ee21ad9..156b27c 100644 --- a/src/views/caseManage/caseCommon/caseSearch.vue +++ b/src/views/caseManage/caseCommon/caseSearch.vue @@ -40,8 +40,9 @@ - + + @@ -70,9 +71,9 @@ type: Object, default: null }, - state:{ // 页面状态，待办为waitHandle - type:String, - default:'all' + state: { // 页面状态，待办为waitHandle + type: String, + default: 'all' } }, data() { diff --git a/config/dev.env.js b/config/dev.env.js index 35fc0d7..d203606 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,9 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://11.100.6.163:8087/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/index.js b/config/index.js index def511d..7d3f1ec 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ // }, // after: require('./../mock/mock-server.js'), // Various Dev Server settings - host: '0.0.0.0', // can be overwritten by process.env.HOST + // host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 6a15c31..55a7378 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -59,7 +59,7 @@ - + @@ -162,6 +162,12 @@ type: String, default: 'small' }, // 表格大小，默认，small,mini等，与el-table条件仙童 + checkFunc: { + type: Function, + default: function(row,index) { + return true + } + }, toolsOption: { type: Object, default: function() { diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index 163df71..28253ef 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -55,10 +55,10 @@ } } }, - interactions:{ + interactions: { type: Array, - default: ()=>{ - return ['keyboardpan','boxzoom'] + default: () => { + return ['keyboardpan', 'boxzoom'] } }, symbols: { @@ -93,7 +93,7 @@ latitude: '0', // 事件纬度 fmap: null, // fMap mapUrls: { - vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=6Q22E5RXMN&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' + vectorMap: 'http://11.100.6.5:8084/services/images/GetImage.do?F-Auth-Key=01N2EJWF4L&method=showImageRedisBytable&table=MAP_PGISSL_GZ_V1&version=v1&l={z}&x={y}&y={x}' }, // 底图urls bgLayers: { vectorLayer: null // 矢量 diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index 6b0fbba..ebe3d04 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -49,7 +49,8 @@ - + + @@ -117,11 +118,11 @@ - - - - - + + + + + @@ -166,6 +167,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 51a98d1..c27827b 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -49,7 +49,8 @@ - + + @@ -116,11 +117,11 @@ - - - - - + + + + + @@ -165,6 +166,13 @@ soundShow: false // 显示音频弹窗 } }, + computed: { + address() { + const address_ori = [this.caseForm.areaName, this.caseForm.streetName, this.caseForm.communityName, this.caseForm.fieldintro] + const address = address_ori.filter(item => item && item.length > 0) + return address.join('-') + } + }, methods: { // 播放录音 playSound(sound) { diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue index 9c2474b..386f93d 100644 --- a/src/views/caseManage/caseCommon/caseRecord.vue +++ b/src/views/caseManage/caseCommon/caseRecord.vue @@ -156,7 +156,7 @@ align: 'center' }, { - text: '备注', + text: '反馈结果', value: 'remarks', align: 'center' } diff --git a/src/views/caseManage/caseCommon/caseSearch.vue b/src/views/caseManage/caseCommon/caseSearch.vue index ee21ad9..156b27c 100644 --- a/src/views/caseManage/caseCommon/caseSearch.vue +++ b/src/views/caseManage/caseCommon/caseSearch.vue @@ -40,8 +40,9 @@ - + + @@ -70,9 +71,9 @@ type: Object, default: null }, - state:{ // 页面状态，待办为waitHandle - type:String, - default:'all' + state: { // 页面状态，待办为waitHandle + type: String, + default: 'all' } }, data() { diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 8b1ed28..369a31e 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -1,10 +1,10 @@