冲突文件处理

.env.development

@@ -4,7 +4,7 @@ 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
 
 
-VUE_APP_BASE_API = 'https://zetatech.zzkj-cloud.com/api'
+VUE_APP_BASE_API = 'https://zzkj-cloud.com/api'
 VUE_APP_VISUALE_API = http://192.168.0.82:9527
 VUE_APP_ZUTAI_API = http://192.168.100.83:8001
 

.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'https://zetatech.zzkj-cloud.com/api'
+VUE_APP_BASE_API = 'https://zzkj-cloud.com/api'
 

.eslintrc.js

@@ -196,6 +196,14 @@ module.exports = {
       objectsInObjects: false
     }],
     'array-bracket-spacing': [2, 'never']
+  },
+  overrides: [
+    {
+      files: ['src/lang/**/*.js'], // 匹配所有语言文件
+      rules: {
+        quotes: 'off' // 关闭引号规则
       }
     }
+  ]
+}
 

public/bpmnjs/index.js

@@ -3450,7 +3450,7 @@ function getDi(element) {
 
 function getSemantic(element) {
   return element.businessObject;
-} // color access //////////////////////
+} //////////////////////
 
 
 function getFillColor(element, defaultColor) {

src/App.vue

@@ -60,7 +60,10 @@ export default {
 </style>
 <style lang="scss" scoped>
 ::v-deep .item-top-new {
-  background-image: var(--item-header-bg) !important;
+  background-image: var(--item-header-bg-new-2x) !important;
+  .top-title{
+    padding: 0 10px 0 15px !important;
+  }
 }
 
 ::v-deep #chart{
@@ -81,12 +84,17 @@ export default {
 }
 
 ::v-deep .stationData-content-box{
-    background: url(./assets/station-data/item-bg.png) no-repeat !important;
+    // background: url(./assets/station-data/item-bg.png) no-repeat !important;
     background-size: 100% 100%!important;
+    padding: 0 20px!important;
+    margin-bottom: 7px!important;
 }
 
 ::v-deep .price-con-item {
   background: url(./assets/images/price-bg.png) no-repeat !important;
   background-size: 100% 100%!important;
 }
+::v-deep .item-con{
+  background: rgba(0, 0, 0, 0.3) !important;
+}
 </style>

src/api/home-page/index.js

@@ -300,3 +300,12 @@ export function SetDataConfig(data) {
     data
   })
 }
+
+// 获取电站光伏能量/收益趋势
+export function getPvData(data) {
+  return request({
+    url: 'business/openStation/getPvData',
+    method: 'post',
+    data
+  })
+}

src/api/revenue-management/earnings-statement.js

@@ -8,6 +8,13 @@ export function GetTotal(data) {
     data
   })
 }
+export function getPvMonthData(data) {
+  return request({
+    url: '/business/earningsCalculate/getPvMonthData',
+    method: 'post',
+    data
+  })
+}
 
 /** 查询一键重算 */
 

src/api/screen/zzPvScreen.js

@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+// 中自根据电站Id查询所属组织机构返回
+export function GetDeptIdByStationId(data) {
+  return request({
+    url: '/business/IargeScreenShow/getByStationId',
+    method: 'post',
+    data
+  })
+}
+
+// 总览
+export function GetPvOverviewData(data) {
+  return request({
+    url: '/business/IargeScreenShow/getZhongZiPvOverviewData',
+    method: 'post',
+    data
+  })
+}
+// 获取电站区域分布
+export function GetPvRegionalDistribution(data) {
+  return request({
+    url: '/business/IargeScreenShow/getZhongZiPvDistribution',
+    method: 'post',
+    data
+  })
+}
+// 节能减排
+export function GetPvEnergySaving(data) {
+  return request({
+    url: '/business/IargeScreenShow/getZhongZiPvEnergySaving',
+    method: 'post',
+    data
+  })
+}
+// 日发电量
+export function GetPvRelease(data) {
+  return request({
+    url: '/business/IargeScreenShow/getZhongZiPvRelease',
+    method: 'post',
+    data
+  })
+}
+// 收益曲线
+export function GetPvIncomeCurve(data) {
+  return request({
+    url: '/business/IargeScreenShow/getZhongZiPvIncomeCurve',
+    method: 'post',
+    data
+  })
+}
+// 电站收益率排名
+export function GetPvRegionalIncomeDate(data) {
+  return request({
+    url: '/business/IargeScreenShow/getZhongZiPvIncomeList',
+    method: 'post',
+    data
+  })
+}
+// 电站发电量排名
+export function GetPvElecList(data) {
+  return request({
+    url: '/business/IargeScreenShow/getZhongZiPvElecList',
+    method: 'post',
+    data
+  })
+}

src/api/surveillance/mttp/index.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// mttp发电功率
+export function GetMtttpCurve(data) {
+  return request({
+    url: '/business/pcs/pvCurve',
+    method: 'post',
+    data
+  })
+}

src/api/system/remote-manage.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 删除远控电站信息
+export function DeleteRemote(data) {
+  return request({
+    url: '/business/stationRemote/delete',
+    method: 'post',
+    data
+  })
+}
+
+// 查询远控电站信息(分页)
+export function GetRemoteList(data) {
+  return request({
+    url: '/business/stationRemote/pageList',
+    method: 'post',
+    data
+  })
+}
+// 新增/修改远控电站信息
+export function AddUpdateRemote(data) {
+  return request({
+    url: '/business/stationRemote/saveOrUpdate',
+    method: 'post',
+    data
+  })
+}
+// 查询远控电站信息
+export function GetRemoteDetails(data) {
+  return request({
+    url: '/business/stationRemote/search',
+    method: 'post',
+    data
+  })
+}