diff --git a/src/components/table/Wgy.vue b/src/components/table/Wgy.vue index d93b8e7..6798922 100644 --- a/src/components/table/Wgy.vue +++ b/src/components/table/Wgy.vue @@ -373,7 +373,7 @@ export default { onClick() { vueSelf.onOverScoreClick(row, index); } - }, row.U); + }, row.Q); } }, { @@ -919,6 +919,7 @@ export default { }, computeAE(row) { let result = row.C + row.H - row.J + row.L - row.M - row.N - row.O - row.P + row.Q - row.S - row.T - row.U - row.V + row.W + row.X + row.Y - row.Z + row.AA + row.AB + row.AC - row.AD; + console.log(row); result = Math.min(result, 100); return result < 0 ? 0 : result.toFixed(2); }, @@ -1048,6 +1049,7 @@ export default { vueSelf.$axios.get(`api/kpi/khxz/list-wgy`, { params: vueSelf.getQuery() }).then(({ data }) => { + let totalGridCount = 0; data.forEach((item, index) => { item.A = index + 1; item.F = item.E === 0 ? 0 : (item.D / item.E).toFixed(2); @@ -1055,8 +1057,10 @@ export default { item.J = Math.min(item.F * item.I, item.D); item.L = (item.K > 10 ? 10 : item.K) * 0.5; item.S = item.R * 0.2; + totalGridCount += item.gridCount; }) this.table.data = data; + console.log(`totalGridCount: ${totalGridCount}`) }).catch(({ data }) => { vueSelf.message.error(data.msg); }).finally(() => { diff --git a/src/main.js b/src/main.js index 3f6aac3..ade24f4 100644 --- a/src/main.js +++ b/src/main.js @@ -12,8 +12,8 @@ import Znbm from './components/table/Znbm.vue'; // 路由 const router = createRouter({ - // history: createWebHashHistory(), - history: createWebHistory(), + history: createWebHashHistory(), + // history: createWebHistory(), routes: [ { name: 'wgy', path: '/', component: Wgy }, { name: 'ddy', path: '/ddy', component: Ddy }, @@ -26,8 +26,8 @@ const router = createRouter({ // axios const createAxios = { install(app, options) { - axios.defaults.baseURL = 'http://127.0.0.1:8087/bigdata'; - // axios.defaults.baseURL = '/bigdata'; + // axios.defaults.baseURL = 'http://127.0.0.1:8087/bigdata'; + axios.defaults.baseURL = '/bigdata'; axios.defaults.timeout = 20000; app.config.globalProperties.$axios = axios; }