diff --git a/src/components/table/Wgy.vue b/src/components/table/Wgy.vue index 999268e..af4612f 100644 --- a/src/components/table/Wgy.vue +++ b/src/components/table/Wgy.vue @@ -493,7 +493,7 @@ export default { }, { align: 'center', - title: '人口信息录入(3)', + title: '人口信息录入(15)', key: 'W', keyName: 'populationSave', width: 80, @@ -509,7 +509,7 @@ export default { }, { align: 'center', - title: '人口信息质量管理(3)', + title: '人口信息质量管理(15)', key: 'X', keyName: 'populationQuality', width: 80, @@ -523,7 +523,7 @@ export default { }, row.X); } }, - { + /*{ align: 'center', title: '人口信息维护(4)', key: 'Y', @@ -538,7 +538,7 @@ export default { } }, row.Y); } - }, + },*/ { align: 'center', title: '抽查情况', @@ -954,7 +954,7 @@ export default { computeAE(row) { let s = this.computeS(row); // let result = row.C + row.H + row.L - row.M - row.N - row.O - row.P + row.Q - s - row.T - row.U - row.V + row.W + row.X + row.Y - row.Z + row.AA + row.AB + row.AC - row.AD; - let result = row.C + row.H + row.L - row.M - row.N - row.O - row.P + row.W + row.X + row.Y - row.Z; + let result = row.C + row.H + row.L - row.M - row.N - row.O - row.P + row.W + row.X - row.Z; result = Math.min(result, 100); return result < 0 ? 0 : result.toFixed(2); }, @@ -1098,15 +1098,17 @@ export default { /*item.Q = item.communityPopulationRate >= 0.75 ? 10 : (item.communityPopulationRate >= 0.6 ? 5 : 0);*/ // 人口信息管理 // 未录入数据数量 = 社区基数人口数 - 社区人口数 - var differenceValue = item.communityBasePopulationCount - item.communityPopulationCount; + /*var differenceValue = item.communityBasePopulationCount - item.communityPopulationCount; var no100Score; if(differenceValue > 0 && differenceValue <= 15) { no100Score = differenceValue; }else { no100Score = 0; } - item.W = item.communityPopulationRate === 1 ? 15 : no100Score; - item.Y = parseFloat((4 * item.communityPopulationRate).toFixed(2)); + item.W = item.communityPopulationRate === 1 ? 15 : no100Score;*/ + item.W = item.communityPopulationRate * 15; + item.X = 15; + // item.Y = parseFloat((4 * item.communityPopulationRate).toFixed(2)); // 党组织建设(去掉) /*item.AA = item.communityPopulationRate >= 0.75 ? 3 : (item.communityPopulationRate >= 0.6 ? 1.5 : 0); item.AB = item.communityPopulationRate >= 0.75 ? 3 : (item.communityPopulationRate >= 0.6 ? 1.5 : 0); diff --git a/src/main.js b/src/main.js index 6310f0b..8872eb0 100644 --- a/src/main.js +++ b/src/main.js @@ -26,8 +26,8 @@ const router = createRouter({ // axios const createAxios = { install(app, options) { - // axios.defaults.baseURL = 'http://219.147.99.164:8082/bigdata'; - axios.defaults.baseURL = 'http://127.0.0.1:8087/bigdata'; + axios.defaults.baseURL = 'http://219.147.99.164:8082/bigdata'; + // axios.defaults.baseURL = 'http://127.0.0.1:8087/bigdata'; // axios.defaults.baseURL = '/bigdata'; axios.defaults.timeout = 20000; app.config.globalProperties.$axios = axios;