diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue index 3345556..43889c4 100644 --- a/src/views/statistic/callStatistic/logStatistic.vue +++ b/src/views/statistic/callStatistic/logStatistic.vue @@ -146,6 +146,7 @@ }, fetchData() { this.listLoading = true + this.data = []; this.listQuery.workStartTime = this.workTime[0] this.listQuery.workEndTime = this.workTime[1] this.listQuery.breakStartTime = this.breakTime[0] @@ -157,7 +158,7 @@ outBusyStatistics(this.listQuery).then(response => { if (response.code === 200) { this.listLoading = false - this.list = response.data + this.data = response.data this.total = response.data.length // this.data = [ // { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' }, diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue index 3345556..43889c4 100644 --- a/src/views/statistic/callStatistic/logStatistic.vue +++ b/src/views/statistic/callStatistic/logStatistic.vue @@ -146,6 +146,7 @@ }, fetchData() { this.listLoading = true + this.data = []; this.listQuery.workStartTime = this.workTime[0] this.listQuery.workEndTime = this.workTime[1] this.listQuery.breakStartTime = this.breakTime[0] @@ -157,7 +158,7 @@ outBusyStatistics(this.listQuery).then(response => { if (response.code === 200) { this.listLoading = false - this.list = response.data + this.data = response.data this.total = response.data.length // this.data = [ // { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' }, diff --git a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue index 0d23bc8..5a98f09 100644 --- a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue @@ -23,7 +23,7 @@ import SearchItem from '../../../../components/SearchArea/SearchItem' // import { getDayTime, getToday } from '@/utils/dateutils' import ChartTools from '../../components/chartTools' -import { getToday } from '../../../../utils/dateutils' +import { getToday, getDaysTime } from '../../../../utils/dateutils' export default { name: 'CaseHandleSearch', components: { ChartTools, SearchItem, SearchArea }, @@ -51,7 +51,8 @@ } }, created() { - this.timeRange = [getToday('yyyy-MM-dd'), getToday('yyyy-MM-dd')] + const { startTime, endTime } = getDaysTime(30, 'yyyy-MM-dd') + this.timeRange = [startTime, endTime] this.search() }, methods: { diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue index 3345556..43889c4 100644 --- a/src/views/statistic/callStatistic/logStatistic.vue +++ b/src/views/statistic/callStatistic/logStatistic.vue @@ -146,6 +146,7 @@ }, fetchData() { this.listLoading = true + this.data = []; this.listQuery.workStartTime = this.workTime[0] this.listQuery.workEndTime = this.workTime[1] this.listQuery.breakStartTime = this.breakTime[0] @@ -157,7 +158,7 @@ outBusyStatistics(this.listQuery).then(response => { if (response.code === 200) { this.listLoading = false - this.list = response.data + this.data = response.data this.total = response.data.length // this.data = [ // { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' }, diff --git a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue index 0d23bc8..5a98f09 100644 --- a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue @@ -23,7 +23,7 @@ import SearchItem from '../../../../components/SearchArea/SearchItem' // import { getDayTime, getToday } from '@/utils/dateutils' import ChartTools from '../../components/chartTools' -import { getToday } from '../../../../utils/dateutils' +import { getToday, getDaysTime } from '../../../../utils/dateutils' export default { name: 'CaseHandleSearch', components: { ChartTools, SearchItem, SearchArea }, @@ -51,7 +51,8 @@ } }, created() { - this.timeRange = [getToday('yyyy-MM-dd'), getToday('yyyy-MM-dd')] + const { startTime, endTime } = getDaysTime(30, 'yyyy-MM-dd') + this.timeRange = [startTime, endTime] this.search() }, methods: { diff --git a/src/views/statistic/caseStatistic/components/caseTable.vue b/src/views/statistic/caseStatistic/components/caseTable.vue index e7aba06..976e5d8 100644 --- a/src/views/statistic/caseStatistic/components/caseTable.vue +++ b/src/views/statistic/caseStatistic/components/caseTable.vue @@ -42,22 +42,22 @@ text: '受理事件数', value: 'caseNum' }, - { - text: '催办数', - value: 'urgeNum' - }, - { - text: '督办数', - value: 'superviseNum' - }, - { - text: '监察数', - value: 'monitorNum' - }, - { - text: '延期数', - value: 'delayNum' - }, + // { + // text: '催办数', + // value: 'urgeNum' + // }, + // { + // text: '督办数', + // value: 'superviseNum' + // }, + // { + // text: '监察数', + // value: 'monitorNum' + // }, + // { + // text: '延期数', + // value: 'delayNum' + // }, { text: '已办结数及占比', value: 'overCaseNum' diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/config/dev.env.js b/config/dev.env.js index 35311ea..2afdcdf 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -1,8 +1,8 @@ -'use strict' +"use strict"; //引入webpack的merge插件，用来合并对象，也就是配置文件用的，相同的选项会被覆盖 -const merge = require('webpack-merge') +const merge = require("webpack-merge"); //导入prod.env.js配置文件 -const prodEnv = require('./prod.env') +const prodEnv = require("./prod.env"); // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', @@ -11,9 +11,11 @@ // BASE_API: '"http://192.168.0.212:8083"' // BASE_API: '"http://192.168.13.116:8085/callcenter/api"' BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + // BASE_API: '"http://192.168.8.105:11402/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/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"' // BASE_API: '"http://127.0.0.1:8083"' -}) +}); diff --git a/config/prod.env.js b/config/prod.env.js index 49ff2d2..1f378cf 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,7 +4,8 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://10.18.0.23:8083/callcenter/api"' // BASE_API: '"http://10.18.0.94:8083/callcenter/api"' - BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + // BASE_API: '"http://11.100.6.163:8083/callcenter/api"' + BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://localhost:8083/callcenter/api"' // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://127.0.0.1:8085"' diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..b184c3b --- /dev/null +++ b/dist.zip Binary files differ diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 34b63ac..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/package.json b/package.json index fb32aa2..c325e45 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-amap": "^0.5.9", "vue-baidu-map": "^0.21.22", "vue-router": "3.0.1", + "vue-slide-mini": "^1.0.4", "vuex": "3.0.1", "wangeditor": "^3.1.1" }, diff --git a/src/api/callCase.js b/src/api/callCase.js index cd61986..f80c31d 100644 --- a/src/api/callCase.js +++ b/src/api/callCase.js @@ -126,3 +126,48 @@ } }) } + +// 社会治理事流转步骤接口 +export function eventStepList(params) { + return request({ + url: '/case/eventStepList', + // method: 'post', + params + }) +} + + +// 社会治理事流转步骤接口 运维 +export function eventCenterList(params) { + return request({ + url: '/case/eventCenterList', + // method: 'post', + params + }) +} + + +export function processPicture(params) { + return request({ + url: 'case/processPicture', + // method: 'post', + params + }) +} + +// 社会治理-事件详情查询接口 +export function socialDetail(params) { + return request({ + url: '/case/social-detail', + // method: 'post', + params + }) +} +// 代录事件-快速结案 +export function quicklyClosure(data) { + return request({ + url: '/sound/updateQuickRemarks', + method: 'post', + data + }) +} diff --git a/src/api/cti.js b/src/api/cti.js index 790c156..f4bd402 100644 --- a/src/api/cti.js +++ b/src/api/cti.js @@ -16,7 +16,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -31,7 +31,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -47,7 +47,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) @@ -62,7 +62,7 @@ type: 'get', params: { username: 'Admin', - password: 'admin' + password: 'admin123456' } } }) diff --git a/src/api/login.js b/src/api/login.js index 0f9f5b9..72792ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -8,10 +8,13 @@ }) } // 特殊登录,直接请求 -export function applogin() { +export function appLogin(ticket) { return request({ - url: '/app/token', - method: 'get' + url: '/client/getTokenByTicket', + method: 'post', + params:{ + ticket:ticket + } }) } // 获取用户信息 diff --git a/src/api/map.js b/src/api/map.js new file mode 100644 index 0000000..adc676d --- /dev/null +++ b/src/api/map.js @@ -0,0 +1,21 @@ +// 精一地图相关请求 + +import request from '@/utils/request' + +export function matchReverse(lng,lat) { + return request({ + url: 'http://11.100.6.5:8084/services/address/matchReverse', + method: 'post', + headers:{ + 'F-Auth-Key': '59T1JU2P28', + 'Content-Type': 'application/json;charset=UTF-8' + }, + data:{ + xcoord: lng, + ycoord: lat, + thresholdValue: 100, + dzlx: 1, + rownum: 1 + } + }) +} diff --git a/src/api/qualityCheck.js b/src/api/qualityCheck.js index 372fef3..9195ec1 100644 --- a/src/api/qualityCheck.js +++ b/src/api/qualityCheck.js @@ -144,3 +144,12 @@ } }) } + +// 获得处置人员列表 +export function getKefuList(params) { + return request({ + url: '/mgr/simpleAllList', + method: 'post', + params + }) +} diff --git a/src/assets/global_images/appLogo.png b/src/assets/global_images/appLogo.png index 9926c89..b7d257b 100644 --- a/src/assets/global_images/appLogo.png +++ b/src/assets/global_images/appLogo.png Binary files differ diff --git a/src/assets/global_images/done.png b/src/assets/global_images/done.png new file mode 100644 index 0000000..c9a2c5e --- /dev/null +++ b/src/assets/global_images/done.png Binary files differ diff --git a/src/assets/global_images/process.png b/src/assets/global_images/process.png new file mode 100644 index 0000000..311fe3a --- /dev/null +++ b/src/assets/global_images/process.png Binary files differ diff --git a/src/components/NomalTable/index.vue b/src/components/NomalTable/index.vue index 55a7378..76b4599 100644 --- a/src/components/NomalTable/index.vue +++ b/src/components/NomalTable/index.vue @@ -55,7 +55,7 @@ - + @@ -176,7 +176,15 @@ refresh: false // 是否需要刷新按钮 } } - }// 表格工具配置 + },// 表格工具配置 + height:{ + type: String, + }, + // 某一列样式 + cellStyle: { + type: Function, + default: () => {} + } }, data() { return { diff --git a/src/components/SelectTree/singleSelect.vue b/src/components/SelectTree/singleSelect.vue index ba15b20..3336346 100644 --- a/src/components/SelectTree/singleSelect.vue +++ b/src/components/SelectTree/singleSelect.vue @@ -6,7 +6,8 @@ trigger="click" class="select-tree scrollbar" @show="onShowPopover" - @hide="onHidePopover"> + @hide="onHidePopover" + > + @node-click="onClickNode" + /> + suffix-icon="el-icon-arrow-down" + /> diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue index 3345556..43889c4 100644 --- a/src/views/statistic/callStatistic/logStatistic.vue +++ b/src/views/statistic/callStatistic/logStatistic.vue @@ -146,6 +146,7 @@ }, fetchData() { this.listLoading = true + this.data = []; this.listQuery.workStartTime = this.workTime[0] this.listQuery.workEndTime = this.workTime[1] this.listQuery.breakStartTime = this.breakTime[0] @@ -157,7 +158,7 @@ outBusyStatistics(this.listQuery).then(response => { if (response.code === 200) { this.listLoading = false - this.list = response.data + this.data = response.data this.total = response.data.length // this.data = [ // { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' }, diff --git a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue index 0d23bc8..5a98f09 100644 --- a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue @@ -23,7 +23,7 @@ import SearchItem from '../../../../components/SearchArea/SearchItem' // import { getDayTime, getToday } from '@/utils/dateutils' import ChartTools from '../../components/chartTools' -import { getToday } from '../../../../utils/dateutils' +import { getToday, getDaysTime } from '../../../../utils/dateutils' export default { name: 'CaseHandleSearch', components: { ChartTools, SearchItem, SearchArea }, @@ -51,7 +51,8 @@ } }, created() { - this.timeRange = [getToday('yyyy-MM-dd'), getToday('yyyy-MM-dd')] + const { startTime, endTime } = getDaysTime(30, 'yyyy-MM-dd') + this.timeRange = [startTime, endTime] this.search() }, methods: { diff --git a/src/views/statistic/caseStatistic/components/caseTable.vue b/src/views/statistic/caseStatistic/components/caseTable.vue index e7aba06..976e5d8 100644 --- a/src/views/statistic/caseStatistic/components/caseTable.vue +++ b/src/views/statistic/caseStatistic/components/caseTable.vue @@ -42,22 +42,22 @@ text: '受理事件数', value: 'caseNum' }, - { - text: '催办数', - value: 'urgeNum' - }, - { - text: '督办数', - value: 'superviseNum' - }, - { - text: '监察数', - value: 'monitorNum' - }, - { - text: '延期数', - value: 'delayNum' - }, + // { + // text: '催办数', + // value: 'urgeNum' + // }, + // { + // text: '督办数', + // value: 'superviseNum' + // }, + // { + // text: '监察数', + // value: 'monitorNum' + // }, + // { + // text: '延期数', + // value: 'delayNum' + // }, { text: '已办结数及占比', value: 'overCaseNum' diff --git a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue index 75c5083..bd75077 100644 --- a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue @@ -14,14 +14,14 @@ start-placeholder="处理开始时间" end-placeholder="处理结束时间"/> - - 事件等级： - - 一级 - 二级 - - - + + + + + + + + @@ -29,7 +29,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue index 3345556..43889c4 100644 --- a/src/views/statistic/callStatistic/logStatistic.vue +++ b/src/views/statistic/callStatistic/logStatistic.vue @@ -146,6 +146,7 @@ }, fetchData() { this.listLoading = true + this.data = []; this.listQuery.workStartTime = this.workTime[0] this.listQuery.workEndTime = this.workTime[1] this.listQuery.breakStartTime = this.breakTime[0] @@ -157,7 +158,7 @@ outBusyStatistics(this.listQuery).then(response => { if (response.code === 200) { this.listLoading = false - this.list = response.data + this.data = response.data this.total = response.data.length // this.data = [ // { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' }, diff --git a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue index 0d23bc8..5a98f09 100644 --- a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue @@ -23,7 +23,7 @@ import SearchItem from '../../../../components/SearchArea/SearchItem' // import { getDayTime, getToday } from '@/utils/dateutils' import ChartTools from '../../components/chartTools' -import { getToday } from '../../../../utils/dateutils' +import { getToday, getDaysTime } from '../../../../utils/dateutils' export default { name: 'CaseHandleSearch', components: { ChartTools, SearchItem, SearchArea }, @@ -51,7 +51,8 @@ } }, created() { - this.timeRange = [getToday('yyyy-MM-dd'), getToday('yyyy-MM-dd')] + const { startTime, endTime } = getDaysTime(30, 'yyyy-MM-dd') + this.timeRange = [startTime, endTime] this.search() }, methods: { diff --git a/src/views/statistic/caseStatistic/components/caseTable.vue b/src/views/statistic/caseStatistic/components/caseTable.vue index e7aba06..976e5d8 100644 --- a/src/views/statistic/caseStatistic/components/caseTable.vue +++ b/src/views/statistic/caseStatistic/components/caseTable.vue @@ -42,22 +42,22 @@ text: '受理事件数', value: 'caseNum' }, - { - text: '催办数', - value: 'urgeNum' - }, - { - text: '督办数', - value: 'superviseNum' - }, - { - text: '监察数', - value: 'monitorNum' - }, - { - text: '延期数', - value: 'delayNum' - }, + // { + // text: '催办数', + // value: 'urgeNum' + // }, + // { + // text: '督办数', + // value: 'superviseNum' + // }, + // { + // text: '监察数', + // value: 'monitorNum' + // }, + // { + // text: '延期数', + // value: 'delayNum' + // }, { text: '已办结数及占比', value: 'overCaseNum' diff --git a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue index 75c5083..bd75077 100644 --- a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue @@ -14,14 +14,14 @@ start-placeholder="处理开始时间" end-placeholder="处理结束时间"/> - - 事件等级： - - 一级 - 二级 - - - + + + + + + + + @@ -29,7 +29,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue index 3345556..43889c4 100644 --- a/src/views/statistic/callStatistic/logStatistic.vue +++ b/src/views/statistic/callStatistic/logStatistic.vue @@ -146,6 +146,7 @@ }, fetchData() { this.listLoading = true + this.data = []; this.listQuery.workStartTime = this.workTime[0] this.listQuery.workEndTime = this.workTime[1] this.listQuery.breakStartTime = this.breakTime[0] @@ -157,7 +158,7 @@ outBusyStatistics(this.listQuery).then(response => { if (response.code === 200) { this.listLoading = false - this.list = response.data + this.data = response.data this.total = response.data.length // this.data = [ // { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' }, diff --git a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue index 0d23bc8..5a98f09 100644 --- a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue @@ -23,7 +23,7 @@ import SearchItem from '../../../../components/SearchArea/SearchItem' // import { getDayTime, getToday } from '@/utils/dateutils' import ChartTools from '../../components/chartTools' -import { getToday } from '../../../../utils/dateutils' +import { getToday, getDaysTime } from '../../../../utils/dateutils' export default { name: 'CaseHandleSearch', components: { ChartTools, SearchItem, SearchArea }, @@ -51,7 +51,8 @@ } }, created() { - this.timeRange = [getToday('yyyy-MM-dd'), getToday('yyyy-MM-dd')] + const { startTime, endTime } = getDaysTime(30, 'yyyy-MM-dd') + this.timeRange = [startTime, endTime] this.search() }, methods: { diff --git a/src/views/statistic/caseStatistic/components/caseTable.vue b/src/views/statistic/caseStatistic/components/caseTable.vue index e7aba06..976e5d8 100644 --- a/src/views/statistic/caseStatistic/components/caseTable.vue +++ b/src/views/statistic/caseStatistic/components/caseTable.vue @@ -42,22 +42,22 @@ text: '受理事件数', value: 'caseNum' }, - { - text: '催办数', - value: 'urgeNum' - }, - { - text: '督办数', - value: 'superviseNum' - }, - { - text: '监察数', - value: 'monitorNum' - }, - { - text: '延期数', - value: 'delayNum' - }, + // { + // text: '催办数', + // value: 'urgeNum' + // }, + // { + // text: '督办数', + // value: 'superviseNum' + // }, + // { + // text: '监察数', + // value: 'monitorNum' + // }, + // { + // text: '延期数', + // value: 'delayNum' + // }, { text: '已办结数及占比', value: 'overCaseNum' diff --git a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue index 75c5083..bd75077 100644 --- a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue @@ -14,14 +14,14 @@ start-placeholder="处理开始时间" end-placeholder="处理结束时间"/> - - 事件等级： - - 一级 - 二级 - - - + + + + + + + + @@ -29,7 +29,7 @@ diff --git a/src/components/fMap/components/fMap.vue b/src/components/fMap/components/fMap.vue index b0d6791..d4352b3 100644 --- a/src/components/fMap/components/fMap.vue +++ b/src/components/fMap/components/fMap.vue @@ -85,7 +85,11 @@ poiBaseUrl: { type: String, default: 'http://11.100.6.5:8084/services/resource/singleSearch/' - } + }, + matchServiceUrl:{ + type: String, + default: 'http://11.100.6.5:8084/services/address/matchReverse/' + } // 逆地址解析服务 }, data() { return { @@ -153,6 +157,7 @@ } } }, + // 查询位置 queryPoi(keyword) { // 清除之前的查询结果 this.fmap.clearLayer('poi') @@ -180,6 +185,10 @@ }) } }, + // 逆地址解析 + queryAddress(){ + + }, // 清空地图 clearMap() { this.fmap.clearMap() diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 46e9054..ae241e2 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -66,7 +66,7 @@ // if (BASE_API.search('http://10.18.0.94') !== -1) { if (BASE_API.search('http://11.100.6.163') !== -1) { // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' - window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' + // window.location.href = 'http://11.100.5.19:8086/platform-sso-server/logout' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 0fd4401..2b51ecc 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -6,6 +6,7 @@ + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseFormProcess.vue b/src/views/caseManage/caseCommon/caseFormProcess.vue index ebe3d04..e53ee82 100644 --- a/src/views/caseManage/caseCommon/caseFormProcess.vue +++ b/src/views/caseManage/caseCommon/caseFormProcess.vue @@ -4,119 +4,201 @@ - + - + - + - + - + - + + + + + + + + + + + + + + + - - - - - - + - - - + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - 回访拨号 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + +
+ 本地号码 + 外地号码 +
+ 回访拨号 + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @@ -132,74 +214,132 @@ width="600px" append-to-body custom-class="sound-dialog" - @close="closeSound"> - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index e754d2c..b203f96 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -4,125 +4,190 @@ - + - + - + - + - + - + + + + + + + + + + + + - - - - - - - - - - + + + + + - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - 播放录音 - - - - - - - - 播放录音 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 播放录音 + + + + + + + + 播放录音 + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + - + @close="closeSound" + > + + diff --git a/src/views/caseManage/caseCommon/caseImgShow.vue b/src/views/caseManage/caseCommon/caseImgShow.vue new file mode 100644 index 0000000..c6c911d --- /dev/null +++ b/src/views/caseManage/caseCommon/caseImgShow.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 64cc490..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -1,9 +1,28 @@ @@ -97,34 +116,34 @@ width: 160, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } - // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 - // { - // text: '处理类型', - // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', - // align: 'center' - // }, - // { - // text: '受理人', - // value: 'createUserName', - // // width: 120, - // align: 'center' - // }, - // { - // text: '限办日期', - // value: 'limitedTime', - // width: 160, - // align: 'center' - // } + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } + // 为了手动处理“处理类型”字段，把后面两个字段也放进slot里了 + // { + // text: '处理类型', + // value: 'eorcName' + 'caseTypeName' + 'caseDetailTypeName', + // align: 'center' + // }, + // { + // text: '受理人', + // value: 'createUserName', + // // width: 120, + // align: 'center' + // }, + // { + // text: '限办日期', + // value: 'limitedTime', + // width: 160, + // align: 'center' + // } ] // 显示列 } }, @@ -183,7 +202,31 @@ this.listQuery.offset = val.page } this.$emit('changePage', this.listQuery) + }, + cellStyle({ row, column, rowIndex, columnIndex }) { + if (column.label === '处理状态') { + const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' + return bg + } else { + return '' + } } } } + diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue index f10da08..74ceb8d 100644 --- a/src/views/caseManage/caseCommon/caseProcess.vue +++ b/src/views/caseManage/caseCommon/caseProcess.vue @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseProcessTable.vue b/src/views/caseManage/caseCommon/caseProcessTable.vue new file mode 100644 index 0000000..5d244be --- /dev/null +++ b/src/views/caseManage/caseCommon/caseProcessTable.vue @@ -0,0 +1,371 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/data.json b/src/views/caseManage/caseCommon/data.json new file mode 100644 index 0000000..c17c2f2 --- /dev/null +++ b/src/views/caseManage/caseCommon/data.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村赣湘小厨", + "severelyType":"", + "attachments":[], + "reportName":"解", + "latitude":"25.76257657", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-13 02:03:36", + "pType":"RJ0110", + "eventName":"测试回调函数", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87774388", + "eventId":"36070220105420221213140140125204", + "reportSex":"", + "eventContent":"测试回调函数", + "sourceEventId":"1602544748664451074HJZX", + "reportPhone":"13198463119", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村赣湘小厨", + "name":"解", + "businessStatus":"", + "time":"2022-12-13 02:03:36", + "appCode":"HJZX", + "id":"1052223786985201664", + "content":"测试回调函数", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-13 02:03:36", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process.json b/src/views/caseManage/caseCommon/process.json new file mode 100644 index 0000000..5abf64b --- /dev/null +++ b/src/views/caseManage/caseCommon/process.json @@ -0,0 +1,246 @@ +[ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [ + { + "children": [], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "id": "769D5F8C96344AB79616697E38FE1348", + "info": { + "processNextAssigneeDeptName": "", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "区公安分局处置人员", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "769D5F8C96344AB79616697E38FE1348", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "区公安分局待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546461", + "dataLv": "", + "processNextTaskId": "6854826", + "parentInstanceId": "", + "createTime": "2021-12-07 10:16:39", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "39922E4D2D3C4116A806009CF3B88B74", + "processTaskId": "6853426", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "fd9bbfc931718ae7c3d3d6701c12dc73" + } + } + ], + "processStepTitle": "蓉江新区同意退回", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "同意", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "蓉江新区同意退回", + "isAuto": "", + "id": "39922E4D2D3C4116A806009CF3B88B74", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "蓉江新区退回审批", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6853426", + "parentInstanceId": "", + "createTime": "2021-12-07 09:56:16", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "F25E804A8A1B45D3B04055A082D84C45", + "processTaskId": "6852217", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "潭东镇申请退回", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "案件无法处理", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "潭东镇申请退回", + "isAuto": "", + "id": "F25E804A8A1B45D3B04055A082D84C45", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "蓉江新区退回审批", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6852217", + "parentInstanceId": "", + "createTime": "2021-12-07 09:40:09", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "0669CC05742D4898AE16B027C7CE0D37", + "processTaskId": "6851813", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "3c409e06b4d26e15a81dbe01040fef96" + } + } + ], + "processStepTitle": "签收", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "郭家智", + "processNextAssigneeName": "郭家智", + "processStepTitle": "签收", + "isAuto": "", + "id": "0669CC05742D4898AE16B027C7CE0D37", + "processType": "15", + "processAssigneeDeptName": "潭东镇", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "潭东镇待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6851813", + "parentInstanceId": "", + "createTime": "2021-12-07 09:36:43", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processTaskId": "6403785", + "processAssigneeId": "465546126", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "蓉江新区分拨", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "info": { + "processNextAssigneeDeptName": "潭东镇", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "王碧莹", + "processNextAssigneeName": "郭家智", + "processStepTitle": "蓉江新区分拨", + "isAuto": "", + "id": "2AC591EC66C94BCD8D07E8D8E14BC176", + "processType": "15", + "processAssigneeDeptName": "蓉江新区", + "processNextTaskName": "潭东镇待分拨", + "processTaskName": "蓉江新区待分拨", + "processNextAssigneeId": "465546126", + "dataLv": "", + "processNextTaskId": "6403785", + "parentInstanceId": "", + "createTime": "2021-12-03 17:59:33", + "applyWay": "1", + "processInstId": "6402408", + "parentTitleId": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processTaskId": "6402483", + "processAssigneeId": "465546249", + "processStepName": "", + "fileId": "e28df5c4660e8a150266034b978e8a41" + } + } + ], + "processStepTitle": "上报蓉江新区", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "info": { + "processNextAssigneeDeptName": "蓉江新区", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "王碧莹", + "processStepTitle": "上报蓉江新区", + "isAuto": "", + "id": "6CA1C5A1648A45A8849F0A6C88CF999C", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "蓉江新区待分拨", + "processTaskName": "专项系统对接待分拨", + "processNextAssigneeId": "465546249", + "dataLv": "", + "processNextTaskId": "6402483", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:44", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "E0FEC8D424FA472B9C0C56D43E24D089", + "processTaskId": "6402456", + "processAssigneeId": "465546017", + "processStepName": "", + "fileId": "" + } + } + ], + "processStepTitle": "新建", + "parentTitleId": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "info": { + "processNextAssigneeDeptName": "专项系统对接", + "regulationCompleteTime": "", + "businessId": "6f30bbd251a74157af96e3f8aa63271d", + "processStepExtend": "", + "approveMsg": "", + "processAssigneeName": "呼叫中心系统", + "processNextAssigneeName": "呼叫中心系统", + "processStepTitle": "新建", + "isAuto": "", + "id": "E0FEC8D424FA472B9C0C56D43E24D089", + "processType": "15", + "processAssigneeDeptName": "专项系统对接", + "processNextTaskName": "专项系统对接待分拨", + "processTaskName": "", + "processNextAssigneeId": "465546017", + "dataLv": "", + "processNextTaskId": "6402456", + "parentInstanceId": "", + "createTime": "2021-12-03 17:06:43", + "applyWay": "", + "processInstId": "6402408", + "parentTitleId": "", + "processTaskId": "", + "processAssigneeId": "465546017", + "processStepName": "提交", + "fileId": "" + } + } +] \ No newline at end of file diff --git a/src/views/caseManage/caseCommon/process2.json b/src/views/caseManage/caseCommon/process2.json new file mode 100644 index 0000000..cc68591 --- /dev/null +++ b/src/views/caseManage/caseCommon/process2.json @@ -0,0 +1,53 @@ +{ + "code":200, + "data":{ + "record":{ + "eventAddress":"潭东镇短井村艺品高艺术玻璃", + "severelyType":"", + "attachments":[], + "reportName":"李先生", + "latitude":"25.75991582", + "eventSource":"呼叫中心", + "typeTree":"运维监控管理/视频监控异常", + "remark":"", + "appCode":"HJZX", + "type":"RJ011001", + "completionTime":"", + "isSecret":0, + "sourceUnifyCode":"", + "eventTime":"2022-12-09 10:55:02", + "pType":"RJ0110", + "eventName":"测试运维事件", + "keyword":"", + "conceptStatus":"40", + "flowId":"ZNWY543543:1:3a9a7605-2d99-11ec-98c9-426fdd6b9d85", + "longitude":"114.87731472", + "eventId":"36070220105420221209105315814666", + "reportSex":"", + "eventContent":"测试运维事件", + "sourceEventId":"1601047740996882434HJZX", + "reportPhone":"18600202639", + "eventLv":"C", + "extend":"", + "assignList":[ + { + "attachments":[], + "unionId":"", + "statusDesc":"潭东镇短井村艺品高艺术玻璃", + "name":"李先生", + "businessStatus":"", + "time":"2022-12-09 10:55:02", + "appCode":"HJZX", + "id":"1050726821961146368", + "content":"测试运维事件", + "status":"20" + } + ], + "isOpen":0, + "reportTime":"2022-12-09 10:55:02", + "status":4 + } + }, + "message":"请求成功", + "success":true +} \ No newline at end of file diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue index 0fc16f1..595b06a 100644 --- a/src/views/caseManage/caseDetail.vue +++ b/src/views/caseManage/caseDetail.vue @@ -4,131 +4,418 @@
-
事件基础信息
 + +
+ 事件基础信息 +
- - + + +
+ + +
+ + +
+ 事件处理流程 +
+ + + + + + + + + + +
+ +
+ + +
+ 事件流程处理 +
+ + + +
+ +
+
-
事件地图
 + +
+ 事件地图 +
+ - +
- - -
- -
事件流程处理
 - - -
- -
- -
diff --git a/src/views/caseManage/caseManage.vue b/src/views/caseManage/caseManage.vue index a986eaa..1ffcec8 100644 --- a/src/views/caseManage/caseManage.vue +++ b/src/views/caseManage/caseManage.vue @@ -78,6 +78,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -105,22 +111,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ], // 显示列 urgeDialogVisible: false, urgeForm: { @@ -180,6 +186,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/myReportList.vue b/src/views/caseManage/caseReportManage/myReportList.vue index d4ac94a..252cd29 100644 --- a/src/views/caseManage/caseReportManage/myReportList.vue +++ b/src/views/caseManage/caseReportManage/myReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/searchReportList.vue b/src/views/caseManage/caseReportManage/searchReportList.vue index 0ef6e56..633927c 100644 --- a/src/views/caseManage/caseReportManage/searchReportList.vue +++ b/src/views/caseManage/caseReportManage/searchReportList.vue @@ -178,6 +178,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/caseReportManage/workReportList.vue b/src/views/caseManage/caseReportManage/workReportList.vue index 05f4995..d92afb7 100644 --- a/src/views/caseManage/caseReportManage/workReportList.vue +++ b/src/views/caseManage/caseReportManage/workReportList.vue @@ -240,6 +240,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/completedList.vue b/src/views/caseManage/completedList.vue index a55bfcb..18ce887 100644 --- a/src/views/caseManage/completedList.vue +++ b/src/views/caseManage/completedList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/components/closureDialog.vue b/src/views/caseManage/components/closureDialog.vue new file mode 100644 index 0000000..1c3c198 --- /dev/null +++ b/src/views/caseManage/components/closureDialog.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fd70fc1..5d4c215 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -8,89 +8,161 @@ - + - + - + + - + - + - 添加到通讯录 - - - - - - - - - - - - - - - - - - - + 添加到通讯录 + + + + + + + + + + + + 请先选择事件分类 + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + @@ -99,16 +171,16 @@ - + 地图选点 - ({{ form.lng }},{{ form.lat }}) + ({{ form.lng }},{{ form.lat }}) - + @@ -126,12 +198,8 @@ - + @@ -139,7 +207,10 @@ - {{ item.nextOperation }} + {{ item.nextOperation }} @@ -170,17 +241,17 @@
- +
- + - + 查询 - 确定 + 确定 说明：双击添加位置, 当前坐标：{{ currentPosition.lng }},{{ currentPosition.lat }} @@ -189,85 +260,154 @@ 返回 - +
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue index 1eb2cf0..3a4db80 100644 --- a/src/views/caseManage/delayApplyList.vue +++ b/src/views/caseManage/delayApplyList.vue @@ -185,6 +185,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/delayList.vue b/src/views/caseManage/delayList.vue index e6af389..e9115aa 100644 --- a/src/views/caseManage/delayList.vue +++ b/src/views/caseManage/delayList.vue @@ -170,6 +170,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/reviewList.vue b/src/views/caseManage/reviewList.vue index 2a6460e..c6ee60f 100644 --- a/src/views/caseManage/reviewList.vue +++ b/src/views/caseManage/reviewList.vue @@ -36,7 +36,7 @@ reporterName: '', // 联系人 startTime: '', // 来电开始时间 endTime: '', // 来电结束时间 - caseState: '', // 处理方式 + caseState: '7', // 处理方式 state: '', // 处理状态 isDelay: '', // 事件状态 source: '', // 事件来源 @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/revisitList.vue b/src/views/caseManage/revisitList.vue index 0ccd5ce..8fa2159 100644 --- a/src/views/caseManage/revisitList.vue +++ b/src/views/caseManage/revisitList.vue @@ -74,6 +74,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/caseManage/searchList.vue b/src/views/caseManage/searchList.vue index b5b9a5a..01c7cf9 100644 --- a/src/views/caseManage/searchList.vue +++ b/src/views/caseManage/searchList.vue @@ -48,6 +48,12 @@ }, // 筛选条件 columns: [ { + text: '事件编号', + value: 'caseId', + align: 'center', + showOverflow: true + }, + { text: '事件标题', value: 'title', align: 'center', @@ -75,22 +81,22 @@ width: 140, align: 'center' }, - { - text: '处理状态', - value: 'stateName', - align: 'center' - }, + // { + // text: '处理状态', + // value: 'stateName', + // align: 'center' + // }, { text: '事件内容', value: 'description', align: 'center', showOverflow: true }, - { - text: '处理方式', - value: 'caseStateName', - align: 'center' - } + // { + // text: '处理方式', + // value: 'caseStateName', + // align: 'center' + // } ] // 显示列 } }, @@ -120,6 +126,7 @@ this.$router.push({ path: '/caseDetail/' + row.id, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/urgeList.vue b/src/views/caseManage/urgeList.vue index d131895..b56f832 100644 --- a/src/views/caseManage/urgeList.vue +++ b/src/views/caseManage/urgeList.vue @@ -175,6 +175,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 6252460..71b5b7e 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -22,14 +22,34 @@ start-placeholder="来电开始时间" end-placeholder="来电结束时间"/> + + + @@ -40,7 +60,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" title="新建事件" - width="1200px" + width="1250px" custom-class="addcase-dialog" top="5vh" append-to-body @@ -57,6 +77,8 @@ @close="closeSound"> + + @@ -67,20 +89,29 @@ import SearchItem from '@/components/SearchArea/SearchItem' import CreateCase from '@/views/caseManage/createCase' import AudioPlayer from '../../components/AudioPlayer/AudioPlayer' +import ClosureDialog from './components/closureDialog.vue' import { mapState } from 'vuex' // import { realFormatSecond } from '@/utils/stringutils' import { getUserSimpleList } from '@/api/system/user' import { getSoundList } from '@/api/sound' import { isOnlyReceiver } from '@/utils/permission' - export default { name: 'WaitForCreate', - components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase }, + components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase, ClosureDialog, ClosureDialog }, + filters: { + timeFilter(val) { + const m = Math.floor(val / 60) + const s = val - m * 60 + const str = ('0' + m).slice(-2) + ':' + ('0' + s).slice(-2) + return str + } + }, data() { return { isReceiver: isOnlyReceiver(), listQuery: { callerNumber: '', // 主叫号码 + phoneNumber: '', // 分机号码 agentUser: '', // 受理人 status: '', // 受理状态 startTime: '', // 创建开始时间 @@ -108,13 +139,19 @@ width: 100 }, { + text: '分机号码', // 新增分机号码 + // value: 'phonenumber', + value: 'exten', + align: 'center' + }, + { text: '来电时间', value: 'startStamp', align: 'center', width: 160 }, { - text: '受理人', + text: '坐席姓名', value: 'agentUserName', align: 'center' }, @@ -277,6 +314,10 @@ order: 'desc' } // 筛选条件 this.timeRange = [] + }, + // 快速结案弹窗 + quickClosure(row) { + this.$refs.closureRef.initDialog(row) } } } diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index 369a31e..0f60536 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -166,6 +166,7 @@ path: '/caseDetail/' + row.id, query: { taskId: row.taskId, + caseType:row.eorc, showProcess: true } }) diff --git a/src/views/customerManage/editCustomer.vue b/src/views/customerManage/editCustomer.vue index 4b32958..1a7c90c 100644 --- a/src/views/customerManage/editCustomer.vue +++ b/src/views/customerManage/editCustomer.vue @@ -9,40 +9,42 @@ - + - + - + - + - + - + @@ -91,10 +93,11 @@ { type: 'email', // 要检验的类型（number，email，date等） message: '请输入正确的邮箱地址', - trigger: ['blur', 'change'] }], - cardNo:[{ + trigger: ['blur', 'change'] + }], + cardNo: [{ required: false, - message:'请输入正确的证件号码', + message: '请输入正确的证件号码', pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/, trigger: ['blur', 'change'] }], @@ -102,12 +105,14 @@ required: true, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }], + trigger: ['blur', 'change'] + }], tel2: [{ required: false, pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, // 可以写正则表达式 message: '请输入正确的电话号码', - trigger: ['blur', 'change'] }] + trigger: ['blur', 'change'] + }] }, // 前端校验规则 roleName: '', disabled: false, @@ -117,7 +122,7 @@ }, methods: { // 初始化对话框 - initDialog: function(dialogStatus, dialogFormVisible, row = null) { + initDialog: function (dialogStatus, dialogFormVisible, row = null) { this.dialogStatus = dialogStatus this.dialogFormVisible = dialogFormVisible this.btnLoading = false @@ -141,6 +146,9 @@ wx: row.wx, // 微信 duty: row.duty // 职位 } + if (dialogStatus === 'update') { + this.tips() + } if (dialogStatus === 'info') { this.disabled = true } else { @@ -165,7 +173,7 @@ } }, // 保存数据 - saveData: function() { + saveData: function () { if (this.dialogStatus === 'update') { this.updateData() } else if (this.dialogStatus === 'create') { @@ -173,7 +181,7 @@ } }, // 新增数据 - createData: function() { + createData: function () { this.$refs['dataForm'].validate((valid) => { console.log(this.customerForm) if (valid) { @@ -191,7 +199,7 @@ }) }, // 修改数据 - updateData: function() { + updateData: function () { this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true @@ -207,20 +215,38 @@ } }) }, - cancel: function() { + cancel: function () { this.dialogFormVisible = false this.$emit('watchChild') + }, + // 修改姓名提示 + tips() { + // 修改提示 + this.$confirm( + '客户姓名变更，已录入案卷联系人姓名不会变更，是否继续修改？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + } + ).then(() => { + // 点击确认 无操作 + }).catch(() => { + // 点击取消 + this.cancel() + }) } } } diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue index 38918cc..82282d4 100644 --- a/src/views/knowledgeManage/editKnowledge.vue +++ b/src/views/knowledgeManage/editKnowledge.vue @@ -21,7 +21,7 @@ - + @@ -146,7 +146,7 @@ // this.$refs.editor.initEditor() knowledgeDetail(id).then(response => { if (response.data) { - debugger + // debugger // 处理fileList if (response.data.file && response.data.file !== '') { const file_strs = response.data.file.split(';') @@ -166,8 +166,10 @@ type: response.data.kType, // 类型 name: response.data.kName, // 类别名 keywords: response.data.keywords, // 关键词 - info: response.data.kInfo // 内容 + info: response.data.kInfo, // 内容 + deptId:response.data.deptId } + this.$set(this.knowledgeForm,'deptId',response.data.deptId) } if (!this.knowledgeForm.deptId) { this.knowledgeForm.deptId = this.$store.state.user.deptId @@ -231,6 +233,8 @@ }, // 修改数据 updateData: function() { + console.log(this.knowledgeForm) + // return this.$refs['dataForm'].validate((valid) => { if (valid) { this.btnLoading = true diff --git a/src/views/monitorManage/searchMonitor.vue b/src/views/monitorManage/searchMonitor.vue index 6e35d9b..a2a2807 100644 --- a/src/views/monitorManage/searchMonitor.vue +++ b/src/views/monitorManage/searchMonitor.vue @@ -212,6 +212,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitCheckMonitor.vue b/src/views/monitorManage/waitCheckMonitor.vue index e991fbc..d683bbe 100644 --- a/src/views/monitorManage/waitCheckMonitor.vue +++ b/src/views/monitorManage/waitCheckMonitor.vue @@ -192,6 +192,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/monitorManage/waitForMonitor.vue b/src/views/monitorManage/waitForMonitor.vue index a391585..bdb9f8d 100644 --- a/src/views/monitorManage/waitForMonitor.vue +++ b/src/views/monitorManage/waitForMonitor.vue @@ -153,6 +153,7 @@ this.$router.push({ path: '/caseDetail/' + row.caseId, query: { + caseType:row.eorc, showProcess: false } }) diff --git a/src/views/qualityManage/qualitySound/components/userList.vue b/src/views/qualityManage/qualitySound/components/userList.vue index e1c54fe..893007f 100644 --- a/src/views/qualityManage/qualitySound/components/userList.vue +++ b/src/views/qualityManage/qualitySound/components/userList.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/soundsManage/soundsManage.vue b/src/views/soundsManage/soundsManage.vue index 85e646c..77188e0 100644 --- a/src/views/soundsManage/soundsManage.vue +++ b/src/views/soundsManage/soundsManage.vue @@ -1,61 +1,80 @@ @@ -100,6 +119,11 @@ }, // 筛选条件 columns: [ { + text: '录音编号', + value: 'callid', + align: 'center' + }, + { text: '主叫号码', value: 'callerNumber', align: 'center' @@ -120,25 +144,25 @@ value: 'hangupCause', align: 'center' }, - { - text: '坐席工号', - value: 'agentName', - align: 'center', - default: '--' - }, + // { + // text: '坐席工号', + // value: 'agentName', + // align: 'center', + // default: '--' + // }, { text: '坐席姓名', value: 'agentUserName', align: 'center', default: '--' }, - { - text: '归属地', - value: 'isp', - align: 'center', - width: 100, - default: '--' - }, + // { + // text: '归属地', + // value: 'isp', + // align: 'center', + // width: 100, + // default: '--' + // }, { text: '通话开始时间', value: 'dialStartStamp', @@ -194,6 +218,15 @@ this.search() }, methods: { + detail(row) { + console.log(row, '录音管理-当前行') + this.$router.push({ + name: 'SoundsDetail', + params: { + info: JSON.stringify(row) + } + }) + }, search() { this.fetchData(false) }, @@ -226,16 +259,33 @@ }) }, // 播放录音 - openSound(row) { - if (row.cusRecordFile || row.recordName) { - this.soundShow = true - if (row.cusRecordFile) { - this.sound.url = row.cusRecordFile - } else if (row.recordName) { + openSound(row, type) { + if (type === 'sound') { + // 录音 + // if (row.cusRecordFile || row.recordName) { + // this.soundShow = true + // if (row.cusRecordFile) { + // this.sound.url = row.cusRecordFile + // } else if (row.recordName) { + // this.sound.url = row.recordName + // } + // } else { + // this.$message.warning('无录音') + // } + if (row.recordName) { + this.soundShow = true this.sound.url = row.recordName + } else { + this.$message.warning('无录音') } } else { - this.$message.warning('无录音') + // 留言 + if (row.cusRecordFile) { + this.soundShow = true + this.sound.url = row.cusRecordFile + } else { + this.$message.warning('无留言') + } } }, // 关闭播放弹窗 @@ -252,7 +302,7 @@ } console.log(data) const that = this - setTimeout(function() { + setTimeout(function () { that.$refs['addcase'].initData(data) }, 500) }, @@ -304,9 +354,9 @@ diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue index 3345556..43889c4 100644 --- a/src/views/statistic/callStatistic/logStatistic.vue +++ b/src/views/statistic/callStatistic/logStatistic.vue @@ -146,6 +146,7 @@ }, fetchData() { this.listLoading = true + this.data = []; this.listQuery.workStartTime = this.workTime[0] this.listQuery.workEndTime = this.workTime[1] this.listQuery.breakStartTime = this.breakTime[0] @@ -157,7 +158,7 @@ outBusyStatistics(this.listQuery).then(response => { if (response.code === 200) { this.listLoading = false - this.list = response.data + this.data = response.data this.total = response.data.length // this.data = [ // { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' }, diff --git a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue index 0d23bc8..5a98f09 100644 --- a/src/views/statistic/caseStatistic/components/caseHandleSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseHandleSearch.vue @@ -23,7 +23,7 @@ import SearchItem from '../../../../components/SearchArea/SearchItem' // import { getDayTime, getToday } from '@/utils/dateutils' import ChartTools from '../../components/chartTools' -import { getToday } from '../../../../utils/dateutils' +import { getToday, getDaysTime } from '../../../../utils/dateutils' export default { name: 'CaseHandleSearch', components: { ChartTools, SearchItem, SearchArea }, @@ -51,7 +51,8 @@ } }, created() { - this.timeRange = [getToday('yyyy-MM-dd'), getToday('yyyy-MM-dd')] + const { startTime, endTime } = getDaysTime(30, 'yyyy-MM-dd') + this.timeRange = [startTime, endTime] this.search() }, methods: { diff --git a/src/views/statistic/caseStatistic/components/caseTable.vue b/src/views/statistic/caseStatistic/components/caseTable.vue index e7aba06..976e5d8 100644 --- a/src/views/statistic/caseStatistic/components/caseTable.vue +++ b/src/views/statistic/caseStatistic/components/caseTable.vue @@ -42,22 +42,22 @@ text: '受理事件数', value: 'caseNum' }, - { - text: '催办数', - value: 'urgeNum' - }, - { - text: '督办数', - value: 'superviseNum' - }, - { - text: '监察数', - value: 'monitorNum' - }, - { - text: '延期数', - value: 'delayNum' - }, + // { + // text: '催办数', + // value: 'urgeNum' + // }, + // { + // text: '督办数', + // value: 'superviseNum' + // }, + // { + // text: '监察数', + // value: 'monitorNum' + // }, + // { + // text: '延期数', + // value: 'delayNum' + // }, { text: '已办结数及占比', value: 'overCaseNum' diff --git a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue index 75c5083..bd75077 100644 --- a/src/views/statistic/caseStatistic/components/caseTypeSearch.vue +++ b/src/views/statistic/caseStatistic/components/caseTypeSearch.vue @@ -14,14 +14,14 @@ start-placeholder="处理开始时间" end-placeholder="处理结束时间"/> - - 事件等级： - - 一级 - 二级 - - - + + + + + + + + @@ -29,7 +29,7 @@