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

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



See merge request !143

@@ -65,7 +65,7 @@
                         </el-button>
 
                     </div>
-                    <div class="select-all">
+                    <div class="select-all" v-if="isSelect">
                         <el-button  type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" >
                             {{selectText}}
 
@@ -73,7 +73,7 @@
 
 
                     </div>
-                   <!-- <div style="text-align: right;width: 150px">
+                    <div style="text-align: right;width: 150px">
 
                         <el-button-group>
                             <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''"
@@ -85,7 +85,7 @@
                                 <i class="iconfont icon-liebiao"></i>
                             </el-button>
                         </el-button-group>
-                    </div>-->
+                    </div>
                 </div>
                 <!--列表-->
                 <div v-if="activeBtn == 'list'">

@@ -42,6 +42,11 @@ export default {
             type: Boolean,
             default: false
         },
+        //是否展示全选按钮
+        isSelect:{
+            type:Boolean,
+            default:false
+        }
     },
     data() {
         return {

@@ -55,6 +55,9 @@
 
                     {{# } }}
             </script>
+            <li class="layui-nav-item" lay-tips="大屏">
+                <a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>
+            </li>
 
             <li class="layui-nav-item" lay-unselect>
                 <a href="javascript:;" layadmin-event="refresh" title="刷新">
@@ -84,7 +87,8 @@
                     }}
                     <li><input type="hidden" id="hq_entrance" value="{{roles}}"></li>
                     <dl class="layui-nav-child">
-                        <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>
+                        <!--调整到刷新旁边，此处去掉  lu 屏蔽 20211130-->
+                        <!-- <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>-->
                         <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>
                         <!--调整到首页旁边，此处去掉  joke 屏蔽 20211129-->
 <!--                        <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 @@
                             <cm-table-page :columns="columns" :dataList="tabSecondList" @loaddata="loadSecondList"
                                            :showIndex="true"
                                            :showBorder="true" :loading="false"
-                                           :showPage="false" :showTools="true" :height="(height - 500)">
+                                           :showPage="true" :showTools="true" :height="(height - 500)">
                                 <template #tools="{scope}">
                                     <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">
                                         <i class="el-icon-plus"/> 添加

 <div class="container">
-	<cm-document></cm-document>
+	<cm-document  :isSelect="true"></cm-document>
 </div>

@@ -181,7 +181,8 @@ export default {
             }
         }
         const goJump=()=>{
-            proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token')}})
+            // proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token')}})
+            window.open(sessionStorage.getItem("ythView") + '?access_token=' + localStorage.getItem("access_token"));
         }
 
         return{