diff --git a/public/index.html b/public/index.html index 84c3c23c..b24c487e 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,10 @@ + + + + <%= webpackConfig.name %> diff --git a/src/views/home/components/budgetDetails.vue b/src/views/home/components/budgetDetails.vue index 90fbb87c..f2a60895 100644 --- a/src/views/home/components/budgetDetails.vue +++ b/src/views/home/components/budgetDetails.vue @@ -112,6 +112,7 @@ import inputArea from './inputArea.vue' // 导入输入组件 import { publicFormatter } from '@/utils/dict'; import {getAccessToken, getTenantId} from '@/utils/auth' import axios from 'axios'; +import moment from 'moment'; export default { name: 'ProductionStatus', components: { @@ -481,13 +482,14 @@ export default { pageSize: 1000, template:1, pageNo: this.form.pageNo, - timeDim:this.form.timeDim + timeDim:this.timeType === 'month'?2:3 }).then(response => { let fileName = ''; + let factoryName = this.levelLList.filter(item => item.id == this.form.levelId)[0].name; if (this.timeType === 'month') { - fileName = '月度预算导入模板.xls'; + fileName = factoryName+'_月_预算导入模板.xls'; }else{ - fileName = '年度预算导入模板.xls'; + fileName = factoryName+'_年_预算导入模板.xls'; } this.$download.excel(response, fileName); }); @@ -500,7 +502,7 @@ export default { pageSize: 1000, template:0, pageNo: this.form.pageNo, - timeDim:this.form.timeDim + timeDim:this.timeType === 'month'?2:3 }).then(response => { let mon = this.timeType=== 'month'?moment(this.form.endTime).format('YYYYMM'):moment(this.form.endTime).format('YYYY'); let factoryName = this.levelLList.filter(item => item.id == this.form.levelId)[0].name; diff --git a/src/views/home/components/indicatorDetails.vue b/src/views/home/components/indicatorDetails.vue index 8c5bbbcc..283d8cfd 100644 --- a/src/views/home/components/indicatorDetails.vue +++ b/src/views/home/components/indicatorDetails.vue @@ -361,7 +361,9 @@ export default { template:1, pageNo: this.form.pageNo }).then(response => { - this.$download.excel(response, '指标导入模板.xls'); + let factoryName = this.levelLList.filter(item => item.id == this.form.levelId)[0].name; + let fileName = factoryName+'_指标导入模板.xls'; + this.$download.excel(response, fileName); }); }, exportExcel() { diff --git a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue index e0498568..eab921fb 100644 --- a/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue +++ b/src/views/home/salesVolumeAnalysis/doublePlatedBase.vue @@ -182,7 +182,7 @@ export default { // index: this.index, // sort: 1, paramName: '双镀销量', - paramList: ['双镀成本', '双镀均价','双镀毛利'], + paramList: ['双镀成本', '双镀均价','双镀毛利率'], baseId: this.factory, // baseId: Number(this.factory), }; diff --git a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue index 77a5266c..5269fd5a 100644 --- a/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue +++ b/src/views/home/salesVolumeAnalysisComponents/dataTrendBarDouble.vue @@ -68,7 +68,7 @@ export default { {name:'双镀销量',unit:'万㎡'}, {name:'双镀成本',unit:'元/㎡'}, {name:'双镀均价',unit:'元/㎡'}, - {name:'双镀毛利',unit:'元'}, + {name:'双镀毛利率',unit:'元'}, ], unit:'万㎡' }; diff --git a/src/views/home/salesVolumeAnalysisComponents/monthlyThreeRelatedMetrics.vue b/src/views/home/salesVolumeAnalysisComponents/monthlyThreeRelatedMetrics.vue index bf289a12..9de4d48c 100644 --- a/src/views/home/salesVolumeAnalysisComponents/monthlyThreeRelatedMetrics.vue +++ b/src/views/home/salesVolumeAnalysisComponents/monthlyThreeRelatedMetrics.vue @@ -37,7 +37,7 @@ export default { default: () => ({ 双镀成本: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, 双镀均价: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, - 双镀毛利: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, + 双镀毛利率: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, }) }, title: { @@ -63,7 +63,7 @@ export default { return [ { key: 'financialCost', name: '双镀成本', unit: '元/㎡'}, { key: 'financialPrice', name: '双镀均价', unit: '元/㎡'}, - { key: 'financialProfit', name: '双镀毛利', unit: '元'}, + { key: 'financialProfit', name: '双镀毛利率', unit: '元'}, ] }, indicators() { diff --git a/src/views/home/salesVolumeAnalysisComponents/yearThreeRelatedMetrics.vue b/src/views/home/salesVolumeAnalysisComponents/yearThreeRelatedMetrics.vue index a1bdbc62..397d26b0 100644 --- a/src/views/home/salesVolumeAnalysisComponents/yearThreeRelatedMetrics.vue +++ b/src/views/home/salesVolumeAnalysisComponents/yearThreeRelatedMetrics.vue @@ -40,7 +40,7 @@ export default { default: () => ({ 双镀成本: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, 双镀均价: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, - 双镀毛利: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, + 双镀毛利率: { completeRate: 0, diff: 0, real: 0, target: 0, thb: 0 }, }) }, title: { @@ -66,7 +66,7 @@ export default { return [ { key: 'financialCost', name: '双镀成本', unit: '元/㎡'}, { key: 'financialPrice', name: '双镀均价', unit: '元/㎡'}, - { key: 'financialProfit', name: '双镀毛利', unit: '元'}, + { key: 'financialProfit', name: '双镀毛利率', unit: '元'}, ] }, indicators() { diff --git a/src/views/home/unitPriceAnalysisComponents/financeCostsContainer.vue b/src/views/home/unitPriceAnalysisComponents/financeCostsContainer.vue index 3249a0cc..a6164b5d 100644 --- a/src/views/home/unitPriceAnalysisComponents/financeCostsContainer.vue +++ b/src/views/home/unitPriceAnalysisComponents/financeCostsContainer.vue @@ -215,7 +215,7 @@ export default { } .content-top-right { - width: 1300px; + width: 1293px; height: 60px; background:#FFFFFF; position: absolute;