Merge branch 'master-mj-yjp' into 'master-mj'

fix:巡检相关功能的迁移 See merge request !1086

Merge branch 'master-mj-yjp' into 'master-mj'
fix:巡检相关功能的迁移 See merge request !1086
王涛
Commit f59d070aca54a456bb06c1e5c27080477d14c9cd 2 parents 95b38776 a60b32a6
Showing 5 changed files with 20 additions and 16 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/inspectionTaskIndex.js
hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/doc.html
hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/index.html
hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/monitor.html
hg-monitor-web-qh/src/main/resources/application.yml
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/inspectionTaskIndex.js
View file @f59d070
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/inspectionTaskIndex.js
View file @f59d070
@@ -13,7 +13,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
     //对外暴露的接口
     exports('inspectionTaskIndex', function (data) {
         var sessions = layui.sessions;
-        var accessToken = sessions.getToken()['access_token'];
+        var accessToken = sessions.getToken()['accessToken'];
         var inspectionTaskTable;
         form.render();
         initTable();
@@ -40,7 +40,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         function initTable() {
             inspectionTaskTable = table.render({
                 elem: '#inspectionTask_table'
-                , url: domainName + '/api-web/inspectiontask/findPage?access_token=' + accessToken
+                , url: domainName + '/api-web/inspectiontask/findPage?accessToken=' + accessToken
                 , where: whereSearch()
                 , height: 'full-210'
                 , cellMinWidth: 80
@@ -270,7 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                             publishStatus = '0'
                         }
                         admin.req({
-                            url: domainName + '/api-web/inspectiontask/publishTask?access_token=' + accessToken,
+                            url: domainName + '/api-web/inspectiontask/publishTask?accessToken=' + accessToken,
                             type: 'get',
                             data: {taskId: taskId, publishStatus: publishStatus},
                             contentType: 'application/json',
@@ -465,13 +465,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         // 上传模板事件
         upload.render({
             elem: '#upload_tasktemp' //绑定元素
-            , url: common.domainName + '/api-web/inspectiontask/upload?access_token=' + accessToken //上传接口
+            , url: common.domainName + '/api-web/inspectiontask/upload?accessToken=' + accessToken //上传接口
             , accept: 'file' //允许上传的文件类型
             , exts: 'docx|doc'
             , multiple: false
             , before: function () {
                 layer.load(2);
-                this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId + '&access_token=' + accessToken;
+                this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId + '&accessToken=' + accessToken;
             }
             , done: function (res) {
                 layer.closeAll("loading");
@@ -492,7 +492,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         function sync(taskIds, elem) {
             layer.load(2);
             admin.req({
-                url: domainName + '/api-web/inspectiontask/sync?access_token=' + accessToken,
+                url: domainName + '/api-web/inspectiontask/sync?accessToken=' + accessToken,
                 type: 'get',
                 data: {taskIds: taskIds},
                 contentType: 'application/json',
@@ -521,7 +521,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         //获取巡检结果PDF
         function inspectionResultPDF(batchNo) {
             admin.req({
-                url: domainName + '/api-web/inspectiontask/getPdfPath?access_token=' + accessToken + '&batchNo=' + batchNo
+                url: domainName + '/api-web/inspectiontask/getPdfPath?accessToken=' + accessToken + '&batchNo=' + batchNo
             }).done(function (response) {
                 if ("success" == response.msg) {
                     window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
@@ -532,7 +532,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         function exec(taskId) {
             layer.load(2);
             admin.req({
-                url: domainName + '/api-web/inspectiontask/exec?access_token=' + accessToken,
+                url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken,
                 type: 'get',
                 data: {taskId: taskId},
                 contentType: 'application/json',
--- a/hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/doc.html
View file @f59d070
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/doc.html
View file @f59d070
 <title>文档管理</title>
 <script template type="text/html">
     {{#
-    var type = "";
+    var type = "fxbg";
     var a = "";
     layui.use(['sessions','common','admin'], function () {
     var $ = layui.$;
@@ -14,10 +14,12 @@
     }else if(type== 'fxbg'){
     $('li[lay-id="/iframe/insp/doc"] span').html('分析报告');
     }
+    }else{
+    type = 'fxbg'
     }
-
+    console.log(type);
     })
     }}
-    <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/document/index/show=0/id={{type}}/access_token={{localStorage.getItem('access_token')}}"
+    <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/document/index/show=0/id={{type}}/accessToken={{localStorage.getItem('accessToken')}}"
             frameborder="0" class="layadmin-iframe"></iframe>
 </script>
--- a/hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/index.html
View file @f59d070
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/index.html
View file @f59d070
 <title>巡检概览</title>
 <script template type="text/html">
-    <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/show=0/access_token={{localStorage.getItem('access_token')}}"
+    <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/show=0/accessToken={{localStorage.getItem('accessToken')}}"
             frameborder="0" class="layadmin-iframe"></iframe>
 </script>
--- a/hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/monitor.html
View file @f59d070
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/iframe/insp/monitor.html
View file @f59d070
@@ -14,10 +14,12 @@
     }else if(type== 'lxwh'){
     $('li[lay-id="/iframe/insp/monitor"] span').html('例行维护');
     }
+    }else{
+     type = 'yxjk'
     }
-
+    console.log(type);
     })
     }}
-    <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/monitor/index/show=0/reportType={{type}}/access_token={{localStorage.getItem('access_token')}}"
+    <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/monitor/index/show=0/reportType={{type}}/accessToken={{localStorage.getItem('accessToken')}}"
             frameborder="0" class="layadmin-iframe"></iframe>
 </script>
--- a/hg-monitor-web-qh/src/main/resources/application.yml
View file @f59d070
+++ b/hg-monitor-web-qh/src/main/resources/application.yml
View file @f59d070
@@ -12,8 +12,8 @@ server:
     key-password: Hg0801..
 url:
   gateway: http://127.0.0.1:7895
-  inspection_web: http://192.168.0.44:8082
-  assetsweb: http://192.168.0.44:8082
+  inspection_web: http://localhost:8082
+  assetsweb:  http://localhost:8082
   mxgraph_editor: http://192.168.0.44:8085
   tingyun: http://192.168.0.44:8088
   bigScreen: http://192.168.1.51:8081