monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit bb30d764655f83f0c79493de6ef5a08c62105b43 2 parents 5f0c6afc 405c7099

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

AJ配置信息



See merge request !418
Inline Side-by-side
Showing 5 changed files with 52 additions and 20 deletions
@@ -1381,15 +1381,31 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -1381,15 +1381,31 @@ layui.define(['xmSelect', 'md5'], function (exports) {
1381 } 1381 }
1382 }); 1382 });
1383 }, 1383 },
1384 - viewAjView: function (reportCode,height,width,title) { 1384 + viewAjView: function (reportCode,height,width) {
1385 layer.load(2); 1385 layer.load(2);
1386 - layer.open({  
1387 - type: 2,  
1388 - content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + reportCode+"?access_token=" + localStorage.getItem('access_token'),  
1389 - area: [height, width],  
1390 - title: title 1386 + admin.req({
  1387 + url: obj.domainName + '/api-web/ajConfig/findOneById',
  1388 + data: {id:reportCode},
  1389 + success(response) {
  1390 + layer.closeAll('loading');
  1391 + if (response && response.success) {
  1392 + layer.open({
  1393 + type: 2,
  1394 + content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + response.object.designPage + response.object.param+"&access_token=" + localStorage.getItem('access_token'),
  1395 + area: [height, width],
  1396 + title: response.object.title
  1397 + });
  1398 + } else {
  1399 + layer.open({
  1400 + type: 2,
  1401 + content: obj.ajScreenStatement + "/#/bigscreen/viewer?reportCode=" + reportCode+"&access_token=" + localStorage.getItem('access_token'),
  1402 + area: [height, width],
  1403 + title: ''
  1404 + });
  1405 + layer.closeAll('loading');
  1406 + }
  1407 + }
1391 }); 1408 });
1392 - layer.closeAll('loading');  
1393 }, 1409 },
1394 viewBizTopo: function (busId) { 1410 viewBizTopo: function (busId) {
1395 layer.load(2); 1411 layer.load(2);
@@ -202,7 +202,6 @@ layui.extend({ @@ -202,7 +202,6 @@ layui.extend({
202 ,container = view(setter.container) 202 ,container = view(setter.container)
203 ,pathURL = admin.correctRouter(router.path.join('/')) 203 ,pathURL = admin.correctRouter(router.path.join('/'))
204 ,isIndPage; 204 ,isIndPage;
205 -debugger  
206 //检查是否属于独立页面 205 //检查是否属于独立页面
207 layui.each(setter.indPage, function(index, item){ 206 layui.each(setter.indPage, function(index, item){
208 if(pathURL === item){ 207 if(pathURL === item){
@@ -221,9 +221,9 @@ global.viewResTopo = (resId) => { @@ -221,9 +221,9 @@ global.viewResTopo = (resId) => {
221 /** 221 /**
222 * aj报表预览 222 * aj报表预览
223 */ 223 */
224 -global.viewAjView = (reportCode,height,width,title) => { 224 +global.viewAjView = (reportCode,height,width) => {
225 let lyaui = global.layui; 225 let lyaui = global.layui;
226 - lyaui.common.viewAjView(reportCode,height,width,title) 226 + lyaui.common.viewAjView(reportCode,height,width)
227 } 227 }
228 /** 228 /**
229 * 打开资产列表 229 * 打开资产列表
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <i class="el-icon-edit-outline" title="修改" @click="handleUpdate(scope.row)"></i> 42 <i class="el-icon-edit-outline" title="修改" @click="handleUpdate(scope.row)"></i>
43 </span> 43 </span>
44 <span class="icon-bg"> 44 <span class="icon-bg">
45 - <i class="el-icon-view" title="预览" @click="handleView(scope.row)"></i> 45 + <i class="el-icon-view" title="预览" @click="preview(scope.row)"></i>
46 </span> 46 </span>
47 </div> 47 </div>
48 </template> 48 </template>
@@ -71,14 +71,17 @@ @@ -71,14 +71,17 @@
71 <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio> 71 <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio>
72 <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio> 72 <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio>
73 <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio> 73 <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio>
74 - <div>  
75 - <span>示例：12345646 说明：12132123</span>  
76 - </div> 74 +<!-- <div style="height: 15px; color: darkgrey">说明：参数中间用'&'拼接</div>-->
77 </el-form-item> 75 </el-form-item>
78 76
79 77
80 <el-form-item label="父菜单" prop="menuPid" v-if="ajConfigFrom.type==0"> 78 <el-form-item label="父菜单" prop="menuPid" v-if="ajConfigFrom.type==0">
81 - <el-select v-model="ajConfigFrom.menuPid" placeholder="请选择" style="width: 555px;"> 79 + <el-select v-model="ajConfigFrom.menuPid"
  80 + filterable
  81 + allow-create
  82 + default-first-option
  83 + :reserve-keyword="false"
  84 + placeholder="请选择" style="width: 555px;">
82 <el-option 85 <el-option
83 v-for="item in menuOptions" 86 v-for="item in menuOptions"
84 :key="item.value" 87 :key="item.value"
@@ -93,8 +96,17 @@ @@ -93,8 +96,17 @@
93 <el-input :size="$global.elementSize" v-model="ajConfigFrom.menuName" clearable></el-input> 96 <el-input :size="$global.elementSize" v-model="ajConfigFrom.menuName" clearable></el-input>
94 </el-form-item> 97 </el-form-item>
95 98
  99 + <el-form-item label="菜单标题" prop="title" v-if="ajConfigFrom.type==1">
  100 + <el-input :size="$global.title" v-model="ajConfigFrom.title" clearable></el-input>
  101 + </el-form-item>
  102 +
96 <el-form-item label="设计页面" prop="designPage"> 103 <el-form-item label="设计页面" prop="designPage">
97 - <el-select v-model="ajConfigFrom.designPage" placeholder="请选择" style="width: 510px;"> 104 + <el-select v-model="ajConfigFrom.designPage"
  105 + filterable
  106 + allow-create
  107 + default-first-option
  108 + :reserve-keyword="false"
  109 + placeholder="请选择" style="width: 510px;">
98 <el-option 110 <el-option
99 v-for="item in options" 111 v-for="item in options"
100 :key="item.value" 112 :key="item.value"
@@ -103,12 +115,12 @@ @@ -103,12 +115,12 @@
103 :disabled="item.disabled"> 115 :disabled="item.disabled">
104 </el-option> 116 </el-option>
105 </el-select> 117 </el-select>
106 - <el-tag @click="preview(ajConfigFrom.designPage)" :size="large">预览</el-tag> 118 + <el-tag @click="preview(ajConfigFrom.designPage)" style="padding-top:4px;height: 38px;">预览</el-tag>
107 </el-form-item> 119 </el-form-item>
108 120
109 <el-form-item label="传递参数" prop="param"> 121 <el-form-item label="传递参数" prop="param">
110 <el-input :size="$global.elementSize" v-model="ajConfigFrom.param" clearable></el-input> 122 <el-input :size="$global.elementSize" v-model="ajConfigFrom.param" clearable></el-input>
111 - <span>示例：12345646 说明：12132123</span> 123 + <div style="height: 15px;color: darkgrey">示例：&test=1&test1=1 说明：'&'开头,并且参数中间用'&'拼接</div>
112 </el-form-item> 124 </el-form-item>
113 125
114 <el-form-item label="资源类型" prop="resType" v-if="ajConfigFrom.type==2"> 126 <el-form-item label="资源类型" prop="resType" v-if="ajConfigFrom.type==2">
@@ -137,7 +137,6 @@ export default { @@ -137,7 +137,6 @@ export default {
137 msg = res.msg; 137 msg = res.msg;
138 cacheVisible.value=false; 138 cacheVisible.value=false;
139 proxy.$global.showMsg(msg); 139 proxy.$global.showMsg(msg);
140 - debugger  
141 if (params.type==0){ 140 if (params.type==0){
142 window.history.go(0); 141 window.history.go(0);
143 } 142 }
@@ -199,7 +198,13 @@ export default { @@ -199,7 +198,13 @@ export default {
199 198
200 //预览 199 //预览
201 let preview=(row)=>{ 200 let preview=(row)=>{
202 - proxy.$global.viewAjView(row,'80%','80%',''); 201 + if (row!=undefined&&row!=''&&row.id==''){
  202 + proxy.$global.viewAjView(row,'80%','80%');
  203 + }else if (row.id!=''){
  204 + proxy.$global.viewAjView(row.id,'80%','80%');
  205 + }
  206 +
  207 +
203 } 208 }
204 209
205 //aj报表管理信息 210 //aj报表管理信息