diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 3278abb..8faab6e 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -67,6 +67,7 @@ 'M+': this.getMonth() + 1, // 月份 'd+': this.getDate(), // 日 'h+': this.getHours(), // 小时 + 'H+': this.getHours(), // 小时 'm+': this.getMinutes(), // 分 's+': this.getSeconds(), // 秒 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 3278abb..8faab6e 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -67,6 +67,7 @@ 'M+': this.getMonth() + 1, // 月份 'd+': this.getDate(), // 日 'h+': this.getHours(), // 小时 + 'H+': this.getHours(), // 小时 'm+': this.getMinutes(), // 分 's+': this.getSeconds(), // 秒 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 diff --git a/src/utils/request.js b/src/utils/request.js index da89ae9..4213578 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -53,7 +53,8 @@ }) } else if (res.code === 402) { console.log('402页面跳转') - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' } else { Message({ showClose: true, diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 3278abb..8faab6e 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -67,6 +67,7 @@ 'M+': this.getMonth() + 1, // 月份 'd+': this.getDate(), // 日 'h+': this.getHours(), // 小时 + 'H+': this.getHours(), // 小时 'm+': this.getMinutes(), // 分 's+': this.getSeconds(), // 秒 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 diff --git a/src/utils/request.js b/src/utils/request.js index da89ae9..4213578 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -53,7 +53,8 @@ }) } else if (res.code === 402) { console.log('402页面跳转') - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' } else { Message({ showClose: true, diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 524ee94..144627f 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -78,11 +78,11 @@ - - - - - + + + + + diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 3278abb..8faab6e 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -67,6 +67,7 @@ 'M+': this.getMonth() + 1, // 月份 'd+': this.getDate(), // 日 'h+': this.getHours(), // 小时 + 'H+': this.getHours(), // 小时 'm+': this.getMinutes(), // 分 's+': this.getSeconds(), // 秒 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 diff --git a/src/utils/request.js b/src/utils/request.js index da89ae9..4213578 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -53,7 +53,8 @@ }) } else if (res.code === 402) { console.log('402页面跳转') - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' } else { Message({ showClose: true, diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 524ee94..144627f 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -78,11 +78,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue index 29916b2..9c2474b 100644 --- a/src/views/caseManage/caseCommon/caseRecord.vue +++ b/src/views/caseManage/caseCommon/caseRecord.vue @@ -91,23 +91,23 @@ -
- -
上报请示记录
-
- - - - - -
+ + + + + + + + + + + + + + + + + diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 3278abb..8faab6e 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -67,6 +67,7 @@ 'M+': this.getMonth() + 1, // 月份 'd+': this.getDate(), // 日 'h+': this.getHours(), // 小时 + 'H+': this.getHours(), // 小时 'm+': this.getMinutes(), // 分 's+': this.getSeconds(), // 秒 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 diff --git a/src/utils/request.js b/src/utils/request.js index da89ae9..4213578 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -53,7 +53,8 @@ }) } else if (res.code === 402) { console.log('402页面跳转') - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' } else { Message({ showClose: true, diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 524ee94..144627f 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -78,11 +78,11 @@ - - - - - + + + + +
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue index 29916b2..9c2474b 100644 --- a/src/views/caseManage/caseCommon/caseRecord.vue +++ b/src/views/caseManage/caseCommon/caseRecord.vue @@ -91,23 +91,23 @@ -
- -
上报请示记录
-
- - - - - -
+ + + + + + + + + + + + + + + + + diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index aa54f5a..8b1ed28 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -8,7 +8,7 @@ diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 3278abb..8faab6e 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -67,6 +67,7 @@ 'M+': this.getMonth() + 1, // 月份 'd+': this.getDate(), // 日 'h+': this.getHours(), // 小时 + 'H+': this.getHours(), // 小时 'm+': this.getMinutes(), // 分 's+': this.getSeconds(), // 秒 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 diff --git a/src/utils/request.js b/src/utils/request.js index da89ae9..4213578 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -53,7 +53,8 @@ }) } else if (res.code === 402) { console.log('402页面跳转') - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' } else { Message({ showClose: true, diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 524ee94..144627f 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -78,11 +78,11 @@ - - - - - + + + + +
diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue index 29916b2..9c2474b 100644 --- a/src/views/caseManage/caseCommon/caseRecord.vue +++ b/src/views/caseManage/caseCommon/caseRecord.vue @@ -91,23 +91,23 @@ -
- -
上报请示记录
-
- - - - - -
+ + + + + + + + + + + + + + + + + diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index aa54f5a..8b1ed28 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -8,7 +8,7 @@ diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue index d434cf0..9594aca 100644 --- a/src/views/knowledgeManage/knowledgeCheck.vue +++ b/src/views/knowledgeManage/knowledgeCheck.vue @@ -26,6 +26,9 @@ + + +
@@ -74,10 +77,11 @@ import KnowledgeDetail from '../caseManage/components/knowledgeDetail' import SimpleDialog from '../../components/SimpleDialog/index' import SetTimeDialog from './components/setTimeDialog' +import DeptSelect from '../../components/DeptSelect/index' export default { name: 'KnowledgeCheck', - components: { SetTimeDialog, SimpleDialog, KnowledgeDetail, TypeTree, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, + components: { DeptSelect, SetTimeDialog, SimpleDialog, KnowledgeDetail, TypeTree, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, data() { return { list: [], @@ -91,6 +95,7 @@ checkStatus: '', // 审核状态 groundingStatus: '', // 上架状态 valid: '', // 可用状态 + deptId: '', // 权属单位 offset: 1, limit: 20, sort: '', @@ -119,6 +124,11 @@ align: 'center' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '审核状态', value: 'checkStatusName', align: 'center' diff --git a/config/dev.env.js b/config/dev.env.js index 7675615..35fc0d7 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -9,8 +9,8 @@ // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"', // BASE_API: '"http://106.74.146.218:2031"' // BASE_API: '"http://192.168.0.212:8083"' - // BASE_API: '"http://10.18.0.94:8093/callcenter/api"' - BASE_API: '"http://111.198.10.15:11402/callcenter/api"' + BASE_API: '"http://192.168.13.116:8085/callcenter/api"' + // BASE_API: '"http://111.198.10.15:11402/callcenter/api"' // BASE_API: '"http://192.168.0.123:20007"' // BASE_API: '"http://192.168.2.107:20007"' // BASE_API: '"http://192.170.1.102:8093"' diff --git a/config/prod.env.js b/config/prod.env.js index ff6be60..e132fd6 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,7 +3,8 @@ NODE_ENV: '"production"', // 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://10.18.0.94: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://127.0.0.1:8085"' } diff --git a/package.json b/package.json index f98273f..fb32aa2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "html-webpack-plugin": "4.0.0-alpha", "mini-css-extract-plugin": "0.4.1", "node-notifier": "5.2.1", - "node-sass": "^4.7.2", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "3.0.0", "path-to-regexp": "2.4.0", diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 6ff3440..46e9054 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -63,8 +63,10 @@ } else { this.$store.dispatch('LogOut').then(() => { const BASE_API = process.env.BASE_API - if (BASE_API.search('http://10.18.0.94') !== -1) { - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/logout' + // 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' } else { location.reload() // this.$router.replace('/') diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index ebec64f..e99531b 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -511,6 +511,7 @@ this.currentNumber = object.number console.log(data) const that = this + debugger setTimeout(function() { that.$refs['addcase'].initData(data) }, 500) diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js index cab7b7a..7891949 100644 --- a/src/router/modules/statistic.js +++ b/src/router/modules/statistic.js @@ -104,7 +104,7 @@ path: '/deptEffectiveStatistics', name: 'DeptEffectiveStatistics', component: () => import('@/views/statistic/deptStatistic/deptStatistic'), - meta: { title: '部门效能监察', icon: '', permission: '/deptStatistics' } + meta: { title: '部门效能监察', icon: '', permission: '/sdeptStatistics' } }, { path: '/seatStatisticsAll', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 49b46ee..2f05ac2 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -114,11 +114,11 @@ // 生产环境不存在跳转到公共登陆平台 const BASE_API = process.env.BASE_API // 如果是开发环境或者不是10.18开头的ip - if (process.env.NODE_ENV === 'development' || BASE_API.search('http://10.18.0.94') === -1) { + if (process.env.NODE_ENV === 'development' || BASE_API.search('http://11.100.6.163') === -1) { reject() } else { const systemName = getProject().type - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin?systemName=' + systemName } } }) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 3278abb..8faab6e 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -67,6 +67,7 @@ 'M+': this.getMonth() + 1, // 月份 'd+': this.getDate(), // 日 'h+': this.getHours(), // 小时 + 'H+': this.getHours(), // 小时 'm+': this.getMinutes(), // 分 's+': this.getSeconds(), // 秒 'q+': Math.floor((this.getMonth() + 3) / 3), // 季度 diff --git a/src/utils/request.js b/src/utils/request.js index da89ae9..4213578 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -53,7 +53,8 @@ }) } else if (res.code === 402) { console.log('402页面跳转') - window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + // window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' + window.location.href = 'http://11.100.5.19:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin' } else { Message({ showClose: true, diff --git a/src/views/caseManage/caseCommon/caseFormRead.vue b/src/views/caseManage/caseCommon/caseFormRead.vue index 524ee94..144627f 100644 --- a/src/views/caseManage/caseCommon/caseFormRead.vue +++ b/src/views/caseManage/caseCommon/caseFormRead.vue @@ -78,11 +78,11 @@ - - - - - + + + + + diff --git a/src/views/caseManage/caseCommon/caseRecord.vue b/src/views/caseManage/caseCommon/caseRecord.vue index 29916b2..9c2474b 100644 --- a/src/views/caseManage/caseCommon/caseRecord.vue +++ b/src/views/caseManage/caseCommon/caseRecord.vue @@ -91,23 +91,23 @@ -
- -
上报请示记录
-
- - - - - -
+ + + + + + + + + + + + + + + + +
diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue index aa54f5a..8b1ed28 100644 --- a/src/views/caseManage/waitForHandle.vue +++ b/src/views/caseManage/waitForHandle.vue @@ -8,7 +8,7 @@ diff --git a/src/views/knowledgeManage/knowledgeCheck.vue b/src/views/knowledgeManage/knowledgeCheck.vue index d434cf0..9594aca 100644 --- a/src/views/knowledgeManage/knowledgeCheck.vue +++ b/src/views/knowledgeManage/knowledgeCheck.vue @@ -26,6 +26,9 @@ + + +
@@ -74,10 +77,11 @@ import KnowledgeDetail from '../caseManage/components/knowledgeDetail' import SimpleDialog from '../../components/SimpleDialog/index' import SetTimeDialog from './components/setTimeDialog' +import DeptSelect from '../../components/DeptSelect/index' export default { name: 'KnowledgeCheck', - components: { SetTimeDialog, SimpleDialog, KnowledgeDetail, TypeTree, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, + components: { DeptSelect, SetTimeDialog, SimpleDialog, KnowledgeDetail, TypeTree, AppContainer, SearchArea, SearchItem, CaseListTable, NormalTable }, data() { return { list: [], @@ -91,6 +95,7 @@ checkStatus: '', // 审核状态 groundingStatus: '', // 上架状态 valid: '', // 可用状态 + deptId: '', // 权属单位 offset: 1, limit: 20, sort: '', @@ -119,6 +124,11 @@ align: 'center' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '审核状态', value: 'checkStatusName', align: 'center' diff --git a/src/views/knowledgeManage/knowledgeManage.vue b/src/views/knowledgeManage/knowledgeManage.vue index c714456..5ed83a6 100644 --- a/src/views/knowledgeManage/knowledgeManage.vue +++ b/src/views/knowledgeManage/knowledgeManage.vue @@ -26,6 +26,9 @@ + + +
@@ -37,7 +40,7 @@ @@ -59,10 +62,11 @@ import TypeTree from './components/TypeTree' import EditKnowledge from './editKnowledge' import KnowledgeDetail from '../caseManage/components/knowledgeDetail' +import DeptSelect from '../../components/DeptSelect/index' export default { name: 'KnowledgeManage', - components: { KnowledgeDetail, EditKnowledge, TypeTree, AppContainer, SearchArea, SearchItem, CaseListTable }, + components: { DeptSelect, KnowledgeDetail, EditKnowledge, TypeTree, AppContainer, SearchArea, SearchItem, CaseListTable }, data() { return { list: [], @@ -75,6 +79,7 @@ checkStatus: '', // 审核状态 groundingStatus: '', // 上架状态 valid: '', // 可用状态 + deptId: '', // 权属单位 offset: 1, limit: 20, sort: '', @@ -103,6 +108,11 @@ align: 'center' }, { + text: '权属单位', + value: 'deptName', + align: 'center' + }, + { text: '审核状态', value: 'checkStatusName', align: 'center'