monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit f59d070aca54a456bb06c1e5c27080477d14c9cd 2 parents 95b38776 a60b32a6

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

fix:巡检相关功能的迁移



See merge request !1086
Inline Side-by-side
Showing 5 changed files with 20 additions and 16 deletions
@@ -13,7 +13,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
13 //对外暴露的接口 13 //对外暴露的接口
14 exports('inspectionTaskIndex', function (data) { 14 exports('inspectionTaskIndex', function (data) {
15 var sessions = layui.sessions; 15 var sessions = layui.sessions;
16 - var accessToken = sessions.getToken()['access_token']; 16 + var accessToken = sessions.getToken()['accessToken'];
17 var inspectionTaskTable; 17 var inspectionTaskTable;
18 form.render(); 18 form.render();
19 initTable(); 19 initTable();
@@ -40,7 +40,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -40,7 +40,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
40 function initTable() { 40 function initTable() {
41 inspectionTaskTable = table.render({ 41 inspectionTaskTable = table.render({
42 elem: '#inspectionTask_table' 42 elem: '#inspectionTask_table'
43 - , url: domainName + '/api-web/inspectiontask/findPage?access_token=' + accessToken 43 + , url: domainName + '/api-web/inspectiontask/findPage?accessToken=' + accessToken
44 , where: whereSearch() 44 , where: whereSearch()
45 , height: 'full-210' 45 , height: 'full-210'
46 , cellMinWidth: 80 46 , cellMinWidth: 80
@@ -270,7 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -270,7 +270,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
270 publishStatus = '0' 270 publishStatus = '0'
271 } 271 }
272 admin.req({ 272 admin.req({
273 - url: domainName + '/api-web/inspectiontask/publishTask?access_token=' + accessToken, 273 + url: domainName + '/api-web/inspectiontask/publishTask?accessToken=' + accessToken,
274 type: 'get', 274 type: 'get',
275 data: {taskId: taskId, publishStatus: publishStatus}, 275 data: {taskId: taskId, publishStatus: publishStatus},
276 contentType: 'application/json', 276 contentType: 'application/json',
@@ -465,13 +465,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -465,13 +465,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
465 // 上传模板事件 465 // 上传模板事件
466 upload.render({ 466 upload.render({
467 elem: '#upload_tasktemp' //绑定元素 467 elem: '#upload_tasktemp' //绑定元素
468 - , url: common.domainName + '/api-web/inspectiontask/upload?access_token=' + accessToken //上传接口 468 + , url: common.domainName + '/api-web/inspectiontask/upload?accessToken=' + accessToken //上传接口
469 , accept: 'file' //允许上传的文件类型 469 , accept: 'file' //允许上传的文件类型
470 , exts: 'docx|doc' 470 , exts: 'docx|doc'
471 , multiple: false 471 , multiple: false
472 , before: function () { 472 , before: function () {
473 layer.load(2); 473 layer.load(2);
474 - this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId + '&access_token=' + accessToken; 474 + this.url = domainName + '/api-web/inspectiontask/upload?taskId=' + selectTaskId + '&accessToken=' + accessToken;
475 } 475 }
476 , done: function (res) { 476 , done: function (res) {
477 layer.closeAll("loading"); 477 layer.closeAll("loading");
@@ -492,7 +492,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -492,7 +492,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
492 function sync(taskIds, elem) { 492 function sync(taskIds, elem) {
493 layer.load(2); 493 layer.load(2);
494 admin.req({ 494 admin.req({
495 - url: domainName + '/api-web/inspectiontask/sync?access_token=' + accessToken, 495 + url: domainName + '/api-web/inspectiontask/sync?accessToken=' + accessToken,
496 type: 'get', 496 type: 'get',
497 data: {taskIds: taskIds}, 497 data: {taskIds: taskIds},
498 contentType: 'application/json', 498 contentType: 'application/json',
@@ -521,7 +521,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -521,7 +521,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
521 //获取巡检结果PDF 521 //获取巡检结果PDF
522 function inspectionResultPDF(batchNo) { 522 function inspectionResultPDF(batchNo) {
523 admin.req({ 523 admin.req({
524 - url: domainName + '/api-web/inspectiontask/getPdfPath?access_token=' + accessToken + '&batchNo=' + batchNo 524 + url: domainName + '/api-web/inspectiontask/getPdfPath?accessToken=' + accessToken + '&batchNo=' + batchNo
525 }).done(function (response) { 525 }).done(function (response) {
526 if ("success" == response.msg) { 526 if ("success" == response.msg) {
527 window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath)); 527 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', @@ -532,7 +532,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
532 function exec(taskId) { 532 function exec(taskId) {
533 layer.load(2); 533 layer.load(2);
534 admin.req({ 534 admin.req({
535 - url: domainName + '/api-web/inspectiontask/exec?access_token=' + accessToken, 535 + url: domainName + '/api-web/inspectiontask/exec?accessToken=' + accessToken,
536 type: 'get', 536 type: 'get',
537 data: {taskId: taskId}, 537 data: {taskId: taskId},
538 contentType: 'application/json', 538 contentType: 'application/json',
1 <title>文档管理</title> 1 <title>文档管理</title>
2 <script template type="text/html"> 2 <script template type="text/html">
3 {{# 3 {{#
4 - var type = ""; 4 + var type = "fxbg";
5 var a = ""; 5 var a = "";
6 layui.use(['sessions','common','admin'], function () { 6 layui.use(['sessions','common','admin'], function () {
7 var $ = layui.$; 7 var $ = layui.$;
@@ -14,10 +14,12 @@ @@ -14,10 +14,12 @@
14 }else if(type== 'fxbg'){ 14 }else if(type== 'fxbg'){
15 $('li[lay-id="/iframe/insp/doc"] span').html('分析报告'); 15 $('li[lay-id="/iframe/insp/doc"] span').html('分析报告');
16 } 16 }
  17 + }else{
  18 + type = 'fxbg'
17 } 19 }
18 - 20 + console.log(type);
19 }) 21 })
20 }} 22 }}
21 - <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/document/index/show=0/id={{type}}/access_token={{localStorage.getItem('access_token')}}" 23 + <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/document/index/show=0/id={{type}}/accessToken={{localStorage.getItem('accessToken')}}"
22 frameborder="0" class="layadmin-iframe"></iframe> 24 frameborder="0" class="layadmin-iframe"></iframe>
23 </script> 25 </script>
1 <title>巡检概览</title> 1 <title>巡检概览</title>
2 <script template type="text/html"> 2 <script template type="text/html">
3 - <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/show=0/access_token={{localStorage.getItem('access_token')}}" 3 + <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/show=0/accessToken={{localStorage.getItem('accessToken')}}"
4 frameborder="0" class="layadmin-iframe"></iframe> 4 frameborder="0" class="layadmin-iframe"></iframe>
5 </script> 5 </script>
6 6
@@ -14,10 +14,12 @@ @@ -14,10 +14,12 @@
14 }else if(type== 'lxwh'){ 14 }else if(type== 'lxwh'){
15 $('li[lay-id="/iframe/insp/monitor"] span').html('例行维护'); 15 $('li[lay-id="/iframe/insp/monitor"] span').html('例行维护');
16 } 16 }
  17 + }else{
  18 + type = 'yxjk'
17 } 19 }
18 - 20 + console.log(type);
19 }) 21 })
20 }} 22 }}
21 - <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/monitor/index/show=0/reportType={{type}}/access_token={{localStorage.getItem('access_token')}}" 23 + <iframe src="{{sessionStorage.getItem('domainInspectionURI')}}/start/index.html#/monitor/index/show=0/reportType={{type}}/accessToken={{localStorage.getItem('accessToken')}}"
22 frameborder="0" class="layadmin-iframe"></iframe> 24 frameborder="0" class="layadmin-iframe"></iframe>
23 </script> 25 </script>
@@ -12,8 +12,8 @@ server: @@ -12,8 +12,8 @@ server:
12 key-password: Hg0801.. 12 key-password: Hg0801..
13 url: 13 url:
14 gateway: http://127.0.0.1:7895 14 gateway: http://127.0.0.1:7895
15 - inspection_web: http://192.168.0.44:8082  
16 - assetsweb: http://192.168.0.44:8082 15 + inspection_web: http://localhost:8082
  16 + assetsweb: http://localhost:8082
17 mxgraph_editor: http://192.168.0.44:8085 17 mxgraph_editor: http://192.168.0.44:8085
18 tingyun: http://192.168.0.44:8088 18 tingyun: http://192.168.0.44:8088
19 bigScreen: http://192.168.1.51:8081 19 bigScreen: http://192.168.1.51:8081