Bladeren bron

代理设置变更

Shannon_mu 3 jaren geleden
bovenliggende
commit
c5c45ff1d3
23 gewijzigde bestanden met toevoegingen van 88 en 88 verwijderingen
  1. 4 4
      login/src/views/Login/index.vue
  2. 4 4
      userCenter/src/components/common/Header.vue
  3. 2 2
      userCenter/src/config/env.development.js
  4. 3 3
      userCenter/src/utils/http.js
  5. 3 3
      userCenter/src/utils/initMap.js
  6. 9 9
      userCenter/src/views/messages/index.vue
  7. 1 1
      userCenter/src/views/sysManage/appVersionManage/popups/addAppVersionManage.vue
  8. 5 5
      userCenter/src/views/sysManage/cameraManage/cameraManage.vue
  9. 4 4
      userCenter/src/views/sysManage/cameraManage/popups/addOrEditCamera.vue
  10. 5 5
      userCenter/src/views/sysManage/deviceManage/deviceManage.vue
  11. 3 3
      userCenter/src/views/sysManage/deviceManage/popups/addOrEditDevice.vue
  12. 1 1
      userCenter/src/views/sysManage/deviceManage/popups/addOrEditDeviceParm.vue
  13. 7 7
      userCenter/src/views/sysManage/deviceManage/popups/addOrEditScene.vue
  14. 3 3
      userCenter/src/views/sysManage/deviceManage/popups/bindDevice.vue
  15. 1 1
      userCenter/src/views/sysManage/deviceManage/popups/mapmarkgis.vue
  16. 2 2
      userCenter/src/views/sysManage/deviceManage/popups/sceneManageDevicelist.vue
  17. 7 7
      userCenter/src/views/sysManage/deviceManage/sceneManage.vue
  18. 4 4
      userCenter/src/views/sysManage/deviceManage/sceneTypeManage.vue
  19. 3 3
      userCenter/src/views/sysManage/revenueManagement/index.vue
  20. 3 3
      userCenter/src/views/sysManage/revenueManagement/popups/AddOrEdit.vue
  21. 10 10
      userCenter/src/views/sysManage/sysSet/index.vue
  22. 1 1
      userCenter/src/views/sysManage/sysSet/popups/addOrEdit.vue
  23. 3 3
      userCenter/vue.config.js

+ 4 - 4
login/src/views/Login/index.vue

@@ -403,10 +403,10 @@ export default {
                         this.$store.commit('setloginInfo', data.loginInfo[0]);
                         this.jumpAnimate = true;
                         window.sessionStorage.setItem('loginJson', JSON.stringify(this.loginInfoArr));
-                         window.sessionStorage.setItem('loginJsonActive', JSON.stringify(this.loginInfoArr[0]));
+                        window.sessionStorage.setItem('loginJsonActive', JSON.stringify(this.loginInfoArr[0]));
                         setTimeout(() => {
                             this.$router.push({
-                                path: '/nav',
+                                path: '/nav'
                                 // query: {
                                 //     phone: this.loginInfoArr[0].phone,
                                 //     tenantId: this.loginInfoArr[0].tenantId
@@ -436,8 +436,8 @@ export default {
         localStorage.removeItem('menupath');
         localStorage.removeItem('ms_username');
         localStorage.removeItem('SC_token');
-        sessionStorage.removeItem('tabs');
-
+        // sessionStorage.removeItem('tabs');
+        sessionStorage.clear();
         const accountNumberName = localStorage.getItem('accountNumberName') || '';
         this.accountNumberData.name = accountNumberName;
         this.rememberName = !!accountNumberName;

+ 4 - 4
userCenter/src/components/common/Header.vue

@@ -115,7 +115,7 @@ export default {
              });
              return;
             }
-            this.$http.postForm('/uims-message/message/judgingTheMessageJumpPermission',{
+            this.$http.postForm('/sc-uims-message/message/judgingTheMessageJumpPermission',{
                 url:url.split('/')[url.split('/').length - 1],
                 appId:appId
             }).then(({ status, data, msg })=>{
@@ -183,7 +183,7 @@ export default {
         },
         //获取最新消息列表
         getMessageList(){
-            this.$http.postForm('/uims-message/message/queryLastMessage',{num:'5'}).then(({ status, data, msg }) => {
+            this.$http.postForm('/sc-uims-message/message/queryLastMessage',{num:'5'}).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.$store.commit('setmessageList', data);
                 }
@@ -191,7 +191,7 @@ export default {
         },
         //查询未读消息数量
         getUnreadNumber(){
-            this.$http.postForm('/uims-message/message/queryUnreadMessageStatic').then(({ status, data, msg }) => {
+            this.$http.postForm('/sc-uims-message/message/queryUnreadMessageStatic').then(({ status, data, msg }) => {
                 if (status === 0) {
                     data.map((item,index)=>{
                        if(item.cn){
@@ -205,7 +205,7 @@ export default {
         initWebSocket(id) {
             if ('WebSocket' in window) {
                 var serviceIp = this.envConfig.websoketUrl;
-                this.websocket = new WebSocket('ws://' + serviceIp + '/uims-message/webSocket/' + id);
+                this.websocket = new WebSocket('ws://' + serviceIp + '/sc-uims-message/webSocket/' + id);
             }else {
                 console.log('当前浏览器 Not support websocket');
             }

+ 2 - 2
userCenter/src/config/env.development.js

@@ -20,12 +20,12 @@ module.exports = {
   // eventHiddenDangerUrl:"http://114.135.61.188:18093/maintenance/eventHiddenDanger",// 运维管理系统-工单管理-事件隐患界面
 
 
-  baseUrl: "http://114.135.61.188:18093/login/login", // 项目地址
+  baseUrl: "http://114.135.61.188:18093/sc-login/", // 项目地址
   baseApi: "http://192.168.0.121:8082", // 本地api请求地址
   baseMapApi: "http://114.135.61.187:38082", // arcgis API
   baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
   baseExcelApi: "http://114.135.61.187:38082", // excel请求地址
-  loginUrl: "http://114.135.61.188:18093/login/login",
+  loginUrl: "http://114.135.61.188:18093/sc-login/",
   websoketUrl: '114.135.61.187:38081',
   warnDetailUrl: "http://114.135.61.188:18093/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
   taskManagementUrl: "http://114.135.61.188:18093/maintenance/taskManagement",// 运维管理系统-巡检管理-任务管理界面

+ 3 - 3
userCenter/src/utils/http.js

@@ -17,12 +17,12 @@ http.interceptors.request.use(
         // config.url = `/sc-user-auth${config.url}`;
         if (config.url.indexOf('/sc-user-auth') !== -1) {
             config.url = config.url;
-        } else if (config.url.indexOf('/uims-message') !== -1) {
+        } else if (config.url.indexOf('/sc-uims-message') !== -1) {
             config.url = config.url;
-        } else if (config.url.indexOf('/operation-manager') !== -1) {
+        } else if (config.url.indexOf('/sc-operation-manager') !== -1) {
             config.url = config.url;
         }
-        else if (config.url.indexOf('/zoniot-water') !== -1) {
+        else if (config.url.indexOf('/sc-zoniot-water') !== -1) {
             config.url = config.url;
         }
         else if (config.url.indexOf('/sc-user-center') !== -1) {

+ 3 - 3
userCenter/src/utils/initMap.js

@@ -111,7 +111,7 @@ export default {
             })
                 .then(() => {
                     return new Promise((resolve, reject) => {
-                        this.$http.post('/zoniot-water/systemSetting/selectGis',{}).then(({ status, data, msg }) => {
+                        this.$http.post('/sc-zoniot-water/systemSetting/selectGis',{}).then(({ status, data, msg }) => {
                             if (0 === status) {
                                 _self.selectGislist = data;
                             }
@@ -121,7 +121,7 @@ export default {
                 })
                 .then(() => {
                     return new Promise((resolve, reject) => {
-                        this.$http.get('/zoniot-water/systemSetting/selectSystem').then(({ status, data, msg }) => {
+                        this.$http.get('/sc-zoniot-water/systemSetting/selectSystem').then(({ status, data, msg }) => {
                             if (0 === status && data) {
                                 if (data.mapSuspensionDisplay) {
                                     _self.mapSuspensionDisplay = data.mapSuspensionDisplay;
@@ -137,7 +137,7 @@ export default {
                 .then(() => {
                     // if (this.scenetype) {
                         return new Promise((resolve, reject) => {
-                            this.$http.get('/zoniot-water/mapSetting/selectMap', { sceneTypeName: '测试' }).then(({ status, data, msg }) => {
+                            this.$http.get('/sc-zoniot-water/mapSetting/selectMap', { sceneTypeName: '测试' }).then(({ status, data, msg }) => {
                                 if (0 === status && data) {
                                     _self.setcenterpoint = data.pointX + ',' + data.pointY;                               
                                     _self.getzoom = data.mapLevel;

+ 9 - 9
userCenter/src/views/messages/index.vue

@@ -157,7 +157,7 @@ export default {
             this.mixins_search();
         },
         toUrl(id,type,sceneType,urllink) {
-            this.$http.post('/uims-message/message/updateMultiple', { ids: [id], messageStatus: 1 }).then(({ status, data, msg }) => {});
+            this.$http.post('/sc-uims-message/message/updateMultiple', { ids: [id], messageStatus: 1 }).then(({ status, data, msg }) => {});
             let url,appId;
             if(type==1||type==2){
                 url=urllink||this.envConfig.warnDetailUrl;
@@ -170,7 +170,7 @@ export default {
                 appId="1003";
             }
             //查询linkpath能不能跳转
-            this.$http.postForm('/uims-message/message/judgingTheMessageJumpPermission',{
+            this.$http.postForm('/sc-uims-message/message/judgingTheMessageJumpPermission',{
                 url:url.split('/')[url.split('/').length - 1],
                 appId:appId
             }).then(({ status, data, msg })=>{
@@ -196,7 +196,7 @@ export default {
             this.$msgBox(`您确定要删除选中的${this.selectRow.length}条消息`, '删除后将无法恢复,是否继续?')
                 .then((_) => {
                     this.$http
-                        .post('/uims-message/message/updateMultiple', { ids: this.selectRow, status: 0 })
+                        .post('/sc-uims-message/message/updateMultiple', { ids: this.selectRow, status: 0 })
                         .then(({ status, data, msg }) => {
                             if (status === 0) {
                                 this.search();
@@ -210,7 +210,7 @@ export default {
         deleteAll() {
             this.$msgBox(`您确定要删除全部消息`, '删除后将无法恢复,是否继续?')
                 .then((_) => {
-                    this.$http.post('/uims-message/message/updateMultiple', { ids: [], status: 0 }).then(({ status, data, msg }) => {
+                    this.$http.post('/sc-uims-message/message/updateMultiple', { ids: [], status: 0 }).then(({ status, data, msg }) => {
                         if (status === 0) {
                             this.search();
                             this.$refs.table.checkAllChange();
@@ -224,7 +224,7 @@ export default {
             this.$msgBox(`您确定要标记选中的${this.selectRow.length}条消息为已读`, '标记后将无法恢复,是否继续?', 'warning')
                 .then((_) => {
                     this.$http
-                        .post('/uims-message/message/updateMultiple', { ids: this.selectRow, messageStatus: 1 })
+                        .post('/sc-uims-message/message/updateMultiple', { ids: this.selectRow, messageStatus: 1 })
                         .then(({ status, data, msg }) => {
                             if (status === 0) {
                                 this.search();
@@ -238,7 +238,7 @@ export default {
         markAll() {
             this.$msgBox(`您确定要标记全部消息为已读`, '标记后将无法恢复,是否继续?', 'warning')
                 .then((_) => {
-                    this.$http.post('/uims-message/message/updateMultiple', { ids: [], messageStatus: 1 }).then(({ status, data, msg }) => {
+                    this.$http.post('/sc-uims-message/message/updateMultiple', { ids: [], messageStatus: 1 }).then(({ status, data, msg }) => {
                         if (status === 0) {
                             this.search();
                             this.$refs.table.checkAllChange();
@@ -251,7 +251,7 @@ export default {
         },
         //查询未读消息数量
         getUnreadNumber() {
-            this.$http.postForm('/uims-message/message/queryUnreadMessageStatic').then(({ status, data, msg }) => {
+            this.$http.postForm('/sc-uims-message/message/queryUnreadMessageStatic').then(({ status, data, msg }) => {
                 if (status === 0) {
                     let sum = 0;
                     data.map((item, index) => {
@@ -270,7 +270,7 @@ export default {
         },
         //获取最新消息列表
         getMessageList(){
-            this.$http.postForm('/uims-message/message/queryLastMessage',{num:'5'}).then(({ status, data, msg }) => {
+            this.$http.postForm('/sc-uims-message/message/queryLastMessage',{num:'5'}).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.$store.commit('setmessageList', data);
                 }
@@ -278,7 +278,7 @@ export default {
         },
     },
     created() {
-        this.mixins_dataUrl = '/uims-message/message/selectPage';
+        this.mixins_dataUrl = '/sc-uims-message/message/selectPage';
         this.search();
     }
 };

+ 1 - 1
userCenter/src/views/sysManage/appVersionManage/popups/addAppVersionManage.vue

@@ -27,7 +27,7 @@
       <el-input class="uploadinput" slot="tip" v-model="isUpload" :placeholder="isUpload?'':isUploadText"></el-input>
       <el-upload
         name="avatarfile"
-        action="/operation-manager/order/workOrderManage/addAppPackage"
+        action="/sc-operation-manager/order/workOrderManage/addAppPackage"
         :show-file-list="true"	
         :limit="1"
         accept=".apk"

+ 5 - 5
userCenter/src/views/sysManage/cameraManage/cameraManage.vue

@@ -171,7 +171,7 @@ export default {
         },
         // 获取场景树
         getscenetypeTreeList() {
-            this.$http.get('/zoniot-water/scene/selectList').then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/scene/selectList').then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     // this.scenetypeList = data;
                     this.allServiceScene = data;
@@ -190,7 +190,7 @@ export default {
                 if (tip === 'edit') {
                     // row = item;
                     title = '修改摄像头';
-                    this.$http.postForm('/zoniot-water/cameraManage/get', { id: item.id }).then(({ status, data, msg }) => {
+                    this.$http.postForm('/sc-zoniot-water/cameraManage/get', { id: item.id }).then(({ status, data, msg }) => {
                         if (status === 0) {
                             row = data;
                                        
@@ -200,7 +200,7 @@ export default {
                                                 if (status === 0) {
                                                      this.organListdepartment = data ? data : [];
                                                      this.$http
-                                                    .get('/zoniot-water/scene/selectListForParm', { comId: row.companyOrgId, deptId: row.deptOrgId })
+                                                    .get('/sc-zoniot-water/scene/selectListForParm', { comId: row.companyOrgId, deptId: row.deptOrgId })
                                                     .then(({ status, data, msg }) => {
                                                         if (status === 0) {
                                                             this.allServiceScene = data ? data : [];
@@ -263,7 +263,7 @@ export default {
                 });
             }
             this.$msgBox(`确定要删除?`, '删除后将无法恢复,是否继续?').then(() => {
-            this.$http.post('/zoniot-water/cameraManage/deleteAll', ids).then(({ status, data, msg }) => {
+            this.$http.post('/sc-zoniot-water/cameraManage/deleteAll', ids).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.$message.success('删除成功');
                     this.mixins_search();
@@ -275,7 +275,7 @@ export default {
         },
         //获取摄像头列表页
         getCameraPage() {
-            this.mixins_dataUrl = '/zoniot-water/cameraManage/selectPage';
+            this.mixins_dataUrl = '/sc-zoniot-water/cameraManage/selectPage';
             this.mixins_post = 'post';
             this.mixins_pageset = {
                 pageNum: this.mixins_pageset.pageNum,

+ 4 - 4
userCenter/src/views/sysManage/cameraManage/popups/addOrEditCamera.vue

@@ -268,7 +268,7 @@ export default {
             // if(!e)return   
             // 获取 上级场景列表
             this.$http
-                .get('/zoniot-water/scene/selectListForParm', { comId: this.formData.companyOrgId, deptId: this.formData.deptOrgId })
+                .get('/sc-zoniot-water/scene/selectListForParm', { comId: this.formData.companyOrgId, deptId: this.formData.deptOrgId })
                 .then(({ status, data, msg }) => {
                     if (status === 0) {
                         this.allServiceScene = data ? data : [];
@@ -366,7 +366,7 @@ export default {
             if(this.mapInputFilter){
                 this.$refs.querySearchAsyncInput.handleFocus();
             }else{
-                this.$http.post('/operation-manager/track/TaskTrack/convertXY', {
+                this.$http.post('/sc-operation-manager/track/TaskTrack/convertXY', {
                         "moveXY": this.getmoveXYVal,
                         "wkid": this.getWkidVal,
                         "xy": [`${this.inputlongitude},${this.inputlatitude}`]
@@ -561,9 +561,9 @@ export default {
                 var loading = this.$loading();
                 var posturl = '';
                 if(this.params.todo  === 'edit'){
-                    posturl = '/zoniot-water/cameraManage/update';
+                    posturl = '/sc-zoniot-water/cameraManage/update';
                 }else {
-                    posturl = '/zoniot-water/cameraManage/insert'
+                    posturl = '/sc-zoniot-water/cameraManage/insert'
                 }
                 this.formData.status = 1;
                 this.$http.post(posturl, this.formData).then(({ status, data, msg}) => {

+ 5 - 5
userCenter/src/views/sysManage/deviceManage/deviceManage.vue

@@ -165,7 +165,7 @@ export default {
     methods: {
         scrap(row){
              this.$msgBox(`确定要报废该设备?`, '报废后将无法正常接收数据,是否继续?').then(() => {
-                this.$http.get('/zoniot-water/device/edit/status', { id: row.id,state:'4'}).then(({ status, data, msg }) => {
+                this.$http.get('/sc-zoniot-water/device/edit/status', { id: row.id,state:'4'}).then(({ status, data, msg }) => {
                     if (status === 0) {
                         this.$message.success('状态修改成功');
                         this.mixins_search();
@@ -179,7 +179,7 @@ export default {
          * 获取设备列表页
          */
         getlistpage() {
-            this.mixins_dataUrl = '/zoniot-water/device/selectPage';
+            this.mixins_dataUrl = '/sc-zoniot-water/device/selectPage';
             this.mixins_pageset = {
                 pageNum: this.mixins_pageset.pageNum,
                 pageSize: this.mixins_pageset.pageSize
@@ -189,7 +189,7 @@ export default {
         },
         // 获取 设备型号
         deviceTypeIdoptionsFn() {
-            this.$http.postForm('/zoniot-water/devicetype/selectList', { name: '' }).then((data) => {
+            this.$http.postForm('/sc-zoniot-water/devicetype/selectList', { name: '' }).then((data) => {
                 this.deviceTypeIdoptions = data;
             });
         },
@@ -199,7 +199,7 @@ export default {
             new Promise((resolve) => {
                 if (tip === 'edit') {
                     title = '修改设备';
-                    this.$http.get('/zoniot-water/device/get', { id: item.id }).then(({ status, data, msg }) => {
+                    this.$http.get('/sc-zoniot-water/device/get', { id: item.id }).then(({ status, data, msg }) => {
                         if (status === 0) {
                             row = data;
                             this.$http
@@ -267,7 +267,7 @@ export default {
                 });
             }
             this.$msgBox(`确定要删除?`, '删除后将无法恢复,是否继续?').then(() => {
-                this.$http.get('/zoniot-water/device/batchDelete', { ids: ids.join(',') }).then(({ status, data, msg }) => {
+                this.$http.get('/sc-zoniot-water/device/batchDelete', { ids: ids.join(',') }).then(({ status, data, msg }) => {
                     if (status === 0) {
                         this.$message.success('删除成功');
                         this.mixins_search();

+ 3 - 3
userCenter/src/views/sysManage/deviceManage/popups/addOrEditDevice.vue

@@ -282,9 +282,9 @@ export default {
                 var loading = this.$loading();
                 var posturl = '';
                 if (this.params.todo === 'edit') {
-                    posturl = '/zoniot-water/device/edit';
+                    posturl = '/sc-zoniot-water/device/edit';
                 } else {
-                    posturl = '/zoniot-water/device/add';
+                    posturl = '/sc-zoniot-water/device/add';
                     // this.formData.deviceTypeId = this.formData.deviceTypeId[this.formData.deviceTypeId.length - 1];
                 }               
                 this.$http
@@ -480,7 +480,7 @@ export default {
             if(this.mapInputFilter){
                 this.$refs.querySearchAsyncInput.handleFocus();
             }else{
-                this.$http.post('/operation-manager/track/TaskTrack/convertXY', {
+                this.$http.post('/sc-operation-manager/track/TaskTrack/convertXY', {
                         "moveXY": this.getmoveXYVal,
                         "wkid": this.getWkidVal,
                         "xy": [`${this.inputlongitude},${this.inputlatitude}`]

+ 1 - 1
userCenter/src/views/sysManage/deviceManage/popups/addOrEditDeviceParm.vue

@@ -150,7 +150,7 @@ export default {
                 resolve();
             }).then(() => {
                 var loading = this.$loading();
-                var posturl = '/zoniot-water/deviceParm/batchEdit';
+                var posturl = '/sc-zoniot-water/deviceParm/batchEdit';
                 this.tableData.map(item=>{
                     item.remark = item.remark?item.remark:null;
                 })

+ 7 - 7
userCenter/src/views/sysManage/deviceManage/popups/addOrEditScene.vue

@@ -87,7 +87,7 @@
                     :headers="token"
                     :ref="'uploaduserlogo' + item.imageType"
                     class="mini-upload"
-                    action="/zoniot-water/scene/addSceneImage"
+                    action="/sc-zoniot-water/scene/addSceneImage"
                     list-type="picture-card"
                     multiple
                     :on-success="(response, file, fileList) => uploadsuccess(index, item, response, file, fileList)"
@@ -380,7 +380,7 @@ export default {
                     this.$refs.upload.submit(); // 提交调用uploadFile函数
                     this.fileData.append('pathId', fieldData.id); // 添加机构id
                     this.fileData.append('loginToken', this.loginToken); // 添加token
-                    this.$http.post('/zoniot-water/scene/addSceneImage', this.fileData).then((response) => {
+                    this.$http.post('/sc-zoniot-water/scene/addSceneImage', this.fileData).then((response) => {
                         if (response.data.code === 0) {
                             this.$message({
                                 message: '上传成功',
@@ -417,9 +417,9 @@ export default {
                 var loading = this.$loading();
                 var posturl = '';
                 if (this.params.todo === 'edit') {
-                    posturl = '/zoniot-water/scene/edit';
+                    posturl = '/sc-zoniot-water/scene/edit';
                 } else {
-                    posturl = '/zoniot-water/scene/add';
+                    posturl = '/sc-zoniot-water/scene/add';
                 }
                 this.formData.sceneImages = this.imagetypelist;
                 this.$http
@@ -506,7 +506,7 @@ export default {
         selectedSceneOrgIdfn() {
             // 获取 上级场景列表
             this.$http
-                .get('/zoniot-water/scene/selectListForParm', { comId: this.formData.companyOrgId, deptId: this.formData.deptOrgId })
+                .get('/sc-zoniot-water/scene/selectListForParm', { comId: this.formData.companyOrgId, deptId: this.formData.deptOrgId })
                 .then(({ status, data, msg }) => {
                     if (status === 0) {
                         this.allsceneType = data ? data : [];
@@ -534,7 +534,7 @@ export default {
         },
         parentChange(e) {
             this.scenetypeList = [];
-            this.$http.get('/zoniot-water/scenetype/selectListByParentId', { id: e }).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/scenetype/selectListByParentId', { id: e }).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.scenetypeList = data ? data : [];
                 } else {
@@ -628,7 +628,7 @@ export default {
             if(this.mapInputFilter){
                 this.$refs.querySearchAsyncInput.handleFocus();
             }else{
-                this.$http.post('/operation-manager/track/TaskTrack/convertXY', {
+                this.$http.post('/sc-operation-manager/track/TaskTrack/convertXY', {
                         "moveXY": this.getmoveXYVal,
                         "wkid": this.getWkidVal,
                         "xy": [`${this.inputlongitude},${this.inputlatitude}`]

+ 3 - 3
userCenter/src/views/sysManage/deviceManage/popups/bindDevice.vue

@@ -108,7 +108,7 @@ export default {
                 sceneId: row.sceneId,
                 deviceId: row.id
             };
-            this.$http.get('/zoniot-water/deviceParm/getBySceneAndDeviceId', { parentSceneId, sceneId, deviceId: id }).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/deviceParm/getBySceneAndDeviceId', { parentSceneId, sceneId, deviceId: id }).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.checkList = [];
                     this.paramsList = data;
@@ -124,7 +124,7 @@ export default {
             });
         },
         getList() {
-            this.$http.post('/zoniot-water/device/selectListByScene', this.mixins_query).then(({ status, data, msg }) => {
+            this.$http.post('/sc-zoniot-water/device/selectListByScene', this.mixins_query).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.mixins_list = data;
                     this.mixins_onQuery=false;
@@ -178,7 +178,7 @@ export default {
                     deviceParmInfos: submitDataArr
                 };
                 this.$http
-                    .post('/zoniot-water/deviceParm/batchSaveEdit', params)
+                    .post('/sc-zoniot-water/deviceParm/batchSaveEdit', params)
                     .then(({ status, data, msg }) => {
                         loading.close();
                         if (0 == status) {

+ 1 - 1
userCenter/src/views/sysManage/deviceManage/popups/mapmarkgis.vue

@@ -145,7 +145,7 @@ export default {
                 this.$refs.querySearchAsyncInput.handleFocus();
             } else {
                 this.$http
-                    .post('/operation-manager/track/TaskTrack/convertXY', {
+                    .post('/sc-operation-manager/track/TaskTrack/convertXY', {
                         moveXY: this.getmoveXYVal,
                         wkid: this.getWkidVal,
                         xy: [`${this.inputlongitude},${this.inputlatitude}`]

+ 2 - 2
userCenter/src/views/sysManage/deviceManage/popups/sceneManageDevicelist.vue

@@ -147,7 +147,7 @@ export default {
             this.$emit('changeisEntryPage', true);
         },
         getdevicelistpage() {
-            this.mixins_dataUrl = '/zoniot-water/device/selectPage';
+            this.mixins_dataUrl = '/sc-zoniot-water/device/selectPage';
             this.mixins_post = 'post';
             this.mixins_pageset = {
                 pageNum: this.mixins_pageset.pageNum,
@@ -168,7 +168,7 @@ export default {
                     // row = item;
                     // title = '修改场景';
                     this.$http
-                        .get('/zoniot-water/deviceParm/getBySceneDeviceId', { id: item.id, sceneId: item.sceneId })
+                        .get('/sc-zoniot-water/deviceParm/getBySceneDeviceId', { id: item.id, sceneId: item.sceneId })
                         .then(({ status, data, msg }) => {
                             if (status === 0) {
                                 row = data;

+ 7 - 7
userCenter/src/views/sysManage/deviceManage/sceneManage.vue

@@ -171,7 +171,7 @@ export default {
          * 获取设备列表页
          */
         getlistpage() {
-            this.mixins_dataUrl = '/zoniot-water/scene/selectPage';
+            this.mixins_dataUrl = '/sc-zoniot-water/scene/selectPage';
             this.mixins_pageset = {
                 pageNum: this.mixins_pageset.pageNum,
                 pageSize: this.mixins_pageset.pageSize
@@ -186,7 +186,7 @@ export default {
                 if (tip === 'edit') {
                     // row = item;
                     title = '修改场景';
-                    this.$http.get('/zoniot-water/scene/selectById', { id: item.id }).then(({ status, data, msg }) => {
+                    this.$http.get('/sc-zoniot-water/scene/selectById', { id: item.id }).then(({ status, data, msg }) => {
                         if (status === 0) {
                             let isExist = this.__calleArr(this.allServiceScene, data.parentSceneId, 'id');
                             data.parentSceneId = isExist ? data.parentSceneId : '';
@@ -197,7 +197,7 @@ export default {
                                     if (status === 0) {
                                         this.organListdepartment = data ? data : [];
                                         this.$http
-                                            .get('/zoniot-water/scene/selectListForParm', {
+                                            .get('/sc-zoniot-water/scene/selectListForParm', {
                                                 comId: row.companyOrgId,
                                                 deptId: row.deptOrgId
                                             })
@@ -212,7 +212,7 @@ export default {
                                                     });
                                                     current = current ? current : 0;
                                                     this.$http
-                                                        .get('/zoniot-water/scenetype/selectListByParentId', { id: current })
+                                                        .get('/sc-zoniot-water/scenetype/selectListByParentId', { id: current })
                                                         .then(({ status, data, msg }) => {
                                                             if (status === 0) {
                                                                 this.scenetypeList = data ? data : [];
@@ -281,7 +281,7 @@ export default {
                 });
             }
             this.$msgBox(`确定要删除?`, '删除后将无法恢复,是否继续?').then(() => {
-                this.$http.post('/zoniot-water/scene/deleteByIds', ids).then(({ status, data, msg }) => {
+                this.$http.post('/sc-zoniot-water/scene/deleteByIds', ids).then(({ status, data, msg }) => {
                     if (status === 0) {
                         this.$message.success('删除成功');
                         this.getlistpage();
@@ -319,7 +319,7 @@ export default {
         },
         // 获取场景树
         getscenetypeTreeList() {
-            this.$http.get('/zoniot-water/scenetype/selectList', { sceneTypeName: this.sceneName }).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/scenetype/selectList', { sceneTypeName: this.sceneName }).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     this.scenetypeList = data;
                 } else {
@@ -329,7 +329,7 @@ export default {
         },
         // 上级 场景
         getAllScene() {
-            this.$http.get('/zoniot-water/scene/selectList').then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/scene/selectList').then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.allServiceScene = data;
                 } else {

+ 4 - 4
userCenter/src/views/sysManage/deviceManage/sceneTypeManage.vue

@@ -76,7 +76,7 @@ export default {
     },
     methods: {
         getscenetypeTreeList() {
-            this.$http.get('/zoniot-water/scenetype/selectList', { sceneTypeName: this.sceneName }).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/scenetype/selectList', { sceneTypeName: this.sceneName }).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     this.scenetypeList = [{ children: data, sceneTypeName: '场景类型', id: 0 }];
                 } else {
@@ -86,7 +86,7 @@ export default {
         },
         treeClick(e) {
             this.treeClickdata = e;
-            this.$http.get('/zoniot-water/scenetype/selectListByParentId', { id: e.id }).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/scenetype/selectListByParentId', { id: e.id }).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.isShow = true;
                     if (data.length > 0) {
@@ -109,7 +109,7 @@ export default {
             if (!item.id) {
                 this.addlist.splice(idx, 1);
             } else {
-                this.$http.post('/zoniot-water/scenetype/deleteByIds', [item.id]).then(({ status, data, msg }) => {
+                this.$http.post('/sc-zoniot-water/scenetype/deleteByIds', [item.id]).then(({ status, data, msg }) => {
                     if (status === 0) {
                         if (item.id === this.treeClickdata.id) {
                             this.isShow = false;
@@ -149,7 +149,7 @@ export default {
             if (dataArr.length === 0) {
                 this.$message.error('请输入场景类型');
             }
-            this.$http.post('/zoniot-water/scenetype/batchAdd', dataArr).then(({ status, data, msg }) => {
+            this.$http.post('/sc-zoniot-water/scenetype/batchAdd', dataArr).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.getscenetypeTreeList();
                     this.treeClick(this.treeClickdata);

+ 3 - 3
userCenter/src/views/sysManage/revenueManagement/index.vue

@@ -162,7 +162,7 @@ export default {
         // 获取取水性质/waterProperty/select
         getwaterProperty() {
             this.cols[1].children = [this.cols[1].children[0]];
-            this.$http.get('/zoniot-water/waterProperty/select', { companyOrgId: this.mixins_query.companyOrgId }).then(({ status, msg, data }) => {
+            this.$http.get('/sc-zoniot-water/waterProperty/select', { companyOrgId: this.mixins_query.companyOrgId }).then(({ status, msg, data }) => {
                 if (status == 0 && data.length) {
                     data.map((item, index) => {
                         this.cols[1].children.push({
@@ -194,7 +194,7 @@ export default {
             });
         },
         exportExcel() {
-            this.$http.get('/zoniot-water/revenue/exportList', this.mixins_query).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/revenue/exportList', this.mixins_query).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     window.location.href = this.envConfig.baseExcelApi + data;
                 }
@@ -222,7 +222,7 @@ export default {
                 this.mixins_pageset.pageNum = 1;
             }
             let data = Object.assign({}, this.mixins_pageset, this.mixins_query);
-            this.$http.post('/zoniot-water/revenue/selectPage', data).then(({ status, data, msg }) => {
+            this.$http.post('/sc-zoniot-water/revenue/selectPage', data).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     this.mixins_pageset.total = data.total;
                     this.mixins_list = data.list;

+ 3 - 3
userCenter/src/views/sysManage/revenueManagement/popups/AddOrEdit.vue

@@ -115,7 +115,7 @@ export default {
     methods: {
         // 获取取水性质/waterProperty/select
         getwaterProperty() {
-            this.$http.get('/zoniot-water/waterProperty/select', { companyOrgId: this.companyOrgId }).then(({ status, msg, data }) => {
+            this.$http.get('/sc-zoniot-water/waterProperty/select', { companyOrgId: this.companyOrgId }).then(({ status, msg, data }) => {
                 if (status == 0 && data) {
                     let newData = [];
                     data.map((item, index) => {
@@ -136,11 +136,11 @@ export default {
                 this.formData.companyOrgId = this.companyOrgId;
                 let data = JSON.parse(JSON.stringify(this.formData)),
                     method = 'post',
-                    url = '/zoniot-water/revenue/addRevenue',
+                    url = '/sc-zoniot-water/revenue/addRevenue',
                     loading = this.$loading();
 
                 if ('edit' == this.params.todo) {
-                    url = '/zoniot-water/revenue/updateRevenue';
+                    url = '/sc-zoniot-water/revenue/updateRevenue';
                 }
                 this.$http[method](url, data)
                     .then(({ status, data, msg }) => {

+ 10 - 10
userCenter/src/views/sysManage/sysSet/index.vue

@@ -364,7 +364,7 @@ export default {
             }
             if(!this.cruID)return
             // 获取参数设置已有列表
-            this.$http.get('/zoniot-water/parmsetting/findList', { companyOrgId: this.cruID}).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/parmsetting/findList', { companyOrgId: this.cruID}).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.paramasUl = data.length>0?data:[{companyOrgId: e.id,parmType:"",parmValue:"",enableState:0}];
                 }
@@ -377,7 +377,7 @@ export default {
             }
             if(!this.cruID)return
             // 获取参数设置已有列表
-            this.$http.get('/zoniot-water/waterProperty/select', { companyOrgId: this.cruID}).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/waterProperty/select', { companyOrgId: this.cruID}).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.waterPropertyList = data.length>0?data:[{companyOrgId: e.id,propertyName :""}];
                 }
@@ -395,7 +395,7 @@ export default {
         },     
         delLine(item,i){
             this.paramasUl.splice(i,1)
-            // this.$http.postForm('/zoniot-water/parmsetting/deleteById', { id: item.id }).then(({ status, data, msg }) => {
+            // this.$http.postForm('/sc-zoniot-water/parmsetting/deleteById', { id: item.id }).then(({ status, data, msg }) => {
             //     if (0 === status) {
             //         this.$message.success("删除成功");
                     
@@ -419,7 +419,7 @@ export default {
             }
             if(!isnullExist)
             {           
-                this.$http.post('/zoniot-water/parmsetting/batchSave', this.paramasUl).then(({ status, data, msg }) => {
+                this.$http.post('/sc-zoniot-water/parmsetting/batchSave', this.paramasUl).then(({ status, data, msg }) => {
                     if (0 === status) {
                         this.$message.success("保存成功");
                         this.getParamsListByCompany();
@@ -438,7 +438,7 @@ export default {
             this.waterPropertyList.push({companyOrgId: this.cruID,propertyName :""})
         },
         deleteWaterLine(item,i){
-            this.$http.get('/zoniot-water/waterProperty/delete', { id: item.id }).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/waterProperty/delete', { id: item.id }).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message.success("删除成功");
                     this.waterPropertyList.splice(i,1)
@@ -448,7 +448,7 @@ export default {
             });
         },
         saveWaterProperty(){
-             this.$http.post('/zoniot-water/waterProperty/save', this.waterPropertyList).then(({ status, data, msg }) => {
+             this.$http.post('/sc-zoniot-water/waterProperty/save', this.waterPropertyList).then(({ status, data, msg }) => {
                 if (0 === status) {
                     this.$message.success("保存成功");
                     this.getWaterPropertyByCompany();
@@ -492,7 +492,7 @@ export default {
                 };
             }
 
-            this.$http.get('/zoniot-water/systemSetting/selectSystem', params).then(({ status, data, msg }) => {
+            this.$http.get('/sc-zoniot-water/systemSetting/selectSystem', params).then(({ status, data, msg }) => {
                 if (status === 0 && data) {
                     this.formData = data;
                 }
@@ -512,7 +512,7 @@ export default {
             new Promise((resolve) => {
                 this.$refs.form.validate(resolve);
             }).then(() => {
-                this.$http.post('/zoniot-water/systemSetting/saveSystem', { ...params, ...this.formData }).then(({ status, data, msg }) => {
+                this.$http.post('/sc-zoniot-water/systemSetting/saveSystem', { ...params, ...this.formData }).then(({ status, data, msg }) => {
                     if (status === 0) {
                         this.$message.success('保存成功');
                     } else {
@@ -531,7 +531,7 @@ export default {
             this.getselectGis();
         },
         getselectGis() {
-            this.mixins_dataUrl = '/zoniot-water/systemSetting/selectPageGis';
+            this.mixins_dataUrl = '/sc-zoniot-water/systemSetting/selectPageGis';
             this.mixins_pageset = {
                 pageNum: this.mixins_pageset.pageNum,
                 pageSize: this.mixins_pageset.pageSize
@@ -602,7 +602,7 @@ export default {
                     ids.push(v.id);
                 });
             }
-            this.$http.post('/zoniot-water/systemSetting/deleteByGisIds', ids).then(({ status, data, msg }) => {
+            this.$http.post('/sc-zoniot-water/systemSetting/deleteByGisIds', ids).then(({ status, data, msg }) => {
                 if (status === 0) {
                     this.$message.success('删除成功');
                     this.getselectGis();

+ 1 - 1
userCenter/src/views/sysManage/sysSet/popups/addOrEdit.vue

@@ -138,7 +138,7 @@ export default {
                     return;
                 }
                 var loading = this.$loading();
-                var posturl = '/zoniot-water/systemSetting/saveGis';
+                var posturl = '/sc-zoniot-water/systemSetting/saveGis';
                 this.$http
                     .post(posturl, newParamsList)
                     .then(({ status, data, msg }) => {

+ 3 - 3
userCenter/vue.config.js

@@ -92,7 +92,7 @@ module.exports = {
                     /* "^/api": "" */
                 }
             },
-            '/uims-message': {
+            '/sc-uims-message': {
                 target: envConfig.baseApi,
                 ws: true, // 代理的WebSockets
                 changeOrigin: true, // 允许websockets跨域
@@ -101,7 +101,7 @@ module.exports = {
                     /* "^/api": "" */
                 }
             },
-            '/operation-manager': {
+            '/sc-operation-manager': {
                 target: envConfig.baseApi,
                 ws: true, // 代理的WebSockets
                 changeOrigin: true, // 允许websockets跨域
@@ -110,7 +110,7 @@ module.exports = {
                     /* "^/api": "" */
                 }
             },
-            '/zoniot-water': {
+            '/sc-zoniot-water': {
                 target: envConfig.baseApi,
                 ws: true, // 代理的WebSockets
                 changeOrigin: true, // 允许websockets跨域