更新

2024-12-26 17:02:02 +08:00 · 2024-12-26 17:02:02 +08:00 · 608ec6e181
commit 608ec6e181
parent 94a63bbcaa
82 changed files with 340 additions and 323 deletions
--- 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 = {}

--- 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;

--- 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 @@
    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
    <meta http-equiv="Pragma" content="no-cache" />
    <meta http-equiv="Expires" content="0" />
-    <link rel="icon" type="image/x-icon" href="http://cdn.saas.dianwutong.com/common/img/favicon.ico">
+    <link rel="icon" type="image/x-icon" href="http://cdycdn.saas.dianwutong.com/common/img/favicon.ico">
    <title>修改密码</title>
 </head>

@ -16,7 +16,7 @@
    <div class="container">
        <div class="header">
            <div class="content">
-                <img src="http://cdn.saas.dianwutong.com/edp/img/bee.png">
+                <img src="http://cdycdn.saas.dianwutong.com/edp/img/bee.png">
                <span>找回密码</span>
            </div>
        </div>
--- a/dwt-account/webpack-account/src/view/login.html
+++ b/dwt-account/webpack-account/src/view/login.html
@ -8,7 +8,7 @@
    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
    <meta http-equiv="Pragma" content="no-cache" />
    <meta http-equiv="Expires" content="0" />
-    <link rel="icon" type="image/x-icon" href="http://cdn.saas.dianwutong.com/common/img/favicon.ico">
+    <link rel="icon" type="image/x-icon" href="http://cdycdn.saas.dianwutong.com/common/img/favicon.ico">
    <title>登录</title>

 </head>
@ -17,7 +17,7 @@

    <div class="header">
        <div class="container">
-            <img src="http://cdn.saas.dianwutong.com/common/img/logo.png" style="transform: scale(1.3)">
+            <img src="http://cdycdn.saas.dianwutong.com/common/img/logo.png" style="transform: scale(1.3)">
        </div>
    </div>
    <div class="body">
@ -68,20 +68,17 @@
            <div class="height21"></div>
            <div class="qr-code-con">
                <div class="qr-code">
-                    <div>电务通app下载</div>
-                    <img src="http://cdn.saas.dianwutong.com/common/img/dianwutong_app_download.png">
+                    <div>app下载</div>
+                    <img src="http://cdycdn.saas.dianwutong.com/common/img/dianwutong_app_download.png">
                </div>
-                <div class="qr-code">
+                <!-- <div class="qr-code">
                    <div>电务通官方微信</div>
-                    <!-- edit start 2018/11/22 14:24 kangzhi -->
-                    <!-- <img src="http://www.dianwutong.com/images/wechat_icon.png"> -->
-                    <img src="http://cdn.saas.dianwutong.com/common/img/wechat_icon.png">
-                    <!-- edit end 2018/11/22 14:24 kangzhi -->
+                    <img src="http://cdycdn.saas.dianwutong.com/common/img/wechat_icon.png">
                </div>
                <div class="qr-code">
                    <div>电务通官方抖音</div>
-                    <img src="http://cdn.saas.dianwutong.com/common/img/douyin.jpg">
-                </div>
+                    <img src="http://cdycdn.saas.dianwutong.com/common/img/douyin.jpg">
+                </div> -->
            </div>
        </div>
    </div>
--- 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,
--- 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
 }

--- 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'
  }
 }
--- 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 @@
                    <li (click)="navigate('table')" [class.active]="path == 'table'">点表设置</li>
                    <li (click)="navigate('tag')" [class.active]="path == 'tag'">标签设置</li>
                    <!-- Add start 2018/9/3 15:48 kangzhi -->
-                    <li (click)="navigate('pusher')" [class.active]="path == 'pusher'">预报警推送设置</li>
+                    <!-- <li (click)="navigate('pusher')" [class.active]="path == 'pusher'">预报警推送设置</li> -->
                    <!-- Add end 2018/9/3 15:48 kangzhi -->
-                    <li (click)="navigate('table-new')" [class.active]="path == 'table-new'">点表设置新版(测试中)</li>
+                    <!-- <li (click)="navigate('table-new')" [class.active]="path == 'table-new'">点表设置新版(测试中)</li> -->
                    <!-- -->
                </ul>
            </div>
--- 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 @@
                    <li (click)="navigate('table')" [class.active]="path == 'table'">点表设置</li>
                    <li (click)="navigate('tag')" [class.active]="path == 'tag'">标签设置</li>
                    <!-- Add start 2018/9/3 15:48 kangzhi -->
-                    <li (click)="navigate('pusher')" [class.active]="path == 'pusher'">预报警推送设置</li>
+                    <!-- <li (click)="navigate('pusher')" [class.active]="path == 'pusher'">预报警推送设置</li> -->
                    <!-- Add end 2018/9/3 15:48 kangzhi -->
                    <!-- <li (click)="navigate('table-new')" [class.active]="path == 'table-new'">点表设置新版(测试中)</li> -->
                    <!-- <li (click)="navigate('fuzailv')" [class.active]="path == 'fuzailv'">变压器负载率设置</li> -->
--- 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 @@
                    </div>
                </div>
                <div class="height15"></div>
-                <div class="row">
+                <!-- <div class="row">
                    <div class="col-md-3 text-right">
                        <div class="height5"></div>
                        短信通知：
@ -190,7 +190,7 @@
                    <div class="col-md-5 paddingL15">
                        <input type="number" class="form-control" placeholder="手机号" [(ngModel)]="tagData.phoneNum">
                    </div>
-                </div>
+                </div> -->
                <div class="height15"></div>
            </div>
            <div class="modal-footer">
--- 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
  }
--- 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 @@
                <ul>
                    <!-- <li [routerLink]="[/base/configList/configDetailSwitch, cid, 'configDetail']" routerLinkActive="active"  >旧版</li>
                        <li [routerLink]="[/base/configList/configDetailSwitch, cid, 'configDetailNew']" routerLinkActive="active"  >新版</li> -->
-                    <li (click)="navigate('configDetail')" [ngClass]="{active: path == 'configDetail'}">旧版</li>
+                    <!-- <li (click)="navigate('configDetail')" [ngClass]="{active: path == 'configDetail'}">旧版</li> -->
                    <li (click)="navigate('mqttConfig')" [ngClass]="{active: path == 'mqttConfig'}">MQTT管理</li>
                    <li (click)="navigate('tagConfig')" [ngClass]="{active: path == 'tagConfig'}">点表管理</li>
                    <!-- <li (click)="navigate('gatwayConfig')" [ngClass]="{active: path == 'gatwayConfig'}">网关管理(测试中)</li> -->
--- a/dwt-console/src/app/main/base/service_config/html/config_list.html
+++ b/dwt-console/src/app/main/base/service_config/html/config_list.html
@ -34,7 +34,7 @@
                                {{serverConfig.useStatus == 1? '使用中':'已饱和'}}</td>
                            <td class="text-center">{{serverConfig.prCount}}</td>
                            <td class="color-yellow pointer text-center"
-                                (click)="navigate('configDetailSwitch',serverConfig['configId'])">详情</td>
+                                (click)="navigate('mqttConfig',serverConfig['configId'])">详情</td>
                        </tr>

                    </tbody>
--- a/dwt-console/src/app/main/base/staff/html/role.selector.html
+++ b/dwt-console/src/app/main/base/staff/html/role.selector.html
@ -3,20 +3,16 @@
    <i class="checkbox" (click)="toggle($event)" [ngClass]="{'checked': role.selected, 'disabled': disabled}"></i>
    <span>{{role.roleName}}</span>
  </div><!-- 组团长，巡检组长，抢修组长 运营中心监控员 工作站绑定
-  --><div *ngIf="(role.roleId == ROLES.ZTZ  || role.roleId == ROLES.XJZZ || role.roleId == ROLES.QXZZ || role.roleId == ROLES.GZZJKY || role.roleId == ROLES.YYZXJKY) && role.selected">
-    <search-select
-      [data]="workstations"
-      [selectedValue]="selectStation.stationId"
-      (search)="search($event)"
-      (selected)="handleSelected($event)"
-      [placeHolder]="'请选择工作站'" [ngClass]="{'none':disabled}"></search-select>
+  -->
+  <div
+    *ngIf="(role.roleId == ROLES.ZTZ  || role.roleId == ROLES.XJZZ || role.roleId == ROLES.QXZZ || role.roleId == ROLES.GZZJKY) && role.selected">
+    <search-select [data]="workstations" [selectedValue]="selectStation.stationId" (search)="search($event)"
+      (selected)="handleSelected($event)" [placeHolder]="'请选择工作站'" [ngClass]="{'none':disabled}"></search-select>
    <span *ngIf="disabled">{{selectStation.stationName?'工作站：'+selectStation.stationName:''}}</span>
  </div><!-- 安全员,监控员， 工作站绑定
-  --><div *ngIf="(role.roleId == ROLES.AQY || role.roleId == ROLES.JKY ) && role.selected">
-    <checkbox [title]="'工作站'" 
-      [colums]="3" 
-      [data]="workstations" 
-      (selected)="handleSelectedStations($event)"
+  -->
+  <div *ngIf="(role.roleId == ROLES.AQY || role.roleId == ROLES.JKY ) && role.selected">
+    <checkbox [title]="'工作站'" [colums]="3" [data]="workstations" (selected)="handleSelectedStations($event)"
      [editMode]="!disabled"></checkbox>
  </div>
 </div>
--- 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/',
 }

 // 上传的文件类型
--- 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',
 }
--- 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',
 }
--- 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
    }

  </script>
--- a/dwt-edp/edp/releaseHandlePlugin.js
+++ b/dwt-edp/edp/releaseHandlePlugin.js
@ -1,5 +1,5 @@
 function ReleaseHandlePlugin (options) {
-    this.env = options.env;
+    this.env = options.env
 }

 ReleaseHandlePlugin.prototype.apply = function (complier) {
@ -9,12 +9,12 @@ 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("替换成功")
@ -22,14 +22,14 @@ ReleaseHandlePlugin.prototype.apply = function (complier) {
                    console.error("替换失败")
                }

-            });
-        });
+            })
+        })

        compilation.plugin(
            'html-webpack-plugin-before-html-processing',
            (data, cb) => {
-                let html = data.html;
-                html = html.replace('<script type="text/javascript" src="build/dev/vendor.dll.js"></script>','');
+                let html = data.html
+                html = html.replace('<script type="text/javascript" src="build/dev/vendor.dll.js"></script>', '')

                if (this.env === 'test') {
                    html = html.replace(/account.dianwutong.com:(\d+)/g, 'account.test.dianwutong.com')
@ -37,15 +37,15 @@ ReleaseHandlePlugin.prototype.apply = function (complier) {
                    html = html.replace(/account.dianwutong.com(:\d+)?/g, 'account.saas.dianwutong.com')
                }

-                data.html = html;
+                data.html = html

                cb(null, data)
            }
        )

-    });
+    })

 }


-module.exports = ReleaseHandlePlugin;
+module.exports = ReleaseHandlePlugin
--- 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 = $('<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])
--- 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 = $('<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])
--- 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)
--- 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 += '<div  class="third repair-logs"  power-room-id="' + item.prId + '">抢修日志</div>'
+			// 	dom += '<div  class="third repair-logs"  power-room-id="' + item.prId + '">抢修日志</div>'

-			}
+			// }

 			if (local.menuStatus.hasWorkTickets) {

@ -891,17 +891,17 @@ local.getPowerRoomDom = function (item) {
 		dom += '<div class="second-title">日志查询</div>'
 		dom += '</div>'
 		dom += '<div  class="third inspection-logs"  power-room-id="' + item.prId + '">巡检日志</div>'
-		dom += '<div  class="third repair-logs"  power-room-id="' + item.prId + '">抢修日志</div>'
+		// dom += '<div  class="third repair-logs"  power-room-id="' + item.prId + '">抢修日志</div>'
 		dom += '<div  class="third work-tickets"  power-room-id="' + item.prId + '">工作票</div>'
 		dom += '<div  class="third operation-tickets"  power-room-id="' + item.prId + '">操作票</div>'
 		dom += '</div>'

-		dom += '<div>'
-		dom += '<div class="second repairing-list">'
-		dom += '<i class="iconfont second-arrow">&#xe607;</i>'
-		dom += '<div class="second-title">抢修单</div>'
-		dom += '</div>'
-		dom += '</div>'
+		// dom += '<div>'
+		// dom += '<div class="second repairing-list">'
+		// dom += '<i class="iconfont second-arrow">&#xe607;</i>'
+		// dom += '<div class="second-title">抢修单</div>'
+		// dom += '</div>'
+		// dom += '</div>'

 		// add s 2023/9/22
 		// 电费核算
--- 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)
--- 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 {

--- 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

 			// 过滤出查勘任务和抢修任务
--- 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
--- 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()
        }
--- 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()
    }
--- 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 = $('<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';
--- 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 () {
--- 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 = `<a href="${path}" class="group-img"><img src="${path}" title="${file.name}"></a>`
 				$('.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 {
--- 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 += '<div class="pic item">'
 						dom += '<img src="' + src + '"  alt=""/>'
@ -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 += '<div class="pic item">'
 						dom += '<img src="' + src + '" alt=""/>'
--- 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 = $('<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])
--- 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失效弹框
--- 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 {

--- a/dwt-edp/edp/src/view/inspection-logs.html
+++ b/dwt-edp/edp/src/view/inspection-logs.html
@ -16,11 +16,11 @@
            <input id="date-range" class="date-range md" placeholder="请选择日期区间">
        </div>

-        <div class="width1"></div>
+        <!-- <div class="width1"></div>

        <div id="return-old">
            <span>回到旧版</span>
-        </div>
+        </div> -->
    </div>

 </header>
--- 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) {
--- 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)
--- 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)
 }
--- 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()
        }
--- 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)
--- 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 {
--- 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 {
--- 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)
--- 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

 			// 过滤出查勘任务和抢修任务
--- 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,
@ -11,18 +11,34 @@ let model = {

 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;
-
-    return http.get('/ems/rest/common/xj/log/page', param);
+    if (this.endDate) {
+        data.endDate = this.endDate
    }

-exports.model = model;
+    return http.get(url, data)
+}
+
+exports.model = model
--- 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

--- 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')
 		}
 	})
 }
--- 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)
--- 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
--- 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()
    }
--- 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)
 }
--- 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 += '<div class="pic item">'
 						dom += '<img src="' + src + '"  alt=""/>'
@ -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 += '<div class="pic item">'
 						dom += '<img src="' + src + '" alt=""/>'
--- 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 = $('<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])
--- 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)
 }
--- 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 = {}
--- 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 {
--- a/dwt-ems/ems/src/view/add-device.html
+++ b/dwt-ems/ems/src/view/add-device.html
@ -172,7 +172,7 @@
        </div>
        <div id="code">
        </div>
-        <img src="https://cdn.saas.dianwutong.com/common/img/favicon.ico" id="img-buffer" style="display: none;"
+        <img src="https://cdycdn.saas.dianwutong.com/common/img/favicon.ico" id="img-buffer" style="display: none;"
            id="img-buffer">
        <a id="downloadLink"></a>
    </div>
--- a/dwt-ems/ems/src/view/common/layout.html
+++ b/dwt-ems/ems/src/view/common/layout.html
@ -12,9 +12,9 @@
    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
    <meta http-equiv="Pragma" content="no-cache" />
    <meta http-equiv="Expires" content="0" />
-    <link rel="icon" type="image/x-icon" href="//cdn.saas.dianwutong.com/common/img/favicon.ico">
+    <link rel="icon" type="image/x-icon" href="//cdycdn.saas.dianwutong.com/common/img/favicon.ico">
    <!-- 引入样式表 -->
-    <link rel="stylesheet" type="text/css" href="//cdn.saas.dianwutong.com/common/css/iconfont.css" />
+    <link rel="stylesheet" type="text/css" href="//cdycdn.saas.dianwutong.com/common/css/iconfont.css" />
    <script type="text/javascript" src="build/dev/vendor.dll.js"></script>
 </head>

@ -23,7 +23,7 @@
        <div class="nav-list">
            <div class="height5"></div>
            <div class="logo">
-                <img src="//cdn.saas.dianwutong.com/ems/image/logo.png">
+                <img src="//cdycdn.saas.dianwutong.com/ems/image/logo.png">
            </div>
            <div class="height40"></div>
            <div class="nav-content">
@ -143,7 +143,7 @@
                </div>
                <!-- add start 2019/4/25 kangzhi -->
                <!-- 增加edp\app菜单权限设置 -->
-                <div class="nav-content-item menu-privilege" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item menu-privilege" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="menu-privilege.html">
                        <i class="iconfont icon icon-bg-xunjianwenti">&#xe613;</i>
                        <span>权限设置</span>
@ -151,12 +151,12 @@
                        <div class="badge" id="menu-privilege-badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- add end 2019/4/25 kangzhi -->

                <!-- add start 2019/5/9 10:04 kangzhi -->
                <!-- 在侧边导航栏中添加“简历审核” -->
-                <div class="nav-content-item interviewer-list" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item interviewer-list" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="interviewer-list.html">
                        <i class="iconfont icon icon-bg-xitongguapai">&#xe613;</i>
                        <span>简历审核</span>
@ -164,12 +164,12 @@
                        <div class="badge" id="interviewer-badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- add end 2019/5/9 10:04 kangzhi -->

                <!-- add start 2019/9/18 15:57 kangzhi -->
                <!-- 在侧边导航栏中添加“简历审核” -->
-                <div class="nav-content-item work-attendance" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item work-attendance" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="work-attendance.html">
                        <i class="iconfont icon icon-bg-xunjianrizhi">&#xe613;</i>
                        <span>抢单考勤</span>
@ -177,7 +177,7 @@
                        <div class="badge" id="work-attendance-badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- add end 2019/9/18 15:57 kangzhi -->

                <!-- add start 2020/6/18 kangzhi -->
@ -219,17 +219,17 @@
                    </a>
                    <div class="height20"></div>
                </div>
-                <div class="nav-content-item ddn-setting" privilege="ZTZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item ddn-setting" privilege="ZTZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="ddh-setting.html">
                        <i class="iconfont icon icon-bg-reportproject">&#xe61c;</i>
                        <span>调度号划分</span>
                        <i class="iconfont arrow">&#xe61a;</i>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- add end 2021/5/24 kangzhi -->
                <!-- add by guoyuanyuan 2021/4/26 -->
-                <div class="nav-content-item device-item" privilege="ZTZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item device-item" privilege="ZTZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="device-list.html">
                        <i class="iconfont icon icon icon-bg-xunjiananpai">&#xe614;</i>
                        <span>点检工单配置</span>
@ -237,7 +237,7 @@
                        <div class="badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- add end -->
                <!-- add start 2021/7/26 kangzhi -->
                <!-- <div class="nav-content-item unusual-inspection" privilege="ZBZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
--- a/dwt-ems/ems/src/view/common/prBaseInfo-layout.html
+++ b/dwt-ems/ems/src/view/common/prBaseInfo-layout.html
@ -12,9 +12,9 @@
    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
    <meta http-equiv="Pragma" content="no-cache" />
    <meta http-equiv="Expires" content="0" />
-    <link rel="icon" type="image/x-icon" href="//cdn.saas.dianwutong.com/common/img/favicon.ico">
+    <link rel="icon" type="image/x-icon" href="//cdycdn.saas.dianwutong.com/common/img/favicon.ico">
    <!-- 引入样式表 -->
-    <link rel="stylesheet" type="text/css" href="//cdn.saas.dianwutong.com/common/css/iconfont.css" />
+    <link rel="stylesheet" type="text/css" href="//cdycdn.saas.dianwutong.com/common/css/iconfont.css" />
    <script type="text/javascript" src="build/dev/vendor.dll.js"></script>
 </head>

@ -23,7 +23,7 @@
        <div class="nav-list">
            <div class="height5"></div>
            <div class="logo">
-                <img src="//cdn.saas.dianwutong.com/ems/image/logo.png">
+                <img src="//cdycdn.saas.dianwutong.com/ems/image/logo.png">
            </div>
            <div class="height40"></div>
            <div class="nav-content">
@ -140,7 +140,7 @@
                    </a>
                    <div class="height20"></div>
                </div>
-                <div class="nav-content-item menu-privilege" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item menu-privilege" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="menu-privilege.html">
                        <i class="iconfont icon icon-bg-xunjianwenti">&#xe613;</i>
                        <span>权限设置</span>
@ -148,9 +148,9 @@
                        <div class="badge" id="menu-privilege-badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- 在侧边导航栏中添加“简历审核” -->
-                <div class="nav-content-item interviewer-list" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item interviewer-list" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="interviewer-list.html">
                        <i class="iconfont icon icon-bg-xitongguapai">&#xe613;</i>
                        <span>简历审核</span>
@ -158,10 +158,10 @@
                        <div class="badge" id="interviewer-badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->

                <!-- 在侧边导航栏中添加“简历审核” -->
-                <div class="nav-content-item work-attendance" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item work-attendance" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="work-attendance.html">
                        <i class="iconfont icon icon-bg-xunjianrizhi">&#xe613;</i>
                        <span>抢单考勤</span>
@ -169,7 +169,7 @@
                        <div class="badge" id="work-attendance-badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->

                <div class="nav-content-item run-log-list" privilege="ZTZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="run-log-list.html">
@ -217,16 +217,16 @@
                    <div class="height20"></div>
                </div> -->

-                <div class="nav-content-item ddn-setting" privilege="ZBZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item ddn-setting" privilege="ZBZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="ddh-setting.html">
                        <i class="iconfont icon icon-bg-reportproject">&#xe61c;</i>
                        <span>调度号划分</span>
                        <i class="iconfont arrow">&#xe61a;</i>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- add by guoyuanyuan 2021/4/26 -->
-                <div class="nav-content-item device-item" privilege="ZTZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG">
+                <!-- <div class="nav-content-item device-item" privilege="ZTZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG">
                    <a class="nav-item  color-grey" href="device-list.html">
                        <i class="iconfont icon icon icon-bg-xunjiananpai">&#xe614;</i>
                        <span>点检工单配置</span>
@ -234,7 +234,7 @@
                        <div class="badge"></div>
                    </a>
                    <div class="height20"></div>
-                </div>
+                </div> -->
                <!-- add end -->

                <!-- <div class="nav-content-item person-manage" privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY">
@ -291,10 +291,10 @@
                        <a class="tabs-item real-time-data" href="real-time-data.html"
                            privilege="KH,ZTZ,XJZZ,QXBZ,QXZZ,AQY,ZBZ,JKY,KHJL,GCS,GZZJKY,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">实时数据</a>
                        <!-- <a class="tabs-item real-time-data-new" href="real-time-data-new.html" privilege="KH,ZTZ,XJZZ,QXBZ,QXZZ,AQY,ZBZ,JKY,KHJL,GCS,GZZJKY,KHZG,KHJKY">实时数据(新)</a> -->
-                        <a class="tabs-item report-setting" href="report-setting.html"
-                            privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">报表配置</a>
-                        <a class="tabs-item alarm-pusher-setting" href="alarm-pusher-setting.html"
-                            privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">预报警推送设置</a>
+                        <!-- <a class="tabs-item report-setting" href="report-setting.html"
+                            privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">报表配置</a> -->
+                        <!-- <a class="tabs-item alarm-pusher-setting" href="alarm-pusher-setting.html"
+                            privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG">预报警推送设置</a> -->
                        <a class="tabs-item pr-table-setting" href="javascript:;"
                            privilege="ZTZ,KHZG,KHJKY,KHZZ,KHzbz,KHZBY,YQZG" id="prTableSetting">点表设置</a>
                        <a class="tabs-item compare-energy" href="compare-energy.html"
--- a/dwt-ems/ems/src/view/create-report.html
+++ b/dwt-ems/ems/src/view/create-report.html
@ -691,4 +691,4 @@

  </div>
 </div>
-<script src="//cdn.saas.dianwutong.com/vendor/echarts1.min.js"></script>
+<script src="//cdycdn.saas.dianwutong.com/vendor/echarts1.min.js"></script>
--- a/dwt-ems/ems/src/view/device-book.html
+++ b/dwt-ems/ems/src/view/device-book.html
@ -62,4 +62,4 @@
 		</div>
 	</div>
 </div>
-<script src="//cdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
+<script src="//cdycdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
--- a/dwt-ems/ems/src/view/inspection-arrange-list.html
+++ b/dwt-ems/ems/src/view/inspection-arrange-list.html
@ -19,10 +19,10 @@
        <div class="ui-btn-group ui-btn-group-primary width5">
            <button class="width150 ui-btn active" id="creat-inspect">新增巡检</button>
        </div>
-        <div class="width5"></div>
+        <!-- <div class="width5"></div>
        <div id="return-old">
            <span>回到旧版</span>
-        </div>
+        </div> -->
    </div>
 </header>
 <div class="conPadding1">
--- a/dwt-ems/ems/src/view/inspection-log-list.html
+++ b/dwt-ems/ems/src/view/inspection-log-list.html
@ -1,10 +1,10 @@
 <input type="hidden" value="ZTZ,ZBZ,QXBZ,XJZZ,QXZZ,KHZG,KHJKY,GZZJKY,KHZZ,KHzbz,KHZBY,YQZG" id="page-privilege">
 <header class="header">
 	<div class="row">
-		<div class="left" id="return-old">
+		<!-- <div class="left" id="return-old">
 			<span class="color-primary">返回旧版</span>
 		</div>
-		<div class="width2"></div>
+		<div class="width2"></div> -->
 		<div class="width15">
 			<div class="ui-select" tabindex="-1" id="power-room-selector">
 				<input placeholder="请选择配电室" disabled>
--- a/dwt-ems/ems/src/view/interviewer-detail.html
+++ b/dwt-ems/ems/src/view/interviewer-detail.html
@ -32,12 +32,12 @@
            </li>
            <li>
                <div>电工证信息</div>
-                <img src="//cdn.saas.dianwutong.com/ems/image/logo.png" alt="">
+                <img src="//cdycdn.saas.dianwutong.com/ems/image/logo.png" alt="">
            </li>
            <li>
                <div>实名认证</div>
-                <img src="//cdn.saas.dianwutong.com/ems/image/logo.png" alt="">
-                <img src="//cdn.saas.dianwutong.com/ems/image/logo.png" alt="">
+                <img src="//cdycdn.saas.dianwutong.com/ems/image/logo.png" alt="">
+                <img src="//cdycdn.saas.dianwutong.com/ems/image/logo.png" alt="">
            </li> -->
        </ul>
    </div>
--- a/dwt-ems/ems/src/view/login.html
+++ b/dwt-ems/ems/src/view/login.html
@ -31,7 +31,7 @@
 	<p>引入laydate</p>
 	<pre>
 		// 指定动态加载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',
--- a/dwt-ems/ems/src/view/map.html
+++ b/dwt-ems/ems/src/view/map.html
@ -25,13 +25,13 @@


 	<script src="https://cdn.bootcss.com/rxjs/5.2.0/Rx.min.js"></script>
-	<script src="//cdn.saas.dianwutong.com/vendor/jquery.min.js"></script>
-	<script src="//cdn.saas.dianwutong.com/vendor/jquery.cookie.js"></script>
+	<script src="//cdycdn.saas.dianwutong.com/vendor/jquery.min.js"></script>
+	<script src="//cdycdn.saas.dianwutong.com/vendor/jquery.cookie.js"></script>
 	<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=TT0RktRPwhEbTvTRK5I416aW"></script>
 	<script type="text/javascript"
 		src="https://api.map.baidu.com/library/AreaRestriction/1.2/src/AreaRestriction_min.js"></script>
-	<script src="//cdn.saas.dianwutong.com/vendor/convertor.js"></script>
-	<script src="//cdn.saas.dianwutong.com/common/js/dateUtils.js"></script>
+	<script src="//cdycdn.saas.dianwutong.com/vendor/convertor.js"></script>
+	<script src="//cdycdn.saas.dianwutong.com/common/js/dateUtils.js"></script>
 </body>


--- a/dwt-ems/ems/src/view/operation-order-detail.html
+++ b/dwt-ems/ems/src/view/operation-order-detail.html
@ -69,4 +69,4 @@
    </div>
 </div>

-<script src="//cdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
+<script src="//cdycdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
--- a/dwt-ems/ems/src/view/privilege-error.html
+++ b/dwt-ems/ems/src/view/privilege-error.html
@ -11,7 +11,7 @@
    <meta name="renderer" content="webkit">
    <meta http-equiv="Cache-Control" content="no-siteapp" />
    <!-- 引入样式表 -->
-    <link rel="stylesheet" type="text/css" href="//cdn.saas.dianwutong.com/common/css/iconfont.css" />
+    <link rel="stylesheet" type="text/css" href="//cdycdn.saas.dianwutong.com/common/css/iconfont.css" />
    <script type="text/javascript" src="build/dev/vendor.dll.js"></script>

 </head>
@ -38,7 +38,7 @@
            <div class="center">
                <div class="">
                    <div class="height100"></div>
-                    <img src="//cdn.saas.dianwutong.com/common/img/privilege-error.png">
+                    <img src="//cdycdn.saas.dianwutong.com/common/img/privilege-error.png">
                </div>
                <div style="color: #aaa">你没有权限访问该页面！</div>
            </div>
--- a/dwt-ems/ems/src/view/report-project.html
+++ b/dwt-ems/ems/src/view/report-project.html
@ -276,4 +276,4 @@
    </div>
  </div>
 </div>
-<script src="//cdn.saas.dianwutong.com/vendor/echarts1.min.js"></script>
+<script src="//cdycdn.saas.dianwutong.com/vendor/echarts1.min.js"></script>
--- a/dwt-ems/ems/src/view/run-log-detail.html
+++ b/dwt-ems/ems/src/view/run-log-detail.html
@ -74,4 +74,4 @@
    </div>
 </div>

-<script src="//cdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
+<script src="//cdycdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
--- a/dwt-ems/ems/src/view/work-order-detail.html
+++ b/dwt-ems/ems/src/view/work-order-detail.html
@ -68,4 +68,4 @@
        </div>
    </div>
 </div>
-<script src="//cdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
+<script src="//cdycdn.saas.dianwutong.com/vendor/ckeditor/ckeditor.js"></script>
--- 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 () {
--- 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 = {}

--- 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('<OBJECT ID="webX" height=100% width=100% CLASSID="CLSID:EE1272EB-144F-485B-9A1B-DC2FE6B07AA3" codebase="https://cdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.CAB#version=7,6,0,49"> </OBJECT>')
+					$('#view-diagram-panel').html('<OBJECT ID="webX" height=100% width=100% CLASSID="CLSID:EE1272EB-144F-485B-9A1B-DC2FE6B07AA3" codebase="https://cdycdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.CAB#version=7,6,0,49"> </OBJECT>')
 					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('您尚未安装控件，请<a href="https://cdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.exe" download="fmWebPackage.exe">下载安装</a>')
+				$('#view-diagram-panel').html('您尚未安装控件，请<a href="https://cdycdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.exe" download="fmWebPackage.exe">下载安装</a>')
 			}
 		} 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': '当前配电室没有一次接线图信息',
--- 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('<OBJECT ID="webX" height=100% width=100% CLASSID="CLSID:EE1272EB-144F-485B-9A1B-DC2FE6B07AA3" codebase="https://cdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.CAB#version=7,6,21,4"> </OBJECT>')
+                            $('#diagram-panel-body').html('<OBJECT ID="webX" height=100% width=100% CLASSID="CLSID:EE1272EB-144F-485B-9A1B-DC2FE6B07AA3" codebase="https://cdycdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.CAB#version=7,6,21,4"> </OBJECT>')
                            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('您尚未安装控件，请<a href="https://cdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.exe" download="fmWebPackage.exe">下载安装</a>')
+                            $('#view-diagram-panel').html('您尚未安装控件，请<a href="https://cdycdn.saas.dianwutong.com/common/resource/jiekong/fmWebPackage.exe" download="fmWebPackage.exe">下载安装</a>')
                        }

                    }, 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': '当前配电室没有一次接线图信息',
--- 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();
--- 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'

--- a/dwt-terminal/terminal/src/view/customer-statistic.html
+++ b/dwt-terminal/terminal/src/view/customer-statistic.html
@ -8,7 +8,7 @@
 	<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
 	<meta http-equiv="Pragma" content="no-cache" />
 	<meta http-equiv="Expires" content="0" />
-	<link rel="stylesheet" type="text/css" href="https://cdn.saas.dianwutong.com/common/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="https://cdycdn.saas.dianwutong.com/common/css/iconfont.css" />

 </head>

--- a/dwt-terminal/terminal/src/view/frame.html
+++ b/dwt-terminal/terminal/src/view/frame.html
@ -74,12 +74,12 @@
        <div class="container">
            <select class="page-selector">
                <option value="">请选择</option>
-                <option value="https://terminal.saas.dianwutong.com/weather.html">天气页面</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
-                <option value="https://terminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-list.html">报警列表</option>
-                <option value="https://terminal.saas.dianwutong.com/map.html">地图（GIS）</option>
-                <option value="https://terminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/weather.html">天气页面</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-list.html">报警列表</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/map.html">地图（GIS）</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
            </select>
            或者
            <input class="url" placeholder="请输入要投放URL">&nbsp;
@ -90,12 +90,12 @@
        <div class="container">
            <select class="page-selector">
                <option value="">请选择</option>
-                <option value="https://terminal.saas.dianwutong.com/weather.html">天气页面</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
-                <option value="https://terminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-list.html">报警列表</option>
-                <option value="https://terminal.saas.dianwutong.com/map.html">地图（GIS）</option>
-                <option value="https://terminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/weather.html">天气页面</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-list.html">报警列表</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/map.html">地图（GIS）</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
            </select>
            或者
            <input class="url" placeholder="请输入要投放URL">&nbsp;
@ -106,12 +106,12 @@
        <div class="container">
            <select class="page-selector">
                <option value="">请选择</option>
-                <option value="https://terminal.saas.dianwutong.com/weather.html">天气页面</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
-                <option value="https://terminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-list.html">报警列表</option>
-                <option value="https://terminal.saas.dianwutong.com/map.html">地图（GIS）</option>
-                <option value="https://terminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/weather.html">天气页面</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-list.html">报警列表</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/map.html">地图（GIS）</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
            </select>
            或者
            <input class="url" placeholder="请输入要投放URL">&nbsp;
@ -122,12 +122,12 @@
        <div class="container">
            <select class="page-selector">
                <option value="">请选择</option>
-                <option value="https://terminal.saas.dianwutong.com/weather.html">天气页面</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
-                <option value="https://terminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
-                <option value="https://terminal.saas.dianwutong.com/warning-list.html">报警列表</option>
-                <option value="https://terminal.saas.dianwutong.com/map.html">地图（GIS）</option>
-                <option value="https://terminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/weather.html">天气页面</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-statistic.html">报警统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/customer-statistic.html">客户统计</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/warning-list.html">报警列表</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/map.html">地图（GIS）</option>
+                <option value="https://cdyterminal.saas.dianwutong.com/camera-h5.html">视频监控</option>
            </select>
            或者
            <input class="url" placeholder="请输入要投放URL">&nbsp;
--- a/dwt-terminal/terminal/src/view/weather.html
+++ b/dwt-terminal/terminal/src/view/weather.html
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -7,8 +8,9 @@
 	<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
 	<meta http-equiv="Pragma" content="no-cache" />
 	<meta http-equiv="Expires" content="0" />
-	<link rel="stylesheet" type="text/css" href="https://cdn.saas.dianwutong.com/common/css/iconfont.css" />
+	<link rel="stylesheet" type="text/css" href="https://cdycdn.saas.dianwutong.com/common/css/iconfont.css" />
 </head>
+
 <body>
 	<div>
 		<div class="height30"></div>
@ -28,12 +30,15 @@
 					</div>
 					<div class="weather1-r font24 color-white">
 						<div><span id="area"></span><i class="iconfont">&#xe609;</i></div><!--
-						 --><div><span id="weatherType"></span><img src="../images/shu.png"></div><!--
-						 --><div><span id="wind"></span><img src="../images/shuidi.png"></div>
+						 -->
+						<div><span id="weatherType"></span><img src="../images/shu.png"></div><!--
+						 -->
+						<div><span id="wind"></span><img src="../images/shuidi.png"></div>
 					</div>
 				</div>
 			</div><!-- 
-			 --><div>
+			 -->
+			<div>
 				<div class="real-time-temperature">
 					实时温度<span class="temperature"></span>℃
 				</div>
@ -42,9 +47,11 @@
 		<div class="height60"></div>
 		<div class="pm25con">
 			<div class="font30 color-white text-align-r" style="white-space: nowrap;">相对湿度:</div><!-- 
-			  --><div class="pm25"><span id="humidity"></span>&nbsp;&nbsp;&nbsp;
+			  -->
+			<div class="pm25"><span id="humidity"></span>&nbsp;&nbsp;&nbsp;
 				<!-- <span id="airQuality"></span></div>  -->
 			</div>
 		</div>
 </body>
+
 </html>