Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-XuHaoJie

@@ -1308,7 +1308,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                 linechart.on('click', function (v) {
                 linechart.on('click', function (v) {
                     var params = {
                     var params = {
                         resId: resId,
                         resId: resId,
-                        kpiId: kpiId.split(',').length==0?kpiId:kpiId.split(',')[v.componentIndex],  //当kpiId为多个时，点击时获取对应kpiId
+                        kpiId: kpiId,
                         flag: data.series[v.componentIndex].flag,
                         flag: data.series[v.componentIndex].flag,
                         warning: false,
                         warning: false,
                         ident: true,
                         ident: true,

@@ -100,7 +100,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                            , {
                            , {
                                 field: 'createTime', title: '创建时间', align: 'center', sort: true,
                                 field: 'createTime', title: '创建时间', align: 'center', sort: true,
                                 templet: function (d) {
                                 templet: function (d) {
-                                    debugger
+
                                  // return   new Date(parseInt(d.createTime) * 1000).toLocaleString().replace(/:\d{1,2}$/,' ');
                                  // return   new Date(parseInt(d.createTime) * 1000).toLocaleString().replace(/:\d{1,2}$/,' ');
                                   return   layui.util.toDateString(d.createTime*1000, 'yyyy-MM-dd HH:mm:ss');
                                   return   layui.util.toDateString(d.createTime*1000, 'yyyy-MM-dd HH:mm:ss');
                                 }
                                 }

@@ -140,10 +140,17 @@ layui.extend({
         if(setter.pageTabs && pathURL !== '/'){
         if(setter.pageTabs && pathURL !== '/'){
         if(!matchTo){
         if(!matchTo){
             var tabName='' // tab标签名
             var tabName='' // tab标签名
-            var url=pathURL.substring(1)
             tabList.forEach((e) =>{
             tabList.forEach((e) =>{
-                if(url === e.path){
-                    tabName=e.name
+                var url = e.path;
+                if(url && !url.startsWith('/')){
+                    url = '/'+url;
+                }
+                if(pathURL && !pathURL.startsWith('/')){
+                    pathURL = '/'+pathURL;
+                }
+
+                 if(url && url.indexOf(pathURL) != -1){
+                     tabName = e.name
                  }
                  }
             });
             });
             if(!tabName){
             if(!tabName){

 <title>设计器预览</title>
 <title>设计器预览</title>
 <script type="text/html" template>
 <script type="text/html" template>
     {{#
     {{#
+
+
     var viewURL =  window.location.origin + '/vue3/index.html#/ajConfig/view';
     var viewURL =  window.location.origin + '/vue3/index.html#/ajConfig/view';
         layui.use(['sessions','common','admin'], function () {
         layui.use(['sessions','common','admin'], function () {
         var $ = layui.$;
         var $ = layui.$;

@@ -24,6 +24,7 @@ export default {
                 if (res && res.success == true) {
                 if (res && res.success == true) {
                     params=res.object.param;
                     params=res.object.param;
                     designPage=res.object.designPage;
                     designPage=res.object.designPage;
+
                 }
                 }
                 getSrc.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+designPage+params+'&access_token=' + localStorage.getItem("access_token");
                 getSrc.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+designPage+params+'&access_token=' + localStorage.getItem("access_token");
 
 

@@ -235,7 +235,7 @@ export default {
          */
          */
         let deleteItem = (row,index) =>{
         let deleteItem = (row,index) =>{
             proxy.$global.confirm("将永久删除该配置选项，请确认！", function () {
             proxy.$global.confirm("将永久删除该配置选项，请确认！", function () {
-                debugger
+
                 proxy.$http.get(`/api-web/alarmsubscribe/exclude/delete/${row.id}`, {}, function (res) {
                 proxy.$http.get(`/api-web/alarmsubscribe/exclude/delete/${row.id}`, {}, function (res) {
                     if (res && res.success) {
                     if (res && res.success) {
                         proxy.$global.showMsg('保存成功！');
                         proxy.$global.showMsg('保存成功！');

@@ -415,7 +415,7 @@ export default {
         let getPageInfo = ({page, limit}) => {
         let getPageInfo = ({page, limit}) => {
             searchForm.value.page = page;
             searchForm.value.page = page;
             searchForm.value.pageSize = limit;
             searchForm.value.pageSize = limit;
-debugger
+
             // 下一页搜索
             // 下一页搜索
             getPage();
             getPage();
         }
         }

@@ -415,7 +415,7 @@ export default {
         let getPageInfo = ({page, limit}) => {
         let getPageInfo = ({page, limit}) => {
             searchForm.value.page = page;
             searchForm.value.page = page;
             searchForm.value.pageSize = limit;
             searchForm.value.pageSize = limit;
-debugger
+
             // 下一页搜索
             // 下一页搜索
             getPage();
             getPage();
         }
         }