diff --git a/.env.development b/.env.development index 16ef2d6..fe1715d 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # just a flag ENV = 'development' -# base api //http://192.168.1.181:8000/api 192.168.1.199:8000/api // http://124.71.192.230:8000/api // http://127.0.0.1:4523/m1/1450402-0-default +# base api //http://1.95.170.86:8002/api 192.168.1.199:8000/api // https://zzkj-cloud.com/api // http://127.0.0.1:4523/m1/1450402-0-default VUE_APP_BASE_API = 'https://zzkj-cloud.com/api' diff --git a/src/lang/revenue/zh.js b/src/lang/revenue/zh.js index 7479410..e99f13b 100644 --- a/src/lang/revenue/zh.js +++ b/src/lang/revenue/zh.js @@ -174,6 +174,7 @@ export default { laterQuery: '%,请稍后查询。', earningReport: '收益报表', bill: '账单' + }, region: { regionName: '区域名称', diff --git a/src/views/dashboard-zhongzi/components/topology/index.vue b/src/views/dashboard-zhongzi/components/topology/index.vue index 4fbc479..04a214c 100644 --- a/src/views/dashboard-zhongzi/components/topology/index.vue +++ b/src/views/dashboard-zhongzi/components/topology/index.vue @@ -586,12 +586,12 @@ - diff --git a/src/views/dashboardtest/components/top-center/ninth.vue b/src/views/dashboardtest/components/top-center/ninth.vue index 386ce0a..196847b 100644 --- a/src/views/dashboardtest/components/top-center/ninth.vue +++ b/src/views/dashboardtest/components/top-center/ninth.vue @@ -534,7 +534,7 @@ - + diff --git a/src/views/dashboardtest/components/top-center/pv1storage261.vue b/src/views/dashboardtest/components/top-center/pv1storage261.vue new file mode 100644 index 0000000..546bf00 --- /dev/null +++ b/src/views/dashboardtest/components/top-center/pv1storage261.vue @@ -0,0 +1,784 @@ + + + + diff --git a/src/views/dashboardtest/components/top-center/pv2storage261.vue b/src/views/dashboardtest/components/top-center/pv2storage261.vue new file mode 100644 index 0000000..015c76c --- /dev/null +++ b/src/views/dashboardtest/components/top-center/pv2storage261.vue @@ -0,0 +1,822 @@ + + + + diff --git a/src/views/dashboardtest/components/top-center/second-disposition.vue b/src/views/dashboardtest/components/top-center/second-disposition.vue index 9020d55..5871704 100644 --- a/src/views/dashboardtest/components/top-center/second-disposition.vue +++ b/src/views/dashboardtest/components/top-center/second-disposition.vue @@ -343,7 +343,7 @@ - + diff --git a/src/views/dashboardtest/components/top-center/seventh.vue b/src/views/dashboardtest/components/top-center/seventh.vue index ff5b068..71d221a 100644 --- a/src/views/dashboardtest/components/top-center/seventh.vue +++ b/src/views/dashboardtest/components/top-center/seventh.vue @@ -460,7 +460,7 @@ - + diff --git a/src/views/dashboardtest/index.vue b/src/views/dashboardtest/index.vue index 7f4602d..899bde6 100644 --- a/src/views/dashboardtest/index.vue +++ b/src/views/dashboardtest/index.vue @@ -158,6 +158,8 @@ import dispositionBottomRight from './components/bottom-right/disposition.vue' import { getDashboard } from '@/api/station/maintain' import { queryElecMeterConfig } from '@/api/home-page/index' +import pv1AndStorage_261 from './components/top-center/pv1storage261.vue' +import pv2AndStorage_261 from './components/top-center/pv2storage261.vue' export default { name: 'Index', components: { @@ -200,7 +202,9 @@ export default { dispositionBottomRight, controlTopRight, secondDispositionTopCenter, - tenthTopCenter + tenthTopCenter, + pv1AndStorage_261, + pv2AndStorage_261 }, props: {}, diff --git a/src/views/new-screen-zz/components/center-top.vue b/src/views/new-screen-zz/components/center-top.vue index 19657d4..55bf478 100644 --- a/src/views/new-screen-zz/components/center-top.vue +++ b/src/views/new-screen-zz/components/center-top.vue @@ -39,6 +39,19 @@
万元
+
+
+ + 今日实时收益 +
+
+ + +
元
+
+
@@ -73,10 +86,12 @@ export default { height: 100%; display: flex; justify-content: space-around; - + flex-wrap: wrap; + .today-income{ + width: 90%; + } .income { height: 100%; - padding-top: 15px; z-index: 99999; .title { display: flex; diff --git a/src/views/new-screen-zz/index.vue b/src/views/new-screen-zz/index.vue index 6f0d30d..41b85db 100644 --- a/src/views/new-screen-zz/index.vue +++ b/src/views/new-screen-zz/index.vue @@ -85,10 +85,12 @@ export default { leftBottomInfo: null, deptId: null, interval: null, + intervalTodayIncome: null, centerTopInfo: { totalProfit: 0, yearProfit: 0, - yestProfit: 0 + yestProfit: 0, + todayProfit: 0 }, weatherInfo: { skyCon: '', @@ -108,7 +110,9 @@ export default { }, destroyed() { clearInterval(this.interval) + clearInterval(this.intervalTodayIncome) this.interval = null + this.intervalTodayIncome = null }, methods: { // 修改Favicon的方法 @@ -148,6 +152,47 @@ export default { this.$refs.MapCenterRef.getLeftData(this.deptId) this.$refs.CenterBottomRef.getData(this.deptId) + // const res = await GetOverviewData({ + // deptId: this.deptId + // }) + // this.leftTopInfo = { + // capacity: res.data.capacity, + // stationNumber: res.data.stationNumber, + // yearCharge: res.data.yearCharge, + // yearDischarge: res.data.yearDischarge, + // totalCharge: res.data.totalCharge, + // totalDischarge: res.data.totalDischarge, + // dayCharge: res.data.dayCharge, + // dayDischarge: res.data.dayDischarge + // } + // this.centerTopInfo = { + // totalProfit: (Number(res.data.totalProfit) / 1E4).toFixed(2), + // yearProfit: (Number(res.data.yearProfit) / 1E4).toFixed(2), + // yestProfit: (Number(res.data.yestProfit) / 1E4).toFixed(2), + // todayProfit: Number(res.data.todayProfit).toFixed(2) + // } + } catch (err) { + // this.leftTopInfo = { + // capacity: 0, + // stationNumber: 0, + // yearCharge: 0, + // yearDischarge: 0, + // totalCharge: 0, + // totalDischarge: 0, + // dayCharge: 0, + // dayDischarge: 0 + // } + // this.centerTopInfo = { + // totalProfit: 0, + // yearProfit: 0, + // yestProfit: 0, + // todayProfit: 0 + // } + } + }, + + async getDataIncome() { + try { const res = await GetOverviewData({ deptId: this.deptId }) @@ -161,11 +206,11 @@ export default { dayCharge: res.data.dayCharge, dayDischarge: res.data.dayDischarge } - this.centerTopInfo = { totalProfit: (Number(res.data.totalProfit) / 1E4).toFixed(2), yearProfit: (Number(res.data.yearProfit) / 1E4).toFixed(2), - yestProfit: (Number(res.data.yestProfit) / 1E4).toFixed(2) + yestProfit: (Number(res.data.yestProfit) / 1E4).toFixed(2), + todayProfit: Number(res.data.todayProfit).toFixed(2) } } catch (err) { this.leftTopInfo = { @@ -181,7 +226,8 @@ export default { this.centerTopInfo = { totalProfit: 0, yearProfit: 0, - yestProfit: 0 + yestProfit: 0, + todayProfit: 0 } } }, @@ -196,9 +242,13 @@ export default { }).then(res => { this.deptId = res.data?.deptId this.getData() + this.getDataIncome() this.interval = setInterval(() => { this.getData() }, 600000) + this.intervalTodayIncome = setInterval(() => { + this.getDataIncome() + }, 10000) }) } } diff --git a/src/views/system/department/select.js b/src/views/system/department/select.js index 09712fa..e239fb2 100644 --- a/src/views/system/department/select.js +++ b/src/views/system/department/select.js @@ -13,6 +13,8 @@ const leftBottomList = [ ] const topCenterList = [ { label: '215kWh', value: 'topCenter_215' }, + { label: '261光储1', value: 'pv1AndStorage_261' }, + { label: '261光储2', value: 'pv2AndStorage_261' }, { label: '标准', value: 'commonTopCenter' }, { label: '单柜配置', value: 'onceTopCenter' }, { label: '二合一', value: 'secondTopCenter' }, @@ -26,7 +28,8 @@ const topCenterList = [ { label: '七合一(配置)', value: 'seventhTopCenter' }, { label: '八合一(配置)', value: 'eighthTopCenter' }, { label: '九合一(配置)', value: 'ninthTopCenter' }, - { label: '十合一(配置)', value: 'tenthTopCenter' } + { label: '十合一(配置)', value: 'tenthTopCenter' }, + { label: '一百二十合一(配置)', value: 'zzhbTopCenter' } ] const rightTopList = [ { label: '实时告警', value: 'topRight' }, diff --git a/vue.config.js b/vue.config.js index 20a530a..d0a9d27 100644 --- a/vue.config.js +++ b/vue.config.js @@ -14,7 +14,7 @@ const name = defaultSettings.title || '弘正新能源' // page title // You can change the port by the following method: // port = 9527 npm run dev OR npm run dev --port = 9527 -const port = process.env.port || process.env.npm_config_port || 9527 // dev port +const port = process.env.port || process.env.npm_config_port || 10324 // dev port // All configuration item explanations can be find in https://cli.vuejs.org/config/ module.exports = {