diff --git a/src/components/Index.vue b/src/components/Index.vue
index ec63536..3f379c1 100644
--- a/src/components/Index.vue
+++ b/src/components/Index.vue
@@ -23,10 +23,12 @@
-
+
-
+
@@ -56,6 +58,27 @@ const message = useMessage();
const dialog = useDialog();
const router = useRouter();
const route = useRoute();
+
+const getUserInfo = () => {
+ const url = window.location.href;
+ var dz_url = url.split('#')[0];
+ var cs = dz_url.split('?')[1];
+ var cs_arr = cs.split('&');
+ var cs = {};
+ for (var i = 0; i < cs_arr.length; i++) {
+ cs[cs_arr[i].split('=')[0]] = cs_arr[i].split('=')[1]
+ }
+ console.log(cs);
+ $axios.get('https://www.yjhlcity.com/ysbservice/app/authing/ysblogin/getUserInfo', {
+ headers: {
+ token: cs.token
+ }
+ }).then(resp => {
+ console.log(resp.data);
+ }).catch(resp => {
+ })
+}
+// getUserInfo();
const isKpiUpdateModalShow = ref(false);
const isKpiUpdatProgressModalShow = ref(false);
const kpiUpdateProgress = ref(0);
@@ -106,7 +129,7 @@ const checkProcess = () => {
}).then(({ data }) => {
let percent = parseInt(data.data);
kpiUpdateProgress.value = percent;
- if(percent >= 100) {
+ if (percent >= 100) {
clearInterval(checkProcessInterval);
checkProcessInterval = null;
isKpiUpdatProgressModalShow.value = false;
@@ -144,6 +167,6 @@ const onUpdateConfirm = () => {
onNegativeClick: () => {
}
});
-
+
}
\ No newline at end of file
diff --git a/src/components/table/Ddy.vue b/src/components/table/Ddy.vue
index aa93934..86da48d 100644
--- a/src/components/table/Ddy.vue
+++ b/src/components/table/Ddy.vue
@@ -156,6 +156,13 @@ export default {
keyName: 'baseScore',
width: 60
},
+ {
+ align: 'center',
+ title: '处理量',
+ key: 'N',
+ keyName: 'baseScore',
+ width: 60
+ },
{
align: 'center',
title: '案件调度',
@@ -164,7 +171,7 @@ export default {
children: [
{
align: 'center',
- title: '数量',
+ title: '数量(超过24小时)',
key: 'E',
keyName: 'dispatchCaseCount',
width: 60
diff --git a/src/components/table/ZfGa.vue b/src/components/table/ZfGa.vue
index 40b06f7..73ac5c3 100644
--- a/src/components/table/ZfGa.vue
+++ b/src/components/table/ZfGa.vue
@@ -466,7 +466,7 @@ export default {
let tableDatas = [];
vueSelf.table.data.forEach(item => {
item.M = vueSelf.computeM(item);
- item.O = (item.M * item.N / 100).toFixed(2);
+ item.O = (item.M * item.N / 100 + item.F).toFixed(2);
tableDatas.push({...item});
})
vueSelf.dialog.warning({
diff --git a/src/components/table/Znbm.vue b/src/components/table/Znbm.vue
index 25766a3..cd1fa4f 100644
--- a/src/components/table/Znbm.vue
+++ b/src/components/table/Znbm.vue
@@ -423,7 +423,7 @@ export default {
let tableDatas = [];
vueSelf.table.data.forEach(item => {
item.N = vueSelf.computeN(item);
- item.P = (item.N * item.O / 100).toFixed(2);
+ item.P = item.N * item.O / 100 + item.F;
tableDatas.push({...item});
})
vueSelf.dialog.warning({
diff --git a/src/main.js b/src/main.js
index 6d7c989..3f6aac3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,5 @@
import { createApp } from 'vue'
-import { createRouter, createWebHashHistory } from 'vue-router'
+import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
import './style.css'
import App from './App.vue'
import axios from 'axios';
@@ -12,7 +12,8 @@ import Znbm from './components/table/Znbm.vue';
// 路由
const router = createRouter({
- history: createWebHashHistory(),
+ // history: createWebHashHistory(),
+ history: createWebHistory(),
routes: [
{ name: 'wgy', path: '/', component: Wgy },
{ name: 'ddy', path: '/ddy', component: Ddy },