diff --git a/.eslintrc.js b/.eslintrc.js index 32be3ea..06ca783 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -196,6 +196,14 @@ module.exports = { objectsInObjects: false }], 'array-bracket-spacing': [2, 'never'] - } + }, + overrides: [ + { + files: ['src/lang/**/*.js'], // 匹配所有语言文件 + rules: { + quotes: 'off' // 关闭引号规则 + } + } + ] } diff --git a/src/api/system/remote-manage.js b/src/api/system/remote-manage.js new file mode 100644 index 0000000..5cdfdf0 --- /dev/null +++ b/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 + }) +} diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue index 5322035..7086cf6 100644 --- a/src/components/LangSelect/index.vue +++ b/src/components/LangSelect/index.vue @@ -4,12 +4,27 @@ - + 中文 - + English + + Español + + + Français + + + German + + + język polski + + + Arabic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + {{ item.value }} + + + + + + + {{ item.name }} + + + {{ item.value }} + + + + + + + {{ item.name }} + + + {{ item.value }} + + + + + +
+ + + {{ truncateText(item.name, 120) }} + + +
+
+ + {{ item.value }} + +
+ + + + + {{ item.name }} + + + {{ item.value }} + + + + + + + + + + + + diff --git a/src/views/dashboardtest/components/top-center/pv1storage261.vue b/src/views/dashboardtest/components/top-center/pv1storage261.vue index 546bf00..52c50e4 100644 --- a/src/views/dashboardtest/components/top-center/pv1storage261.vue +++ b/src/views/dashboardtest/components/top-center/pv1storage261.vue @@ -377,7 +377,7 @@ {{ item.name }} - + {{ item.value }} @@ -388,7 +388,7 @@ {{ item.name }} - + {{ item.value }} diff --git a/src/views/dashboardtest/components/top-center/pv2storage-sts-261.vue b/src/views/dashboardtest/components/top-center/pv2storage-sts-261.vue new file mode 100644 index 0000000..7cb3612 --- /dev/null +++ b/src/views/dashboardtest/components/top-center/pv2storage-sts-261.vue @@ -0,0 +1,810 @@ + + + + diff --git a/src/views/dashboardtest/components/top-center/pv2storage261.vue b/src/views/dashboardtest/components/top-center/pv2storage261.vue index a1001fd..b86d290 100644 --- a/src/views/dashboardtest/components/top-center/pv2storage261.vue +++ b/src/views/dashboardtest/components/top-center/pv2storage261.vue @@ -309,7 +309,7 @@ - + /> --> {{ item.name }} - + {{ item.value }} - + @@ -368,7 +368,7 @@ {{ item.name }} - + {{ item.value }} @@ -467,7 +467,7 @@ import config from './config' import { changeTheme } from '@/utils/index' import ACDCImg from '@/assets/images/wxjd/ACDC.png' import DCImg from '@/assets/images/wxjd/DC.png' -import STSImg from '@/assets/images/wxjd/STS.png' +// import STSImg from '@/assets/images/wxjd/STS.png' export default { name: 'Index', props: { @@ -491,7 +491,7 @@ export default { frameImg, ACDCImg, DCImg, - STSImg, + // STSImg, dotData: { lineTop: 'M 0,0 0,0', lineTopLeft: 'M 0,0 0,0', @@ -515,7 +515,7 @@ export default { pcsLeftData: [], pcsCenterData: [], pcsRightData: [], - stsCenterData: [], + // stsCenterData: [], acdcCenterData: [], ammeterData: [], configData: {} @@ -615,20 +615,20 @@ export default { this.loading = false } }, - async getstsCenter() { - this.loading = true - try { - const res = await DynamicConfigPoint({ - pageLocation: 'triad-sts-center', - permissionId: this.permissionId, - stationId: this.stationId }) - this.stsCenterData = res.data - } catch (error) { - // console.log(error); - } finally { - this.loading = false - } - }, + // async getstsCenter() { + // this.loading = true + // try { + // const res = await DynamicConfigPoint({ + // pageLocation: 'triad-sts-center', + // permissionId: this.permissionId, + // stationId: this.stationId }) + // this.stsCenterData = res.data + // } catch (error) { + // // console.log(error); + // } finally { + // this.loading = false + // } + // }, async getacdcCenter() { this.loading = true try { @@ -763,7 +763,7 @@ export default { getData() { this.getpcsRight() this.getpcsCenter() - this.getstsCenter() + // this.getstsCenter() this.getacdcCenter() this.getpcsLeft() this.getammeter() diff --git a/src/views/dashboardtest/components/top-center/pv8fourth.vue b/src/views/dashboardtest/components/top-center/pv8fourth.vue new file mode 100644 index 0000000..0fa7e35 --- /dev/null +++ b/src/views/dashboardtest/components/top-center/pv8fourth.vue @@ -0,0 +1,1396 @@ + + + + diff --git a/src/views/dashboardtest/index.vue b/src/views/dashboardtest/index.vue index 982b13b..f4fb77e 100644 --- a/src/views/dashboardtest/index.vue +++ b/src/views/dashboardtest/index.vue @@ -159,7 +159,10 @@ import { getDashboard } from '@/api/station/maintain' import { queryElecMeterConfig } from '@/api/home-page/index' import pv1AndStorage_261 from './components/top-center/pv1storage261.vue' +import pv1AndStorage_sts_261 from './components/top-center/pv1storage-sts-261.vue' import pv2AndStorage_261 from './components/top-center/pv2storage261.vue' +import pv2AndStorage_sts_261 from './components/top-center/pv2storage-sts-261.vue' +import pv8FourthTopCenter from './components/top-center/pv8fourth.vue' export default { name: 'Index', @@ -205,7 +208,10 @@ export default { secondDispositionTopCenter, tenthTopCenter, pv1AndStorage_261, - pv2AndStorage_261 + pv2AndStorage_261, + pv1AndStorage_sts_261, + pv2AndStorage_sts_261, + pv8FourthTopCenter }, props: {}, data() { diff --git a/src/views/new-screen-zz-pv/components/center-bottom.vue b/src/views/new-screen-zz-pv/components/center-bottom.vue index 24d002d..17dae50 100644 --- a/src/views/new-screen-zz-pv/components/center-bottom.vue +++ b/src/views/new-screen-zz-pv/components/center-bottom.vue @@ -49,7 +49,7 @@ export default { const dayCharge = [] data.forEach((el) => { x_data.push(el.time) - dayCharge.push(el.dayCharge) + dayCharge.push(el.release) }) this.options = { tooltip: { diff --git a/src/views/new-screen-zz-pv/components/left-top.vue b/src/views/new-screen-zz-pv/components/left-top.vue index b7ab291..7cb1285 100644 --- a/src/views/new-screen-zz-pv/components/left-top.vue +++ b/src/views/new-screen-zz-pv/components/left-top.vue @@ -19,7 +19,7 @@
{{ info.stationNumber }}
-
{{ lang === 'zh'? '个':'' }}
+
{{ lang === 'zh_CN'? '个':'' }}
diff --git a/src/views/new-screen-zz-pv/components/right-bottom.vue b/src/views/new-screen-zz-pv/components/right-bottom.vue index 5ce5bec..011cc16 100644 --- a/src/views/new-screen-zz-pv/components/right-bottom.vue +++ b/src/views/new-screen-zz-pv/components/right-bottom.vue @@ -27,14 +27,13 @@ export default { data() { return { tableLoading: false, - tableTitles: [this.$t('screen.stationName'), this.$t('screen.cap')], + tableTitles: [this.$t('screen.stationName'), this.$t('screen.cumulativePowerGeneration') + '(kWh)'], tableData: [], widths: ['auto', 'auto', 'auto', 'auto'], contentHeight: 200, tableColumns: [ 'stationName', - 'stationCapacity', - 'efficiencyValue' + 'release' ] } }, diff --git a/src/views/new-screen-zz-pv/index.vue b/src/views/new-screen-zz-pv/index.vue index 2f8c34a..46dc78c 100644 --- a/src/views/new-screen-zz-pv/index.vue +++ b/src/views/new-screen-zz-pv/index.vue @@ -6,8 +6,8 @@
- - {{ $t('screen.pvScreenTitle') }} + + {{ $t('screen.pvScreenTitle') }}
{{ time }} diff --git a/src/views/new-screen-zz/components/left-top.vue b/src/views/new-screen-zz/components/left-top.vue index 040fe73..eda7549 100644 --- a/src/views/new-screen-zz/components/left-top.vue +++ b/src/views/new-screen-zz/components/left-top.vue @@ -19,7 +19,7 @@
{{ info.stationNumber }}
-
{{ lang === 'zh'? '个':'' }}
+
{{ lang === 'zh_CN'? '个':'' }}
diff --git a/src/views/new-screen-zz/index.vue b/src/views/new-screen-zz/index.vue index 29fb324..583a3bb 100644 --- a/src/views/new-screen-zz/index.vue +++ b/src/views/new-screen-zz/index.vue @@ -6,8 +6,8 @@
- - {{ $t('screen.ztscreenTitle') }} + + {{ $t('screen.ztscreenTitle') }}
{{ time }} diff --git a/src/views/operational-inspection/activiti-definition/index.vue b/src/views/operational-inspection/activiti-definition/index.vue index f8d5196..9db76ba 100644 --- a/src/views/operational-inspection/activiti-definition/index.vue +++ b/src/views/operational-inspection/activiti-definition/index.vue @@ -298,7 +298,7 @@ export default { // 设置上传的请求头部 headers: { authorization: getToken(), - lang: sessionStorage.getItem('language') === 'en' ? 'en_US' : 'zh_CN' + lang: sessionStorage.getItem('language') ? sessionStorage.getItem('language') : 'zh_CN' }, // 上传的地址 url: diff --git a/src/views/remote-control/file-service/components/uploadDialog.vue b/src/views/remote-control/file-service/components/uploadDialog.vue index 69adb10..dd25425 100644 --- a/src/views/remote-control/file-service/components/uploadDialog.vue +++ b/src/views/remote-control/file-service/components/uploadDialog.vue @@ -130,7 +130,7 @@ export default { uploadList: [], headers: { authorization: getToken(), - lang: sessionStorage.getItem('language') === 'en' ? 'en_US' : 'zh_CN' + lang: sessionStorage.getItem('language') ? sessionStorage.getItem('language') : 'zh_CN' }, fileList: [], uploadData: { diff --git a/src/views/remote-control/intergrated-cabinet/index.vue b/src/views/remote-control/intergrated-cabinet/index.vue index d91a009..871fe70 100644 --- a/src/views/remote-control/intergrated-cabinet/index.vue +++ b/src/views/remote-control/intergrated-cabinet/index.vue @@ -761,6 +761,7 @@ export default { return el } }) + console.log(JSON.stringify(stationName)) const indexPoint = stationName.name.indexOf('.') if (indexPoint !== -1) { stationName.name = stationName.name + '.xls' diff --git a/src/views/remote-control/remote-connection/index.vue b/src/views/remote-control/remote-connection/index.vue new file mode 100644 index 0000000..4269340 --- /dev/null +++ b/src/views/remote-control/remote-connection/index.vue @@ -0,0 +1,126 @@ +