diff --git a/debug.log b/debug.log new file mode 100644 index 0000000..244e3f4 --- /dev/null +++ b/debug.log @@ -0,0 +1,8 @@ +[1223/162702.573:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1223/162702.848:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1223/163014.254:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1223/163213.517:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1223/163517.755:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1223/163743.845:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1223/163744.572:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) +[1223/170717.702:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) diff --git a/package.json b/package.json index 5aea66c..1275b13 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,11 @@ "amfe-flexible": "^2.2.1", "axios": "^0.27.2", "core-js": "^3.23.3", - "dayjs": "^1.11.7", + "dayjs": "^1.11.13", "eslint": "^8.12.0", "eslint-plugin-vue": "^8.4.0", "filemanager-webpack-plugin": "^8.0.0", + "formatjs": "^0.1.1", "html-webpack-plugin": "^5.5.3", "jsencrypt": "^3.0.3", "less-loader": "^11.1.0", diff --git a/src/assets/css/common.less b/src/assets/css/common.less index b961fba..572e6af 100644 --- a/src/assets/css/common.less +++ b/src/assets/css/common.less @@ -63,6 +63,9 @@ } } .m{ + &-left8{ + margin-left: 8px; + } &-left12{ margin-left: 12px; } diff --git a/src/router/index.js b/src/router/index.js index 81749e4..341052a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -37,7 +37,23 @@ router.beforeEach((to, from, next) => { console.log(urlParams.worktoken,"Sdfsfdjhjh") localStorage.setItem('token_work',urlParams.worktoken) next({ }) - }else{ + }else if(urlParams.worktoken&&to.path=='/AttackEvent'){ + console.log(store.state.app,"store.state.app.userInfo"); + store.state.app.isRouterLoading = true + console.log(to,"to"); + console.log(urlParams.worktoken,"Sdfsfdjhjh") + localStorage.setItem('token_work',urlParams.worktoken) + next({ }) + } + else if(urlParams.worktoken&&to.path=='/HotlineDetail'){ + console.log(store.state.app,"store.state.app.userInfo"); + store.state.app.isRouterLoading = true + console.log(to,"to"); + console.log(urlParams.worktoken,"Sdfsfdjhjh") + localStorage.setItem('token_work',urlParams.worktoken) + next({ }) + } + else{ next() console.log(urlParams.worktoken,"Sdfsfd") } diff --git a/src/router/router.config.js b/src/router/router.config.js index 22c1484..6766072 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -39,6 +39,12 @@ export const constantRouterMap = [ component: () => import('@/views/Hotline'), meta: { title: '热线接办', keepAlive: false } }, + { + path: '/AttackEvent', + name:'AttackEvent', + component: () => import('@/views/AttackEvent'), + meta: { title: '', keepAlive: false } + }, { path: '/HotlineDetail', name:'HotlineDetail', diff --git a/src/utils/request.js b/src/utils/request.js index 16a6f3c..012c7ec 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -9,7 +9,7 @@ import { Tips } from '@/utils/index' const service = axios.create({ baseURL: baseApi, // url = base api url + request url withCredentials: true, // send cookies when cross-domain requests - timeout: 30000 // request timeout + timeout: 300000 // request timeout }) // request拦截器 request interceptor diff --git a/src/views/AttackEvent/index.vue b/src/views/AttackEvent/index.vue new file mode 100644 index 0000000..7cc2d1a --- /dev/null +++ b/src/views/AttackEvent/index.vue @@ -0,0 +1,409 @@ + + + + diff --git a/src/views/Hotline/index.vue b/src/views/Hotline/index.vue index 6082259..0930f42 100644 --- a/src/views/Hotline/index.vue +++ b/src/views/Hotline/index.vue @@ -31,7 +31,7 @@
-
+
工单号:{{ item.workOrderNum }} @@ -56,6 +56,7 @@
+
@@ -66,12 +67,21 @@