diff --git a/dwt-account/webpack-account/src/js/utils/http.util.js b/dwt-account/webpack-account/src/js/utils/http.util.js index dcefaf3..72bf877 100644 --- a/dwt-account/webpack-account/src/js/utils/http.util.js +++ b/dwt-account/webpack-account/src/js/utils/http.util.js @@ -3,7 +3,7 @@ import { Rx } from 'rxjs' import { cookie } from '../utils/cookie.util' // const basePath = 'http://api.dianwutong.com'; -const basePath = 'https://api.saas.dianwutong.com' +const basePath = 'https://cdyapi.saas.dianwutong.com' const http = {} diff --git a/dwt-account/webpack-account/src/scss/login.scss b/dwt-account/webpack-account/src/scss/login.scss index 67384b1..93530fe 100644 --- a/dwt-account/webpack-account/src/scss/login.scss +++ b/dwt-account/webpack-account/src/scss/login.scss @@ -46,7 +46,7 @@ a { box-sizing: border-box; .container { height: 100%; - background: url('http://cdn.saas.dianwutong.com/account/img/login-bg.png'); + background: url('http://cdycdn.saas.dianwutong.com/account/img/login-bg.png'); background-repeat: no-repeat; position: relative; diff --git a/dwt-account/webpack-account/src/view/common/password-layout.html b/dwt-account/webpack-account/src/view/common/password-layout.html index 9a141b1..ba9b9ad 100644 --- a/dwt-account/webpack-account/src/view/common/password-layout.html +++ b/dwt-account/webpack-account/src/view/common/password-layout.html @@ -8,7 +8,7 @@ - + 修改密码 @@ -16,7 +16,7 @@
- + 找回密码
diff --git a/dwt-account/webpack-account/src/view/login.html b/dwt-account/webpack-account/src/view/login.html index 547c863..ad5eb46 100644 --- a/dwt-account/webpack-account/src/view/login.html +++ b/dwt-account/webpack-account/src/view/login.html @@ -8,7 +8,7 @@ - + 登录 @@ -17,7 +17,7 @@
- +
@@ -68,20 +68,17 @@
-
电务通app下载
- +
app下载
+
-
+ - - - +
电务通官方抖音
- -
+ +
-->
diff --git a/dwt-circuit/webpack-circuit/src/pages/run/index.js b/dwt-circuit/webpack-circuit/src/pages/run/index.js index 7082766..b28b125 100644 --- a/dwt-circuit/webpack-circuit/src/pages/run/index.js +++ b/dwt-circuit/webpack-circuit/src/pages/run/index.js @@ -20,7 +20,7 @@ import { AttrFnMap } from '../../common/attr-fn-map' let app = { ws: null, - wsAddress: 'wss://api.saas.dianwutong.com/mqtt/websocket', + wsAddress: 'wss://cdyapi.saas.dianwutong.com/mqtt/websocket', wsParam: null, graph: null, diff --git a/dwt-circuit/webpack-circuit/src/utils/baseUrl.js b/dwt-circuit/webpack-circuit/src/utils/baseUrl.js index 0878a62..5efd1ed 100644 --- a/dwt-circuit/webpack-circuit/src/utils/baseUrl.js +++ b/dwt-circuit/webpack-circuit/src/utils/baseUrl.js @@ -2,10 +2,10 @@ let baseUrl = '' // 这里是一个默认的url，可以没有 switch (process.env.NODE_ENV) { case 'development': - baseUrl = 'https://api.saas.dianwutong.com' // 开发环境url + baseUrl = 'https://cdyapi.saas.dianwutong.com' // 开发环境url break case 'production': - baseUrl = 'https://api.saas.dianwutong.com' // 生产环境url + baseUrl = 'https://cdyapi.saas.dianwutong.com' // 生产环境url break } diff --git a/dwt-console/src/app/main/base/circuit/circuit.component.ts b/dwt-console/src/app/main/base/circuit/circuit.component.ts index f776993..225bd7b 100644 --- a/dwt-console/src/app/main/base/circuit/circuit.component.ts +++ b/dwt-console/src/app/main/base/circuit/circuit.component.ts @@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core' export class CircuitComponent implements OnInit { ngOnInit() { // 跳转到一次接线图绘制页面 - window.open('https://circuit.saas.dianwutong.com') - window.location.href = 'https://console.saas.dianwutong.com' + window.open('https://cdycircuit.saas.dianwutong.com') + window.location.href = 'https://cdyconsole.saas.dianwutong.com' } } diff --git a/dwt-console/src/app/main/base/new_power_room/html/power_room.setting.html b/dwt-console/src/app/main/base/new_power_room/html/power_room.setting.html index de8671a..78db195 100644 --- a/dwt-console/src/app/main/base/new_power_room/html/power_room.setting.html +++ b/dwt-console/src/app/main/base/new_power_room/html/power_room.setting.html @@ -19,9 +19,9 @@
  • 点表设置
  • 标签设置
    • -
  • 预报警推送设置
    • + -
  • 点表设置新版(测试中)
    • + diff --git a/dwt-console/src/app/main/base/power_room/html/power_room.setting.html b/dwt-console/src/app/main/base/power_room/html/power_room.setting.html index db18bc9..4a5d1a1 100644 --- a/dwt-console/src/app/main/base/power_room/html/power_room.setting.html +++ b/dwt-console/src/app/main/base/power_room/html/power_room.setting.html @@ -18,7 +18,7 @@
  • 点表设置
  • 标签设置
    • -
  • 预报警推送设置
    • + diff --git a/dwt-console/src/app/main/base/power_room/pr_table_DI.panel/pr_table_DI.panel.html b/dwt-console/src/app/main/base/power_room/pr_table_DI.panel/pr_table_DI.panel.html index 87663c5..41bc075 100644 --- a/dwt-console/src/app/main/base/power_room/pr_table_DI.panel/pr_table_DI.panel.html +++ b/dwt-console/src/app/main/base/power_room/pr_table_DI.panel/pr_table_DI.panel.html @@ -174,7 +174,7 @@
    -
    +
    diff --git a/dwt-console/src/app/main/base/service_config/component/config_list.component.ts b/dwt-console/src/app/main/base/service_config/component/config_list.component.ts index 89e1e33..d60b25e 100644 --- a/dwt-console/src/app/main/base/service_config/component/config_list.component.ts +++ b/dwt-console/src/app/main/base/service_config/component/config_list.component.ts @@ -39,7 +39,8 @@ export class ServiceConfigListComponent implements OnInit { // edit start 2019/11/04 kangzhi // this.router.navigate(['/base/serviceConfig/' + router, data]); this.router.navigate([ - '/base/serviceConfig/' + router + '/' + data + '/configDetail', + '/base/serviceConfig/configDetailSwitch/' + data + '/' + router, + // '/base/serviceConfig/' + router + '/' + data + '/configDetail', ]) // edit end 2019/11/04 kangzhi } diff --git a/dwt-console/src/app/main/base/service_config/html/config_detail_switch.html b/dwt-console/src/app/main/base/service_config/html/config_detail_switch.html index a1771bf..f7ae190 100644 --- a/dwt-console/src/app/main/base/service_config/html/config_detail_switch.html +++ b/dwt-console/src/app/main/base/service_config/html/config_detail_switch.html @@ -15,7 +15,7 @@
    - + --> +
    + {{selectStation.stationName?'工作站：'+selectStation.stationName:''}}
    - +
    +
    -
    +
    \ No newline at end of file diff --git a/dwt-console/src/app/main/common/common.enums.ts b/dwt-console/src/app/main/common/common.enums.ts index 5bd5aff..ee46a43 100644 --- a/dwt-console/src/app/main/common/common.enums.ts +++ b/dwt-console/src/app/main/common/common.enums.ts @@ -1,6 +1,6 @@ // 文件下载地址 export let URLS = { - prefix: 'https://file.saas.dianwutong.com/', + prefix: 'https://cdyfile.saas.dianwutong.com/', } // 上传的文件类型 diff --git a/dwt-console/src/environments/environment.prod.ts b/dwt-console/src/environments/environment.prod.ts index c16b940..d4a4903 100644 --- a/dwt-console/src/environments/environment.prod.ts +++ b/dwt-console/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiBasePath: 'https://api.saas.dianwutong.com', - accountPath: 'https://account.saas.dianwutong.com/', - currentPath: 'https://console.saas.dianwutong.com', + apiBasePath: 'https://cdyapi.saas.dianwutong.com', + accountPath: 'https://cdyaccount.saas.dianwutong.com/', + currentPath: 'https://cdyconsole.saas.dianwutong.com', } diff --git a/dwt-console/src/environments/environment.ts b/dwt-console/src/environments/environment.ts index 903169a..b7185b3 100644 --- a/dwt-console/src/environments/environment.ts +++ b/dwt-console/src/environments/environment.ts @@ -1,8 +1,8 @@ export const environment = { production: false, - apiBasePath: 'https://api.saas.dianwutong.com', - accountPath: 'https://account.saas.dianwutong.com/', + apiBasePath: 'https://cdyapi.saas.dianwutong.com', + accountPath: 'https://cdyaccount.saas.dianwutong.com/', // apiBasePath: 'http://api.dianwutong.com', // accountPath: 'http://account.dianwutong.com/', - currentPath: 'http://console.dianwutong.com:4200', + currentPath: 'http://cdyconsole.dianwutong.com:4200', } diff --git a/dwt-console/src/index.html b/dwt-console/src/index.html index d6a24d6..ca196e7 100644 --- a/dwt-console/src/index.html +++ b/dwt-console/src/index.html @@ -23,7 +23,7 @@ // 如果没有token 直接跳转到登陆页 if (!/token/.test(document.cookie)) { - window.location.href = 'https://account.saas.dianwutong.com/login.html?from=' + location.href + window.location.href = 'https://cdyaccount.saas.dianwutong.com/login.html?from=' + location.href } diff --git a/dwt-edp/edp/releaseHandlePlugin.js b/dwt-edp/edp/releaseHandlePlugin.js index 0ebd2cf..8d1d4ad 100644 --- a/dwt-edp/edp/releaseHandlePlugin.js +++ b/dwt-edp/edp/releaseHandlePlugin.js @@ -1,5 +1,5 @@ -function ReleaseHandlePlugin(options) { - this.env = options.env; +function ReleaseHandlePlugin (options) { + this.env = options.env } ReleaseHandlePlugin.prototype.apply = function (complier) { @@ -9,43 +9,43 @@ ReleaseHandlePlugin.prototype.apply = function (complier) { try { if (this.env === 'test') { // mod._source._value = mod._source._value.replace(/api.dianwutong.com/g, 'api.t.dianwutong.com'); - mod._source._value = mod._source._value.replace(/account.dianwutong.com(:\d+)?/g, 'account.dianwutong.com'); - mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'edp.dianwutong.com'); + mod._source._value = mod._source._value.replace(/account.dianwutong.com(:\d+)?/g, 'account.dianwutong.com') + mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'edp.dianwutong.com') } else if (this.env === 'production') { - mod._source._value = mod._source._value.replace(/api.dianwutong.com/g, 'api.saas.dianwutong.com'); - mod._source._value = mod._source._value.replace(/account.dianwutong.com(:\d+)?/g, 'account.saas.dianwutong.com'); - mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'edp.saas.dianwutong.com'); + mod._source._value = mod._source._value.replace(/api.dianwutong.com/g, 'cdyapi.saas.dianwutong.com') + mod._source._value = mod._source._value.replace(/account.dianwutong.com(:\d+)?/g, 'cdyaccount.saas.dianwutong.com') + mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'cdyedp.saas.dianwutong.com') // mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'edp.saas.dianwutong.com'); } console.log("替换成功") } catch (error) { console.error("替换失败") } - - }); - }); + + }) + }) compilation.plugin( 'html-webpack-plugin-before-html-processing', (data, cb) => { - let html = data.html; - html = html.replace('',''); + let html = data.html + html = html.replace('', '') - if(this.env === 'test'){ + if (this.env === 'test') { html = html.replace(/account.dianwutong.com:(\d+)/g, 'account.test.dianwutong.com') - }else if(this.env === 'production'){ + } else if (this.env === 'production') { html = html.replace(/account.dianwutong.com(:\d+)?/g, 'account.saas.dianwutong.com') } - - data.html = html; + + data.html = html cb(null, data) } ) - }); + }) } -module.exports = ReleaseHandlePlugin; \ No newline at end of file +module.exports = ReleaseHandlePlugin \ No newline at end of file diff --git a/dwt-edp/edp/src/js/alarm-query/app.js b/dwt-edp/edp/src/js/alarm-query/app.js index 721a233..f3dca53 100644 --- a/dwt-edp/edp/src/js/alarm-query/app.js +++ b/dwt-edp/edp/src/js/alarm-query/app.js @@ -563,7 +563,7 @@ app.exportAlarms = function () { if (res.code == 200) { var a = $('') - var url = 'https://file.saas.dianwutong.com/' + res.body.fileUrl + var url = 'https://cdyfile.saas.dianwutong.com/' + res.body.fileUrl a.attr('download', '报警记录' + model.startDate + '至' + model.endDate + '.xls') a.attr('href', url) $('body').append(a[0]) diff --git a/dwt-edp/edp/src/js/all-real-alarms/app.js b/dwt-edp/edp/src/js/all-real-alarms/app.js index 577f5fd..bb14eca 100644 --- a/dwt-edp/edp/src/js/all-real-alarms/app.js +++ b/dwt-edp/edp/src/js/all-real-alarms/app.js @@ -178,7 +178,7 @@ ctrl.bind = function () { UI.hideProgress() if (res.code == 200) { var a = $('') - var url = 'https://file.saas.dianwutong.com/' + res.body.fileUrl + var url = 'https://cdyfile.saas.dianwutong.com/' + res.body.fileUrl a.attr('download', '报警记录' + '.xls') a.attr('href', url) $('body').append(a[0]) diff --git a/dwt-edp/edp/src/js/electricity-price-detail/app.js b/dwt-edp/edp/src/js/electricity-price-detail/app.js index ef148cc..b39fdb6 100644 --- a/dwt-edp/edp/src/js/electricity-price-detail/app.js +++ b/dwt-edp/edp/src/js/electricity-price-detail/app.js @@ -78,7 +78,7 @@ app.renderBug = function () { this.getBug().subscribe(res => { let bug = res.body - let prefix = 'https://file.saas.dianwutong.com/' + let prefix = 'https://cdyfile.saas.dianwutong.com/' $("#power-room").text(bug.prName) $("#inspection-grouper").text(bug.employeeName) diff --git a/dwt-edp/edp/src/js/frame/app.js b/dwt-edp/edp/src/js/frame/app.js index a1ace94..32d6abd 100644 --- a/dwt-edp/edp/src/js/frame/app.js +++ b/dwt-edp/edp/src/js/frame/app.js @@ -421,7 +421,7 @@ local.bind = function () { if (res && res.code == 200) { if (res.body.length && res.body.length > 0) { let circuitId = res.body[0]['circuitId'] - $('#main-frame').attr('src', `https://circuit.saas.dianwutong.com/run.html?circuitId=${circuitId}&prId=${prId}&flag=1`) + $('#main-frame').attr('src', `https://cdycircuit.saas.dianwutong.com/run.html?circuitId=${circuitId}&prId=${prId}&flag=1`) } else { UI.alert({ 'content': '当前配电室没有一次接线图信息', @@ -699,11 +699,11 @@ local.getPowerRoomDom = function (item) { } - if (local.menuStatus.hasRepairLogs) { + // if (local.menuStatus.hasRepairLogs) { - dom += '
    抢修日志
    ' + // dom += '
    抢修日志
    ' - } + // } if (local.menuStatus.hasWorkTickets) { @@ -891,17 +891,17 @@ local.getPowerRoomDom = function (item) { dom += '
    日志查询
    ' dom += '' dom += '
    巡检日志
    ' - dom += '
    抢修日志
    ' + // dom += '
    抢修日志
    ' dom += '
    工作票
    ' dom += '
    操作票
    ' dom += '' - dom += '
    ' - dom += '
    ' - dom += '' - dom += '
    抢修单
    ' - dom += '
    ' - dom += '
    ' + // dom += '
    ' + // dom += '
    ' + // dom += '' + // dom += '
    抢修单
    ' + // dom += '
    ' + // dom += '
    ' // add s 2023/9/22 // 电费核算 diff --git a/dwt-edp/edp/src/js/inspection-bug/app.js b/dwt-edp/edp/src/js/inspection-bug/app.js index dcc3e35..0af6f28 100644 --- a/dwt-edp/edp/src/js/inspection-bug/app.js +++ b/dwt-edp/edp/src/js/inspection-bug/app.js @@ -79,7 +79,7 @@ app.renderBug = function () { let bug = res.body // let prefix = res.prefix; - let prefix = 'https://file.saas.dianwutong.com/' + let prefix = 'https://cdyfile.saas.dianwutong.com/' $("#power-room").text(bug.prName) $("#inspection-grouper").text(bug.employeeName) diff --git a/dwt-edp/edp/src/js/operation-ticket/app.js b/dwt-edp/edp/src/js/operation-ticket/app.js index 5e3fdf8..2968c09 100644 --- a/dwt-edp/edp/src/js/operation-ticket/app.js +++ b/dwt-edp/edp/src/js/operation-ticket/app.js @@ -38,7 +38,7 @@ local.getTicket = function () { }).subscribe(function (res) { if (res.code === 200) { local.ticket = res.body - local.prefix = 'https://file.saas.dianwutong.com/' + local.prefix = 'https://cdyfile.saas.dianwutong.com/' local.renderTicket() } else { diff --git a/dwt-edp/edp/src/js/order-detail/model.js b/dwt-edp/edp/src/js/order-detail/model.js index bd341c6..e03f48f 100644 --- a/dwt-edp/edp/src/js/order-detail/model.js +++ b/dwt-edp/edp/src/js/order-detail/model.js @@ -22,7 +22,7 @@ model.getRepairOrderBaseInfo = function () { return http.get('/ems/rest/qx/order', data).map(res => { if (res.code === 200) { - model.prefix = 'https://file.saas.dianwutong.com/' + model.prefix = 'https://cdyfile.saas.dianwutong.com/' let order = res.body // 过滤出查勘任务和抢修任务 diff --git a/dwt-edp/edp/src/js/repair-log/model.js b/dwt-edp/edp/src/js/repair-log/model.js index 3685c7a..a5fd9fe 100644 --- a/dwt-edp/edp/src/js/repair-log/model.js +++ b/dwt-edp/edp/src/js/repair-log/model.js @@ -29,7 +29,7 @@ model.getLog = function () { if (res[0].code === 200 && res[1].code === 200) { model.log = res[1].body // model.prefix = res[1].prefix; - model.prefix = 'https://file.saas.dianwutong.com/' + model.prefix = 'https://cdyfile.saas.dianwutong.com/' model.handleData() model.log.pr = res[0].body return true diff --git a/dwt-edp/edp/src/js/report-project/app.js b/dwt-edp/edp/src/js/report-project/app.js index 11071c2..3d015ae 100644 --- a/dwt-edp/edp/src/js/report-project/app.js +++ b/dwt-edp/edp/src/js/report-project/app.js @@ -968,7 +968,7 @@ app.getProblemList = function () { model.getProblemList().subscribe(res => { if (res && res.code == 200) { this.problemList = res.body - this.prefix = 'https://file.saas.dianwutong.com/' + this.prefix = 'https://cdyfile.saas.dianwutong.com/' this.renderProblemList() } diff --git a/dwt-edp/edp/src/js/report-project1/app.js b/dwt-edp/edp/src/js/report-project1/app.js index ea66904..6e5da11 100644 --- a/dwt-edp/edp/src/js/report-project1/app.js +++ b/dwt-edp/edp/src/js/report-project1/app.js @@ -534,7 +534,7 @@ app.getProblemList = function () { model.getProblemList().subscribe(res => { if (res && res.code == 200) { this.problemList = res.body - this.prefix = 'https://file.saas.dianwutong.com/' + this.prefix = 'https://cdyfile.saas.dianwutong.com/' this.renderProblemList() } diff --git a/dwt-edp/edp/src/js/report/app.js b/dwt-edp/edp/src/js/report/app.js index 71c9c09..510657d 100644 --- a/dwt-edp/edp/src/js/report/app.js +++ b/dwt-edp/edp/src/js/report/app.js @@ -214,7 +214,7 @@ app.bind = function () { if (res) { var a = $('    ') var report = reportModel.report - var url = 'https://file.saas.dianwutong.com/' + report.fileUrl + var url = 'https://cdyfile.saas.dianwutong.com/' + report.fileUrl // 将导出报表前端设置去掉，后端设置 // var dateRange = $("#date-range").val().replace('至', '-'); // var name = '统计报表(' + dateRange + ').xls'; diff --git a/dwt-edp/edp/src/js/suggest/app.js b/dwt-edp/edp/src/js/suggest/app.js index 29b1faf..364c052 100644 --- a/dwt-edp/edp/src/js/suggest/app.js +++ b/dwt-edp/edp/src/js/suggest/app.js @@ -129,7 +129,7 @@ app.getSuggestDetail = function () { Model.getSuggestDetail() .then(function (res) { Model.data = res.entity - Model.prefix = 'https://file.saas.dianwutong.com/' //前缀 + Model.prefix = 'https://cdyfile.saas.dianwutong.com/' //前缀 app.renderDetail() }) .catch(function () { diff --git a/dwt-edp/edp/src/js/suggests/app.js b/dwt-edp/edp/src/js/suggests/app.js index bac6475..6846afe 100644 --- a/dwt-edp/edp/src/js/suggests/app.js +++ b/dwt-edp/edp/src/js/suggests/app.js @@ -112,7 +112,7 @@ app.bind = function () { } Common.uploadFile(file, UPLOAD.FROM_SUGGEST, 2).subscribe(function (res) { if (res.code == '0') { - var path = 'https://file.saas.dianwutong.com/' + res.resultPath + var path = 'https://cdyfile.saas.dianwutong.com/' + res.resultPath app.pics.push(res.resultPath) var domImg = `` $('.viewer').append(domImg) @@ -279,7 +279,7 @@ app.render = function (res) { this.pagination.update(totalPage, page) let list = res.pageResult.records - Model.prefix = 'https://file.saas.dianwutong.com/' //前缀 + Model.prefix = 'https://cdyfile.saas.dianwutong.com/' //前缀 if (!list || list.length == 0) { Common.emptyTips('list', '搜索不到反馈记录') } else { diff --git a/dwt-edp/edp/src/js/system-order/app.js b/dwt-edp/edp/src/js/system-order/app.js index ee9fab6..f25f26c 100644 --- a/dwt-edp/edp/src/js/system-order/app.js +++ b/dwt-edp/edp/src/js/system-order/app.js @@ -85,7 +85,7 @@ app.getOrderDetail = function () { var dom = '' for (var i = 0; i < photosUrl.length; i++) { - let src = 'https://file.saas.dianwutong.com/' + photosUrl[i] + let src = 'https://cdyfile.saas.dianwutong.com/' + photosUrl[i] dom = '' dom += '
    ' dom += '' @@ -114,7 +114,7 @@ app.getOrderDetail = function () { var dom = '' for (var i = 0; i < photosUrl.length; i++) { - let src = 'https://file.saas.dianwutong.com/' + photosUrl[i] + let src = 'https://cdyfile.saas.dianwutong.com/' + photosUrl[i] dom = '' dom += '
    ' dom += '' diff --git a/dwt-edp/edp/src/js/time-energy/app.js b/dwt-edp/edp/src/js/time-energy/app.js index 444dab0..61b7b8b 100644 --- a/dwt-edp/edp/src/js/time-energy/app.js +++ b/dwt-edp/edp/src/js/time-energy/app.js @@ -134,7 +134,7 @@ app.bind = function () { if (res) { var a = $('') var report = model.report - var url = 'https://file.saas.dianwutong.com/' + report.fileUrl + var url = 'https://cdyfile.saas.dianwutong.com/' + report.fileUrl a.attr("download", name) a.attr('href', url) $("body").append(a[0]) diff --git a/dwt-edp/edp/src/js/utils/http.util.js b/dwt-edp/edp/src/js/utils/http.util.js index 962195a..639890a 100644 --- a/dwt-edp/edp/src/js/utils/http.util.js +++ b/dwt-edp/edp/src/js/utils/http.util.js @@ -5,7 +5,7 @@ import { cookie } from '../utils/cookie.util' import { UI } from '../common/ui' // const basePath = 'https://api.dianwutong.com' -const basePath = 'https://api.saas.dianwutong.com' +const basePath = 'https://cdyapi.saas.dianwutong.com' const http = {} let hasAlert = false // 标识是否token失效弹框 diff --git a/dwt-edp/edp/src/js/work-ticket/app.js b/dwt-edp/edp/src/js/work-ticket/app.js index 9e32aee..f6b3d31 100644 --- a/dwt-edp/edp/src/js/work-ticket/app.js +++ b/dwt-edp/edp/src/js/work-ticket/app.js @@ -38,7 +38,7 @@ app.getTicket = function () { }).subscribe(function (res) { if (res.code === 200) { app.ticket = res.body - app.prefix = 'https://file.saas.dianwutong.com/' + app.prefix = 'https://cdyfile.saas.dianwutong.com/' app.renderTicket() } else { diff --git a/dwt-edp/edp/src/view/inspection-logs.html b/dwt-edp/edp/src/view/inspection-logs.html index 17bcc50..9c17b8b 100644 --- a/dwt-edp/edp/src/view/inspection-logs.html +++ b/dwt-edp/edp/src/view/inspection-logs.html @@ -16,11 +16,11 @@
    -
    +
    diff --git a/dwt-ems/ems/releaseHandlePlugin.js b/dwt-ems/ems/releaseHandlePlugin.js index 7bd692c..69a32b6 100644 --- a/dwt-ems/ems/releaseHandlePlugin.js +++ b/dwt-ems/ems/releaseHandlePlugin.js @@ -16,11 +16,11 @@ ReleaseHandlePlugin.prototype.apply = function (complier) { mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'edp.dianwutong.com') mod._source._value = mod._source._value.replace(/console.dianwutong.com(:\d+)?/g, 'console.dianwutong.com') } else if (this.env === 'production') { - mod._source._value = mod._source._value.replace(/api.dianwutong.com/g, 'api.saas.dianwutong.com') - mod._source._value = mod._source._value.replace(/account.dianwutong.com(:\d+)?/g, 'account.saas.dianwutong.com') - mod._source._value = mod._source._value.replace(/ems.dianwutong.com(:\d+)?/g, 'ems.saas.dianwutong.com') - mod._source._value = mod._source._value.replace(/console.dianwutong.com(:\d+)?/g, 'console.saas.dianwutong.com') - mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'edp.saas.dianwutong.com') + mod._source._value = mod._source._value.replace(/api.dianwutong.com/g, 'cdyapi.saas.dianwutong.com') + mod._source._value = mod._source._value.replace(/account.dianwutong.com(:\d+)?/g, 'cdyaccount.saas.dianwutong.com') + mod._source._value = mod._source._value.replace(/ems.dianwutong.com(:\d+)?/g, 'cdyems.saas.dianwutong.com') + mod._source._value = mod._source._value.replace(/console.dianwutong.com(:\d+)?/g, 'cdyconsole.saas.dianwutong.com') + mod._source._value = mod._source._value.replace(/edp.dianwutong.com(:\d+)?/g, 'cdyedp.saas.dianwutong.com') } console.log("替换成功") } catch (error) { diff --git a/dwt-ems/ems/src/js/common/power-room-common-controller.js b/dwt-ems/ems/src/js/common/power-room-common-controller.js index b295e5e..e42f1fe 100644 --- a/dwt-ems/ems/src/js/common/power-room-common-controller.js +++ b/dwt-ems/ems/src/js/common/power-room-common-controller.js @@ -38,7 +38,7 @@ app.initPowerRoomBaseInfo = function () { powerRoomModel.getPowerRoomBaseInfo().subscribe(function (res) { if (res.code === 200) { var pr = res.body - app.prefix = 'https://file.saas.dianwutong.com/' + app.prefix = 'https://cdyfile.saas.dianwutong.com/' $('.pr-name').text(pr.prName) $('#pr-address').text(pr.address) $('#customer-name').text(pr.cusName) diff --git a/dwt-ems/ems/src/js/compare-energy/app.js b/dwt-ems/ems/src/js/compare-energy/app.js index a92f605..4e82b3c 100644 --- a/dwt-ems/ems/src/js/compare-energy/app.js +++ b/dwt-ems/ems/src/js/compare-energy/app.js @@ -1,39 +1,39 @@ // 跳转到console点表页面 -require('../../scss/compare-energy.scss'); -require('../common/service/user.info.service'); -let $ = require('jquery'); -import { UI } from '../common/ui'; //ui -import { appUtil } from '../utils/app.util'; // 公共方法 -import { model } from './model'; -import { powerRoomCommonController } from '../common/power-room-common-controller'; -import { powerRoomModel } from '../common/power-room-model'; -import { TodoTasksService } from '../common/service/todo.tasks.service'; -import { from } from 'rxjs/observable/from'; -require('../common/power-room-common-controller'); -require('../common/layout-controller.js'); +require('../../scss/compare-energy.scss') +require('../common/service/user.info.service') +let $ = require('jquery') +import { UI } from '../common/ui' //ui +import { appUtil } from '../utils/app.util' // 公共方法 +import { model } from './model' +import { powerRoomCommonController } from '../common/power-room-common-controller' +import { powerRoomModel } from '../common/power-room-model' +import { TodoTasksService } from '../common/service/todo.tasks.service' +import { from } from 'rxjs/observable/from' +require('../common/power-room-common-controller') +require('../common/layout-controller.js') let app = { init: {} -}; +} $(function () { - app.init(); - TodoTasksService.start(); -}); + app.init() + TodoTasksService.start() +}) app.init = function () { // 为了便于展示点表信息，隐藏右侧配电室基本信息 - $('.base-info').hide(); + $('.base-info').hide() // 将左侧容器宽度设置为100% - $('.page').css('width', '100%'); + $('.page').css('width', '100%') - app.prId = appUtil.getParameter('id'); - app.setJumpFlag(); -}; + app.prId = appUtil.getParameter('id') + app.setJumpFlag() +} app.setJumpFlag = function () { - let iFrame = $('#compareEnergyIframe'); - iFrame.attr('src', 'https://edp.dianwutong.com/compare-energy.html?prid=' + app.prId); + let iFrame = $('#compareEnergyIframe') + iFrame.attr('src', 'https://cdyedp.saas.dianwutong.com/compare-energy.html?prid=' + app.prId) } \ No newline at end of file diff --git a/dwt-ems/ems/src/js/create-report/app.js b/dwt-ems/ems/src/js/create-report/app.js index e92918f..17d3659 100644 --- a/dwt-ems/ems/src/js/create-report/app.js +++ b/dwt-ems/ems/src/js/create-report/app.js @@ -1222,7 +1222,7 @@ app.getProblemList = function () { model.getProblemList().subscribe(res => { if (res && res.code == 200) { this.problemList = res.body - this.prefix = 'https://file.saas.dianwutong.com/' + this.prefix = 'https://cdyfile.saas.dianwutong.com/' this.renderProblemList() } diff --git a/dwt-ems/ems/src/js/inspection-bug/app.js b/dwt-ems/ems/src/js/inspection-bug/app.js index 9a8c357..0280381 100644 --- a/dwt-ems/ems/src/js/inspection-bug/app.js +++ b/dwt-ems/ems/src/js/inspection-bug/app.js @@ -137,7 +137,7 @@ app.renderPrInfo = function (prId) { powerRoomModel.getPowerRoomBaseInfo(prId).subscribe(res => { if (res.code === 200) { var pr = res.body - app.prefix = 'https://file.saas.dianwutong.com/' + app.prefix = 'https://cdyfile.saas.dianwutong.com/' $('.pr-name').text(pr.prName) $('#pr-address').text(pr.address) $('#customer-name').text(pr.cusName) diff --git a/dwt-ems/ems/src/js/inspection-bug/model.js b/dwt-ems/ems/src/js/inspection-bug/model.js index 34030d2..c86c98f 100644 --- a/dwt-ems/ems/src/js/inspection-bug/model.js +++ b/dwt-ems/ems/src/js/inspection-bug/model.js @@ -23,7 +23,7 @@ model.getBugById = function () { if (res.code === 200) { this.bugInfo = res.body // this.prefix = res.prefix; - this.prefix = 'https://file.saas.dianwutong.com/' + this.prefix = 'https://cdyfile.saas.dianwutong.com/' res.success = true return res } else { diff --git a/dwt-ems/ems/src/js/operation-order-detail/model.js b/dwt-ems/ems/src/js/operation-order-detail/model.js index f674f9b..49dcdbf 100644 --- a/dwt-ems/ems/src/js/operation-order-detail/model.js +++ b/dwt-ems/ems/src/js/operation-order-detail/model.js @@ -77,7 +77,7 @@ model.getOrder = function (id) { if (res.code === 200) { model.order = res.body model.logs = model.order.logs - model.prefix = 'https://file.saas.dianwutong.com/' + model.prefix = 'https://cdyfile.saas.dianwutong.com/' model.handleOrder() return true } else { diff --git a/dwt-ems/ems/src/js/order-detail/app.js b/dwt-ems/ems/src/js/order-detail/app.js index cfed151..859cb62 100644 --- a/dwt-ems/ems/src/js/order-detail/app.js +++ b/dwt-ems/ems/src/js/order-detail/app.js @@ -405,7 +405,7 @@ app.disPowerRoomInfo = function (prId) { appModel.getPowerRoomById(prId).subscribe(function (res) { if (res.code === 200) { var pr = res.body - app.prefix = 'https://file.saas.dianwutong.com/' + app.prefix = 'https://cdyfile.saas.dianwutong.com/' $('.pr-name').text(pr.prName) $('#pr-address').text(pr.province + ' ' + pr.city + ' ' + (pr.area ? pr.area : '') + ' ' + pr.address) $('#customer-name').text(pr.cusName) diff --git a/dwt-ems/ems/src/js/order-detail/model.js b/dwt-ems/ems/src/js/order-detail/model.js index ece99bc..a9a1d83 100644 --- a/dwt-ems/ems/src/js/order-detail/model.js +++ b/dwt-ems/ems/src/js/order-detail/model.js @@ -42,7 +42,7 @@ model.getRepairOrderBaseInfo = function () { if (res.code === 200) { // model.prefix = res.prefix; - model.prefix = 'https://file.saas.dianwutong.com/' + model.prefix = 'https://cdyfile.saas.dianwutong.com/' let order = res.body // 过滤出查勘任务和抢修任务 diff --git a/dwt-ems/ems/src/js/pr-inspection-log/model.js b/dwt-ems/ems/src/js/pr-inspection-log/model.js index 2cb639d..952d6e5 100644 --- a/dwt-ems/ems/src/js/pr-inspection-log/model.js +++ b/dwt-ems/ems/src/js/pr-inspection-log/model.js @@ -1,4 +1,4 @@ -import { http } from "../utils/http.util"; +import { http } from "../utils/http.util" let model = { prId: null, @@ -9,20 +9,36 @@ let model = { getPrInspectionLogs: {}, } -model.getPrInspectionLogs = function(){ +model.getPrInspectionLogs = function () { - let param = { - prId: this.prId, - page: this.page, - pageSize: this.pageSize, - startDate: this.startDate, - endDate: this.endDate + // let param = { + // prId: this.prId, + // page: this.page, + // pageSize: this.pageSize, + // startDate: this.startDate, + // endDate: this.endDate + // } + + // !param.startDate && delete param.startDate; + // !param.endDate && delete param.endDate; + + // return http.get('/ems/rest/common/xj/log/page', param); + let url = '/test/xun-jian-pr/query/' + + this.page + '/' + + this.pageSize + '/' + + this.prId + + let data = {} + + if (this.startDate) { + data.startDate = this.startDate } - !param.startDate && delete param.startDate; - !param.endDate && delete param.endDate; + if (this.endDate) { + data.endDate = this.endDate + } - return http.get('/ems/rest/common/xj/log/page', param); + return http.get(url, data) } -exports.model = model; \ No newline at end of file +exports.model = model \ No newline at end of file diff --git a/dwt-ems/ems/src/js/pr-material/app.js b/dwt-ems/ems/src/js/pr-material/app.js index d890d92..1ff7817 100644 --- a/dwt-ems/ems/src/js/pr-material/app.js +++ b/dwt-ems/ems/src/js/pr-material/app.js @@ -121,7 +121,7 @@ app.initPowerRoomFileList = function () { if (res.code === 200) { let container = $("#power-room-metarial") - this.fileBaseUrl = 'https://file.saas.dianwutong.com/' + this.fileBaseUrl = 'https://cdyfile.saas.dianwutong.com/' let files = res.body let length = files.length diff --git a/dwt-ems/ems/src/js/pr-table-setting/app.js b/dwt-ems/ems/src/js/pr-table-setting/app.js index e1a2040..3b8fcd5 100644 --- a/dwt-ems/ems/src/js/pr-table-setting/app.js +++ b/dwt-ems/ems/src/js/pr-table-setting/app.js @@ -1,47 +1,47 @@ // 跳转到console点表页面 -require('../../scss/pr-table-setting.scss'); -require('../common/service/user.info.service'); -let $ = require('jquery'); -import { UI } from '../common/ui'; //ui -import { appUtil } from '../utils/app.util'; // 公共方法 -import { model } from './model'; -import { powerRoomCommonController } from '../common/power-room-common-controller'; -import { powerRoomModel } from '../common/power-room-model'; -import { TodoTasksService } from '../common/service/todo.tasks.service'; -import { from } from 'rxjs/observable/from'; -require('../common/layout-controller.js'); +require('../../scss/pr-table-setting.scss') +require('../common/service/user.info.service') +let $ = require('jquery') +import { UI } from '../common/ui' //ui +import { appUtil } from '../utils/app.util' // 公共方法 +import { model } from './model' +import { powerRoomCommonController } from '../common/power-room-common-controller' +import { powerRoomModel } from '../common/power-room-model' +import { TodoTasksService } from '../common/service/todo.tasks.service' +import { from } from 'rxjs/observable/from' +require('../common/layout-controller.js') let app = { init: {} -}; +} $(function () { - app.init(); -}); + app.init() +}) app.init = function () { // 为了便于展示点表信息，隐藏右侧配电室基本信息 - $('.base-info').hide(); + $('.base-info').hide() // 将左侧容器宽度设置为100% - $('.page').css('width', '100%'); + $('.page').css('width', '100%') // 将顶部header "点表配置按钮" 激活 - $('#prTableSetting').addClass('active'); + $('#prTableSetting').addClass('active') - app.prId = appUtil.getParameter('id'); - app.setJumpFlag(); -}; + app.prId = appUtil.getParameter('id') + app.setJumpFlag() +} app.setJumpFlag = function () { - UI.showProgress(); + UI.showProgress() model.setJumpFlag(app.prId).subscribe(res => { - UI.hideProgress(); + UI.hideProgress() if (res.code == 200) { - let iFrame = $('#frameSrc'); - iFrame.attr('src', 'https://console.dianwutong.com:4200'); + let iFrame = $('#frameSrc') + iFrame.attr('src', 'https://cdyconsole.saas.dianwutong.com') } }) } \ No newline at end of file diff --git a/dwt-ems/ems/src/js/real-time-data-new/app.js b/dwt-ems/ems/src/js/real-time-data-new/app.js index 72d1de7..795f091 100644 --- a/dwt-ems/ems/src/js/real-time-data-new/app.js +++ b/dwt-ems/ems/src/js/real-time-data-new/app.js @@ -311,7 +311,7 @@ app.initRTDSocket = function (param) { // this.getRealData(param); // } // }); - model.websocketAddress = 'wss://api.saas.dianwutong.com/mqtt/websocket' + model.websocketAddress = 'wss://cdyapi.saas.dianwutong.com/mqtt/websocket' this.getRealData(param) } else { this.getRealData(param) diff --git a/dwt-ems/ems/src/js/real-time-data/app.js b/dwt-ems/ems/src/js/real-time-data/app.js index 61cbfea..06fb5b5 100644 --- a/dwt-ems/ems/src/js/real-time-data/app.js +++ b/dwt-ems/ems/src/js/real-time-data/app.js @@ -314,7 +314,7 @@ app.initRTDSocket = function (param) { if (!app.socket) { // add start 2023/9/7 if (app.isMqttPr) { - model.websocketAddress = 'wss://api.saas.dianwutong.com/mqtt/websocket' + model.websocketAddress = 'wss://cdyapi.saas.dianwutong.com/mqtt/websocket' this.getRealData(param) return diff --git a/dwt-ems/ems/src/js/report-project/app.js b/dwt-ems/ems/src/js/report-project/app.js index 470b107..186c0ab 100644 --- a/dwt-ems/ems/src/js/report-project/app.js +++ b/dwt-ems/ems/src/js/report-project/app.js @@ -588,7 +588,7 @@ app.getProblemList = function () { model.getProblemList().subscribe(res => { if (res && res.code == 200) { this.problemList = res.body - this.prefix = 'https://file.saas.dianwutong.com/' + this.prefix = 'https://cdyfile.saas.dianwutong.com/' this.renderProblemList() } diff --git a/dwt-ems/ems/src/js/report/app.js b/dwt-ems/ems/src/js/report/app.js index ce54c81..5714370 100644 --- a/dwt-ems/ems/src/js/report/app.js +++ b/dwt-ems/ems/src/js/report/app.js @@ -1,39 +1,39 @@ // 跳转到console点表页面 -require('../../scss/report.scss'); -require('../common/service/user.info.service'); -let $ = require('jquery'); -import { UI } from '../common/ui'; //ui -import { appUtil } from '../utils/app.util'; // 公共方法 -import { model } from './model'; -import { powerRoomCommonController } from '../common/power-room-common-controller'; -import { powerRoomModel } from '../common/power-room-model'; -import { TodoTasksService } from '../common/service/todo.tasks.service'; -import { from } from 'rxjs/observable/from'; -require('../common/layout-controller.js'); +require('../../scss/report.scss') +require('../common/service/user.info.service') +let $ = require('jquery') +import { UI } from '../common/ui' //ui +import { appUtil } from '../utils/app.util' // 公共方法 +import { model } from './model' +import { powerRoomCommonController } from '../common/power-room-common-controller' +import { powerRoomModel } from '../common/power-room-model' +import { TodoTasksService } from '../common/service/todo.tasks.service' +import { from } from 'rxjs/observable/from' +require('../common/layout-controller.js') let app = { init: {} -}; +} $(function () { - app.init(); - TodoTasksService.start(); -}); + app.init() + TodoTasksService.start() +}) app.init = function () { // 为了便于展示点表信息，隐藏右侧配电室基本信息 - $('.base-info').hide(); + $('.base-info').hide() // 将左侧容器宽度设置为100% - $('.page').css('width', '100%'); + $('.page').css('width', '100%') - app.prId = appUtil.getParameter('id'); - app.shortName = appUtil.getParameter('shortname'); - app.setJumpFlag(); -}; + app.prId = appUtil.getParameter('id') + app.shortName = appUtil.getParameter('shortname') + app.setJumpFlag() +} app.setJumpFlag = function () { - let iFrame = $('#reportIframe'); - iFrame.attr('src', 'https://edp.dianwutong.com/report.html?prid=' + app.prId + '&shortname=' + app.shortName); + let iFrame = $('#reportIframe') + iFrame.attr('src', 'https://cdyedp.saas.dianwutong.com/report.html?prid=' + app.prId + '&shortname=' + app.shortName) } \ No newline at end of file diff --git a/dwt-ems/ems/src/js/system-order/app.js b/dwt-ems/ems/src/js/system-order/app.js index 44d4cd5..b81b7a4 100644 --- a/dwt-ems/ems/src/js/system-order/app.js +++ b/dwt-ems/ems/src/js/system-order/app.js @@ -117,7 +117,7 @@ app.getOrderDetail = function () { var dom = '' for (var i = 0; i < photosUrl.length; i++) { - let src = 'https://file.saas.dianwutong.com/' + photosUrl[i] + let src = 'https://cdyfile.saas.dianwutong.com/' + photosUrl[i] dom = '' dom += '
    ' dom += '' @@ -146,7 +146,7 @@ app.getOrderDetail = function () { var dom = '' for (var i = 0; i < photosUrl.length; i++) { - let src = 'https://file.saas.dianwutong.com/' + photosUrl[i] + let src = 'https://cdyfile.saas.dianwutong.com/' + photosUrl[i] dom = '' dom += '
    ' dom += '' diff --git a/dwt-ems/ems/src/js/system-warning/app.js b/dwt-ems/ems/src/js/system-warning/app.js index f613a44..2c0c27a 100644 --- a/dwt-ems/ems/src/js/system-warning/app.js +++ b/dwt-ems/ems/src/js/system-warning/app.js @@ -247,7 +247,7 @@ ctrl.bind = function () { UI.hideProgress() if (res.code == 200) { var a = $('') - var url = 'https://file.saas.dianwutong.com/' + res.body.fileUrl + var url = 'https://cdyfile.saas.dianwutong.com/' + res.body.fileUrl a.attr('download', '报警记录' + '.xls') a.attr('href', url) $('body').append(a[0]) diff --git a/dwt-ems/ems/src/js/time-energy/app.js b/dwt-ems/ems/src/js/time-energy/app.js index db85434..0f79c56 100644 --- a/dwt-ems/ems/src/js/time-energy/app.js +++ b/dwt-ems/ems/src/js/time-energy/app.js @@ -1,38 +1,38 @@ // 跳转到console点表页面 -require('../../scss/time-energy.scss'); -require('../common/service/user.info.service'); -let $ = require('jquery'); -import { UI } from '../common/ui'; //ui -import { appUtil } from '../utils/app.util'; // 公共方法 -import { model } from './model'; -import { powerRoomCommonController } from '../common/power-room-common-controller'; -import { powerRoomModel } from '../common/power-room-model'; -import { TodoTasksService } from '../common/service/todo.tasks.service'; -import { from } from 'rxjs/observable/from'; -require('../common/layout-controller.js'); +require('../../scss/time-energy.scss') +require('../common/service/user.info.service') +let $ = require('jquery') +import { UI } from '../common/ui' //ui +import { appUtil } from '../utils/app.util' // 公共方法 +import { model } from './model' +import { powerRoomCommonController } from '../common/power-room-common-controller' +import { powerRoomModel } from '../common/power-room-model' +import { TodoTasksService } from '../common/service/todo.tasks.service' +import { from } from 'rxjs/observable/from' +require('../common/layout-controller.js') let app = { init: {} -}; +} $(function () { - app.init(); - TodoTasksService.start(); -}); + app.init() + TodoTasksService.start() +}) app.init = function () { // 为了便于展示点表信息，隐藏右侧配电室基本信息 - $('.base-info').hide(); + $('.base-info').hide() // 将左侧容器宽度设置为100% - $('.page').css('width', '100%'); + $('.page').css('width', '100%') - app.prId = appUtil.getParameter('id'); - app.setJumpFlag(); -}; + app.prId = appUtil.getParameter('id') + app.setJumpFlag() +} app.setJumpFlag = function () { - let iFrame = $('#timeEnergyIframe'); - iFrame.attr('src', 'https://edp.dianwutong.com/time-energy.html?prid=' + app.prId); + let iFrame = $('#timeEnergyIframe') + iFrame.attr('src', 'https://cdyedp.saas.dianwutong.com/time-energy.html?prid=' + app.prId) } \ No newline at end of file diff --git a/dwt-ems/ems/src/js/utils/http.util.js b/dwt-ems/ems/src/js/utils/http.util.js index a79b9bf..f3b6b5d 100644 --- a/dwt-ems/ems/src/js/utils/http.util.js +++ b/dwt-ems/ems/src/js/utils/http.util.js @@ -3,7 +3,7 @@ import { Rx } from 'rxjs' import { cookie } from '../utils/cookie.util' // const basePath = 'https://api.dianwutong.com' -const basePath = 'https://api.saas.dianwutong.com' +const basePath = 'https://cdyapi.saas.dianwutong.com' const http = {} diff --git a/dwt-ems/ems/src/js/work-order-detail/model.js b/dwt-ems/ems/src/js/work-order-detail/model.js index a983e74..7ecf2e5 100644 --- a/dwt-ems/ems/src/js/work-order-detail/model.js +++ b/dwt-ems/ems/src/js/work-order-detail/model.js @@ -76,7 +76,7 @@ model.getOrder = function (id) { if (res.code === 200) { model.order = res.body model.logs = model.order.logs - model.prefix = 'https://file.saas.dianwutong.com/' + model.prefix = 'https://cdyfile.saas.dianwutong.com/' model.handleOrder() return true } else { diff --git a/dwt-ems/ems/src/view/add-device.html b/dwt-ems/ems/src/view/add-device.html index 8a6ea7b..e1efac1 100644 --- a/dwt-ems/ems/src/view/add-device.html +++ b/dwt-ems/ems/src/view/add-device.html @@ -172,7 +172,7 @@
    -
    diff --git a/dwt-ems/ems/src/view/common/layout.html b/dwt-ems/ems/src/view/common/layout.html index 16d3876..68d6b5c 100644 --- a/dwt-ems/ems/src/view/common/layout.html +++ b/dwt-ems/ems/src/view/common/layout.html @@ -12,9 +12,9 @@ - + - + @@ -23,7 +23,7 @@
    @@ -143,7 +143,7 @@
    -
    + -
    + -
    + @@ -219,17 +219,17 @@
    -
    + -
    + - + @@ -23,7 +23,7 @@
    @@ -140,7 +140,7 @@
    -
    + -
    + -
    +
    @@ -217,16 +217,16 @@
    --> -
    + -
    + - 报表配置 - 预报警推送设置 + + 点表设置
    - \ No newline at end of file + \ No newline at end of file diff --git a/dwt-ems/ems/src/view/device-book.html b/dwt-ems/ems/src/view/device-book.html index d157c6e..a2215f0 100644 --- a/dwt-ems/ems/src/view/device-book.html +++ b/dwt-ems/ems/src/view/device-book.html @@ -62,4 +62,4 @@
    - \ No newline at end of file + \ No newline at end of file diff --git a/dwt-ems/ems/src/view/inspection-arrange-list.html b/dwt-ems/ems/src/view/inspection-arrange-list.html index 40a10da..6c6e224 100644 --- a/dwt-ems/ems/src/view/inspection-arrange-list.html +++ b/dwt-ems/ems/src/view/inspection-arrange-list.html @@ -19,10 +19,10 @@
    -
    +
    diff --git a/dwt-ems/ems/src/view/inspection-log-list.html b/dwt-ems/ems/src/view/inspection-log-list.html index 6ffbd68..ec53694 100644 --- a/dwt-ems/ems/src/view/inspection-log-list.html +++ b/dwt-ems/ems/src/view/inspection-log-list.html @@ -1,10 +1,10 @@
    -
    +
    diff --git a/dwt-ems/ems/src/view/interviewer-detail.html b/dwt-ems/ems/src/view/interviewer-detail.html index e8f0f9d..d66416f 100644 --- a/dwt-ems/ems/src/view/interviewer-detail.html +++ b/dwt-ems/ems/src/view/interviewer-detail.html @@ -32,12 +32,12 @@
  • 电工证信息
    - +
  • 实名认证
    - - + +
    • -->
    diff --git a/dwt-ems/ems/src/view/login.html b/dwt-ems/ems/src/view/login.html index 21f7eb4..a8cec44 100644 --- a/dwt-ems/ems/src/view/login.html +++ b/dwt-ems/ems/src/view/login.html @@ -31,7 +31,7 @@

    引入laydate

     		// 指定动态加载css的基地址
-		laydate.path = 'https://cdn.saas.dianwutong.com/vendor/laydate/';
+		laydate.path = 'https://cdycdn.saas.dianwutong.com/vendor/laydate/';
 		laydate.render({
 			elem: '#date',
 			type: 'date',
diff --git a/dwt-ems/ems/src/view/map.html b/dwt-ems/ems/src/view/map.html
index 7fc85f1..81d5de4 100644
--- a/dwt-ems/ems/src/view/map.html
+++ b/dwt-ems/ems/src/view/map.html
@@ -25,13 +25,13 @@
 
 
 	
-	
-	
+	
+	
 	
 	
-	
-	
+	
+	
 
 
 
diff --git a/dwt-ems/ems/src/view/operation-order-detail.html b/dwt-ems/ems/src/view/operation-order-detail.html
index 3fbf4a3..7d72466 100644
--- a/dwt-ems/ems/src/view/operation-order-detail.html
+++ b/dwt-ems/ems/src/view/operation-order-detail.html
@@ -69,4 +69,4 @@
    - \ No newline at end of file + \ No newline at end of file diff --git a/dwt-ems/ems/src/view/privilege-error.html b/dwt-ems/ems/src/view/privilege-error.html index 762cb13..17d06e3 100644 --- a/dwt-ems/ems/src/view/privilege-error.html +++ b/dwt-ems/ems/src/view/privilege-error.html @@ -11,7 +11,7 @@ - + @@ -38,7 +38,7 @@
    - +
    你没有权限访问该页面！
    diff --git a/dwt-ems/ems/src/view/report-project.html b/dwt-ems/ems/src/view/report-project.html index ce889cc..dc6ea55 100644 --- a/dwt-ems/ems/src/view/report-project.html +++ b/dwt-ems/ems/src/view/report-project.html @@ -276,4 +276,4 @@
    - \ No newline at end of file + \ No newline at end of file diff --git a/dwt-ems/ems/src/view/run-log-detail.html b/dwt-ems/ems/src/view/run-log-detail.html index 8bde918..cd94f62 100644 --- a/dwt-ems/ems/src/view/run-log-detail.html +++ b/dwt-ems/ems/src/view/run-log-detail.html @@ -74,4 +74,4 @@
    - \ No newline at end of file + \ No newline at end of file diff --git a/dwt-ems/ems/src/view/work-order-detail.html b/dwt-ems/ems/src/view/work-order-detail.html index ff9fd32..f6d5894 100644 --- a/dwt-ems/ems/src/view/work-order-detail.html +++ b/dwt-ems/ems/src/view/work-order-detail.html @@ -68,4 +68,4 @@
    - \ No newline at end of file + \ No newline at end of file diff --git a/dwt-terminal/terminal/src/js/board/index.js b/dwt-terminal/terminal/src/js/board/index.js index 2871ce2..f4079f1 100644 --- a/dwt-terminal/terminal/src/js/board/index.js +++ b/dwt-terminal/terminal/src/js/board/index.js @@ -31,7 +31,7 @@ import { model } from './model' (function () { let iFrame = $('#alarmList') - iFrame.attr('src', 'https://terminal.saas.dianwutong.com/warning-list.html') + iFrame.attr('src', 'https://cdycdyterminal.saas.dianwutong.com/warning-list.html') // tab切换事件委托 // $('.monitor').on('click', ' a', function () { diff --git a/dwt-terminal/terminal/src/js/lib/http.util.js b/dwt-terminal/terminal/src/js/lib/http.util.js index bfad819..526b727 100644 --- a/dwt-terminal/terminal/src/js/lib/http.util.js +++ b/dwt-terminal/terminal/src/js/lib/http.util.js @@ -3,7 +3,7 @@ import { cookie } from './cookie.util' // const basePath = 'https://192.168.0.109:8280/dwt-ems-web/'; //const basePath = 'https://api.dianwutong.com'; -const basePath = 'https://api.saas.dianwutong.com' +const basePath = 'https://cdyapi.saas.dianwutong.com' const http = {} diff --git a/dwt-terminal/terminal/src/js/map/map.slaver.js b/dwt-terminal/terminal/src/js/map/map.slaver.js index dff24b0..806e62e 100644 --- a/dwt-terminal/terminal/src/js/map/map.slaver.js +++ b/dwt-terminal/terminal/src/js/map/map.slaver.js @@ -258,7 +258,7 @@ ctrl.viewDiagram = function (prId) { $('#view-diagram-panel').html('正在加载画面...') setTimeout(function () { var ax = new ActiveXObject('WEBVIEWX.WebViewXCtrl.1') - $('#view-diagram-panel').html(' ') + $('#view-diagram-panel').html(' ') webX.browserLang = navigator.browserLanguage webX.SrvName = address webX.SrvParam = 'user=,password=' @@ -274,7 +274,7 @@ ctrl.viewDiagram = function (prId) { }, 1000) } catch (e) { - $('#view-diagram-panel').html('您尚未安装控件，请下载安装') + $('#view-diagram-panel').html('您尚未安装控件，请下载安装') } } else { console.log('显示一次接线图前 查询配电室信息 发生错误') @@ -300,7 +300,7 @@ ctrl.initNewDiagram = function (prId) { if (res && res.code == 200) { if (res.body.length && res.body.length > 0) { let circuitId = res.body[0]['circuitId'] - $('#diagram-panel-frame').attr('src', `https://circuit.saas.dianwutong.com/run.html?circuitId=${circuitId}&prId=${prId}&flag=1`) + $('#diagram-panel-frame').attr('src', `https://cdycircuit.saas.dianwutong.com/run.html?circuitId=${circuitId}&prId=${prId}&flag=1`) } else { UI.alert({ 'content': '当前配电室没有一次接线图信息', diff --git a/dwt-terminal/terminal/src/js/single-map/app.js b/dwt-terminal/terminal/src/js/single-map/app.js index a6ab322..b306cc2 100644 --- a/dwt-terminal/terminal/src/js/single-map/app.js +++ b/dwt-terminal/terminal/src/js/single-map/app.js @@ -431,7 +431,7 @@ ctrl.viewDiagram = function (prId) { setTimeout(function () { try { var ax = new ActiveXObject('WEBVIEWX.WebViewXCtrl.1') - $('#diagram-panel-body').html(' ') + $('#diagram-panel-body').html(' ') webX.browserLang = navigator.browserLanguage webX.SrvName = address webX.SrvParam = 'user=,password=' @@ -445,7 +445,7 @@ ctrl.viewDiagram = function (prId) { webX.OcxBackColor = 16776187 webX.AutoLogoffIdleMinute = 0 } catch (e) { - $('#view-diagram-panel').html('您尚未安装控件，请下载安装') + $('#view-diagram-panel').html('您尚未安装控件，请下载安装') } }, 1000) @@ -492,7 +492,7 @@ ctrl.initNewDiagram = function (prId) { if (res && res.code == 200) { if (res.body.length && res.body.length > 0) { let circuitId = res.body[0]['circuitId'] - $('#diagram-panel-frame').attr('src', `https://circuit.saas.dianwutong.com/run.html?circuitId=${circuitId}&prId=${prId}&flag=1`) + $('#diagram-panel-frame').attr('src', `https://cdycircuit.saas.dianwutong.com/run.html?circuitId=${circuitId}&prId=${prId}&flag=1`) } else { UI.alert({ 'content': '当前配电室没有一次接线图信息', diff --git a/dwt-terminal/terminal/src/js/weather/app.js b/dwt-terminal/terminal/src/js/weather/app.js index 7633cd3..890e0bc 100644 --- a/dwt-terminal/terminal/src/js/weather/app.js +++ b/dwt-terminal/terminal/src/js/weather/app.js @@ -135,7 +135,7 @@ import { cookie } from '../lib/cookie.util'; temperature = res.now.temp wind = res.now.wind_dir + res.now.wind_class humidity = res.now.rh + '%' // 相对湿度 - let weatherImg = "https://cdn.saas.dianwutong.com/terminal/images/" + weatherImgMap[weatherType] + let weatherImg = "https://cdycdn.saas.dianwutong.com/terminal/images/" + weatherImgMap[weatherType] if (!weatherImgMap[weatherType]) { var now = new Date() @@ -161,7 +161,7 @@ import { cookie } from '../lib/cookie.util'; // // wind = res.results[0].weather_data[0].wind; // // pm25 = res.results[0].pm25; - // let weatherImg = "https://cdn.saas.dianwutong.com/terminal/images/"+ weatherImgMap[weatherType]; + // let weatherImg = "https://cdycdn.saas.dianwutong.com/terminal/images/"+ weatherImgMap[weatherType]; // if(!weatherImgMap[weatherType]){ // var now = new Date(); diff --git a/dwt-terminal/terminal/src/resource/ezuikit/ezuikit.js b/dwt-terminal/terminal/src/resource/ezuikit/ezuikit.js index d1fc4ad..b7179c5 100644 --- a/dwt-terminal/terminal/src/resource/ezuikit/ezuikit.js +++ b/dwt-terminal/terminal/src/resource/ezuikit/ezuikit.js @@ -47,7 +47,7 @@ } - var Domain = 'https://cdn.saas.dianwutong.com/vendor/ezuikit/' + var Domain = 'https://cdycdn.saas.dianwutong.com/vendor/ezuikit/' // var Domain = './'; var logDomain = 'https://log.ys7.com/statistics.do' diff --git a/dwt-terminal/terminal/src/view/customer-statistic.html b/dwt-terminal/terminal/src/view/customer-statistic.html index 199c1b2..45173b5 100644 --- a/dwt-terminal/terminal/src/view/customer-statistic.html +++ b/dwt-terminal/terminal/src/view/customer-statistic.html @@ -8,7 +8,7 @@ - + diff --git a/dwt-terminal/terminal/src/view/frame.html b/dwt-terminal/terminal/src/view/frame.html index 8cc9f7c..62cf069 100644 --- a/dwt-terminal/terminal/src/view/frame.html +++ b/dwt-terminal/terminal/src/view/frame.html @@ -74,12 +74,12 @@
    或者   @@ -90,12 +90,12 @@
    或者   @@ -106,12 +106,12 @@
    或者   @@ -122,12 +122,12 @@
    或者   diff --git a/dwt-terminal/terminal/src/view/weather.html b/dwt-terminal/terminal/src/view/weather.html index 7731e22..6a45909 100644 --- a/dwt-terminal/terminal/src/view/weather.html +++ b/dwt-terminal/terminal/src/view/weather.html @@ -1,16 +1,18 @@ + - - - + + + + -
    +
    @@ -19,7 +21,7 @@
    -
    +
    @@ -28,23 +30,28 @@
    + --> +
    +
    -
    - 实时温度℃ -
    + --> +
    +
    + 实时温度℃ +
    相对湿度:
        + --> +
        +
    -
    + \ No newline at end of file