monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 21752872b8f988b9158224a11e6d7d2c9ebc7de0 2 parents f493ed5e 7f451b29

Merge branch 'master-v32-lushangqing' into 'master' 

监控大屏增加跳转电子税务局大屏(新打开一个页签)



See merge request !143
Inline Side-by-side
Showing 6 changed files with 17 additions and 7 deletions
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </el-button> 65 </el-button>
66 66
67 </div> 67 </div>
68 - <div class="select-all"> 68 + <div class="select-all" v-if="isSelect">
69 <el-button type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" > 69 <el-button type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" >
70 {{selectText}} 70 {{selectText}}
71 71
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 73
74 74
75 </div> 75 </div>
76 - <!-- <div style="text-align: right;width: 150px"> 76 + <div style="text-align: right;width: 150px">
77 77
78 <el-button-group> 78 <el-button-group>
79 <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''" 79 <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''"
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 <i class="iconfont icon-liebiao"></i> 85 <i class="iconfont icon-liebiao"></i>
86 </el-button> 86 </el-button>
87 </el-button-group> 87 </el-button-group>
88 - </div>--> 88 + </div>
89 </div> 89 </div>
90 <!--列表--> 90 <!--列表-->
91 <div v-if="activeBtn == 'list'"> 91 <div v-if="activeBtn == 'list'">
@@ -42,6 +42,11 @@ export default { @@ -42,6 +42,11 @@ export default {
42 type: Boolean, 42 type: Boolean,
43 default: false 43 default: false
44 }, 44 },
  45 + //是否展示全选按钮
  46 + isSelect:{
  47 + type:Boolean,
  48 + default:false
  49 + }
45 }, 50 },
46 data() { 51 data() {
47 return { 52 return {
@@ -55,6 +55,9 @@ @@ -55,6 +55,9 @@
55 55
56 {{# } }} 56 {{# } }}
57 </script> 57 </script>
  58 + <li class="layui-nav-item" lay-tips="大屏">
  59 + <a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>
  60 + </li>
58 61
59 <li class="layui-nav-item" lay-unselect> 62 <li class="layui-nav-item" lay-unselect>
60 <a href="javascript:;" layadmin-event="refresh" title="刷新"> 63 <a href="javascript:;" layadmin-event="refresh" title="刷新">
@@ -84,7 +87,8 @@ @@ -84,7 +87,8 @@
84 }} 87 }}
85 <li><input type="hidden" id="hq_entrance" value="{{roles}}"></li> 88 <li><input type="hidden" id="hq_entrance" value="{{roles}}"></li>
86 <dl class="layui-nav-child"> 89 <dl class="layui-nav-child">
87 - <dd layadmin-event="toBigScreen" style="text-align: left;"><a><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px">&nbsp;&nbsp;大屏</a></dd> 90 + <!--调整到刷新旁边，此处去掉 lu 屏蔽 20211130-->
  91 + <!-- <dd layadmin-event="toBigScreen" style="text-align: left;"><a><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px">&nbsp;&nbsp;大屏</a></dd>-->
88 <dd layadmin-event="toDZSWJScreen" style="text-align: left;"><a><img src="/src/style/img/icon-dianzishuiwuju.png" style="width: 16px;height: 16px">&nbsp;&nbsp;电子税务大屏</a></dd> 92 <dd layadmin-event="toDZSWJScreen" style="text-align: left;"><a><img src="/src/style/img/icon-dianzishuiwuju.png" style="width: 16px;height: 16px">&nbsp;&nbsp;电子税务大屏</a></dd>
89 <!--调整到首页旁边，此处去掉 joke 屏蔽 20211129--> 93 <!--调整到首页旁边，此处去掉 joke 屏蔽 20211129-->
90 <!-- <dd layadmin-event="toYTHViewScreen" style="text-align: left;"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px">&nbsp;&nbsp;一体化视图</a></dd>--> 94 <!-- <dd layadmin-event="toYTHViewScreen" style="text-align: left;"><a><img src="/src/style/img/icon-yitihuadaping.png" style="width: 16px;height: 16px">&nbsp;&nbsp;一体化视图</a></dd>-->
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 <cm-table-page :columns="columns" :dataList="tabSecondList" @loaddata="loadSecondList" 113 <cm-table-page :columns="columns" :dataList="tabSecondList" @loaddata="loadSecondList"
114 :showIndex="true" 114 :showIndex="true"
115 :showBorder="true" :loading="false" 115 :showBorder="true" :loading="false"
116 - :showPage="false" :showTools="true" :height="(height - 500)"> 116 + :showPage="true" :showTools="true" :height="(height - 500)">
117 <template #tools="{scope}"> 117 <template #tools="{scope}">
118 <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> 118 <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">
119 <i class="el-icon-plus"/> 添加 119 <i class="el-icon-plus"/> 添加
1 <div class="container"> 1 <div class="container">
2 - <cm-document></cm-document> 2 + <cm-document :isSelect="true"></cm-document>
3 </div> 3 </div>
@@ -181,7 +181,8 @@ export default { @@ -181,7 +181,8 @@ export default {
181 } 181 }
182 } 182 }
183 const goJump=()=>{ 183 const goJump=()=>{
184 - proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token')}}) 184 + // proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token')}})
  185 + window.open(sessionStorage.getItem("ythView") + '?access_token=' + localStorage.getItem("access_token"));
185 } 186 }
186 187
187 return{ 188 return{