diff --git a/.env.dev b/.env.dev index e0b89faf..35e039f0 100644 --- a/.env.dev +++ b/.env.dev @@ -10,11 +10,11 @@ VUE_APP_TITLE = 洛玻集团驾驶舱 # VUE_APP_BASE_API = 'http://172.16.33.83:7070' # 杨姗姗 -# VUE_APP_BASE_API = 'http://172.16.20.218:7070' +VUE_APP_BASE_API = 'http://172.16.20.218:8080' # 小田 # VUE_APP_BASE_API = 'http://172.16.19.232:7070' # 测试 -VUE_APP_BASE_API = 'http://192.168.0.35:8080' +# VUE_APP_BASE_API = 'http://192.168.0.35:8080' # 闫阳 # VUE_APP_BASE_API = 'http://172.16.19.131:7070' diff --git a/src/views/home/components/budgetDetails.vue b/src/views/home/components/budgetDetails.vue index 1efccd3f..04e5d90c 100644 --- a/src/views/home/components/budgetDetails.vue +++ b/src/views/home/components/budgetDetails.vue @@ -312,6 +312,8 @@ export default { return this.updateData(this.tableData) }).then(() => { this.isDetail = false; + this.allDownBtn = false; + this.allUpBtn = false; // 重置表格配置 this.initTableProps(this.isDetail); // 清空并重新请求数据,恢复原始状态 diff --git a/src/views/home/operatingComponents/operatingLineBar.vue b/src/views/home/operatingComponents/operatingLineBar.vue index dc0a5e9d..a7c5c187 100644 --- a/src/views/home/operatingComponents/operatingLineBar.vue +++ b/src/views/home/operatingComponents/operatingLineBar.vue @@ -92,16 +92,6 @@ export default { backgroundColor: '#6a7985' } }, - // formatter: (params) => { - // let html = `${params[0].axisValue}
`; - // params.forEach(item => { - // const unit = item.seriesName === '完成率' ? '%' : ( - // ['产量', '销量'].includes(this.$parent.selectedProfit) ? '片' : '万元' - // ); - // html += `${item.marker} ${item.seriesName}: ${item.value}${unit}
`; - // }); - // return html; - // } }, grid: { top: 30, @@ -149,26 +139,6 @@ export default { axisLine: { lineStyle: { color: 'rgba(0, 0, 0, 0.15)' } }, splitNumber: 4 }, - // 右侧Y轴:利润占比(百分比) - // { - // type: 'value', - // nameTextStyle: { - // color: 'rgba(0, 0, 0, 0.45)', - // fontSize: 12, - // align: 'left' - // }, - // min: 0, - // max: 100, - // axisTick: { show: false }, - // axisLabel: { - // color: 'rgba(0, 0, 0, 0.45)', - // fontSize: 12, - // formatter: '{value}%' - // }, - // splitLine: { show: false }, - // axisLine: { lineStyle: { color: 'rgba(0, 0, 0, 0.15)' } }, - // splitNumber: 4 - // } ], series: chartSeries // 直接使用父组件传递的 series }; diff --git a/src/views/home/operatingComponents/operatingLineBarSale.vue b/src/views/home/operatingComponents/operatingLineBarSale.vue index 942400d9..1178f796 100644 --- a/src/views/home/operatingComponents/operatingLineBarSale.vue +++ b/src/views/home/operatingComponents/operatingLineBarSale.vue @@ -105,9 +105,6 @@ export default { factory: baseIndex, dateData: this.dateData } - // 若仍需用base作为参数: - // base: itemName, - // params: { baseIndex: baseIndex } }); }); diff --git a/src/views/home/operatingComponents/operatingLineChartCumulative.vue b/src/views/home/operatingComponents/operatingLineChartCumulative.vue index abb75a74..4e158c13 100644 --- a/src/views/home/operatingComponents/operatingLineChartCumulative.vue +++ b/src/views/home/operatingComponents/operatingLineChartCumulative.vue @@ -83,24 +83,6 @@ export default { sortChange(value) { this.$emit('sort-change', value); }, - /** - * 判断rate对应的flag值(<1为0,>1为1) - * @param {number} rate 处理后的rate值(已*100) - * @returns {0|1} flag值 - */ -getRateFlag(rate, real, target) { - if (isNaN(rate) || rate === null || rate === undefined) return 0; - - // 1. 完成率 >= 100 => 达标 - if (rate >= 100) return 1; - - // 2. 完成率 = 0 且 (目标值=0 或 实际值=目标值=0) => 达标 - if (rate === 0 && target === 0) return 1; - - // 其他情况 => 未达标 - return 0; -}, - /** * 核心处理函数:在所有数据都准备好后,才组装 chartData */ diff --git a/src/views/home/operatingRevenue/operatingRevenue.vue b/src/views/home/operatingRevenue/operatingRevenue.vue index 6fe9c631..ac4e1bf8 100644 --- a/src/views/home/operatingRevenue/operatingRevenue.vue +++ b/src/views/home/operatingRevenue/operatingRevenue.vue @@ -26,26 +26,15 @@ grid-template-columns: 1624px; "> - - diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 2699485c..eaaabf0c 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -99,7 +99,7 @@ - + @@ -327,7 +327,8 @@ export default { dataScope: undefined, deptCheckStrictly: false, menuCheckStrictly: true, - remark: undefined + remark: undefined, + status: "0" }; this.resetForm("form"); },