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

首页加载跳转到一体化页面按钮，根据拥有业务个数判断是否展示；业务导航点击按钮功能更改



See merge request !136

@@ -53,3 +53,6 @@ custom-class="config-dialog"
         transform: rotate(360deg)
         transform: rotate(360deg)
     }
     }
 }
 }
+.select-all .el-button{
+    height:42px;
+}

@@ -59,13 +59,22 @@
                             <i class="iconfont icon-shanchuwenjianjia"></i>
                             <i class="iconfont icon-shanchuwenjianjia"></i>
                             删除
                             删除
                         </el-button>
                         </el-button>
-                        <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle">
+                        <el-button  :size="$global.elementSize" @click="restore()" v-if="isRecycle">
                             <i class="iconfont icon-lunxun"></i>
                             <i class="iconfont icon-lunxun"></i>
                             还原
                             还原
                         </el-button>
                         </el-button>
 
 
                     </div>
                     </div>
+                    <div class="select-all">
+                        <el-button  type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" >
+                            {{selectText}}
+
+                        </el-button>
+
+
+                    </div>
                     <div style="text-align: right;width: 150px">
                     <div style="text-align: right;width: 150px">
+
                         <el-button-group>
                         <el-button-group>
                             <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''"
                             <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''"
                                        @click="activeModel('view')">
                                        @click="activeModel('view')">

@@ -185,6 +185,9 @@ export default {
         let activeBtn = Vue.ref('view');
         let activeBtn = Vue.ref('view');
         // // 当前展示视图
         // // 当前展示视图
         // let viewEdit = Vue.ref(false);
         // let viewEdit = Vue.ref(false);
+        //是否全选
+        let isAllSelect=Vue.ref(false);
+        let selectText=Vue.ref("全选")
 
 
         // 布局
         // 布局
         let layout = Vue.ref({
         let layout = Vue.ref({
@@ -695,6 +698,24 @@ export default {
                 getPage(props.viewTypeId);
                 getPage(props.viewTypeId);
             }
             }
         })
         })
+        let selectAll=()=>{
+            isAllSelect=!isAllSelect;
+            if(isAllSelect){
+                dataList.value.filter(function (v) {
+                    v.checked = false
+
+                })
+                proxy.selectText='全选';
+            }else{
+                dataList.value.filter(function (v) {
+                    v.checked = true
+
+                })
+                proxy.selectText='取消全选';
+
+            }
+
+        }
 
 
 
 
         return {
         return {
@@ -742,7 +763,10 @@ export default {
             isAdmin,
             isAdmin,
             reNameFile,
             reNameFile,
             reNameFileFlg,
             reNameFileFlg,
-            editType
+            editType,
+            selectAll,
+            isAllSelect,
+            selectText
 
 
         }
         }
     }
     }

@@ -43,11 +43,25 @@
                     <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
                     <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
                 </a>
                 </a>
             </li>
             </li>
+            <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/sxview/getbizListByUser?access_token={{localStorage.getItem('access_token')}}">
+
+                    {{# if(d.data.length>0){  }}
+                    <li class="layui-nav-item" >
+
+                    <div id="toYTHView_div" >
+                        <dd  layadmin-event="toYTHViewScreen" title="一体化控制台"><a><img src="/src/style/img/icon-yitihuadaping.png"  style="width: 16px;height: 16px"></a></dd>
+                    </div>
+                    </li>
+
+                    {{# } }}
+            </script>
+
             <li class="layui-nav-item" lay-unselect>
             <li class="layui-nav-item" lay-unselect>
                 <a href="javascript:;" layadmin-event="refresh" title="刷新">
                 <a href="javascript:;" layadmin-event="refresh" title="刷新">
                     <i class="layui-icon layui-icon-refresh-3"></i>
                     <i class="layui-icon layui-icon-refresh-3"></i>
                 </a>
                 </a>
             </li>
             </li>
+
         </ul>
         </ul>
         <img src="/src/style/img/logo-tj.png" class="logo">
         <img src="/src/style/img/logo-tj.png" class="logo">
         <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
         <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
@@ -311,6 +325,7 @@
             <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
             <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
             <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
             <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
             <div class="layui-icon layadmin-tabs-control layui-icon-down">
             <div class="layui-icon layadmin-tabs-control layui-icon-down">
+
                 <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
                 <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
                     <li class="layui-nav-item" lay-unselect>
                     <li class="layui-nav-item" lay-unselect>
                         <a href="javascript:;"></a>
                         <a href="javascript:;"></a>
@@ -322,9 +337,11 @@
                     </li>
                     </li>
                 </ul>
                 </ul>
             </div>
             </div>
-            <div style="padding:0 10px;float: left;">
-                <dd  layadmin-event="toYTHViewScreen" title="一体化控制台"><a><img src="/src/style/img/icon-yitihuadaping.png"  style="width: 16px;height: 16px"></a></dd>
-            </div>
+<!--            <script  type="text/html" template  lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/getUserByToken">-->
+
+<!--                <div id="toYTHView_div" style="padding:0 10px;float: left;">-->
+<!--                    <dd  layadmin-event="toYTHViewScreen" title="一体化控制台"><a><img src="/src/style/img/icon-yitihuadaping.png"  style="width: 16px;height: 16px"></a></dd>-->
+<!--                </div>-->
 
 
             <div class="layui-tab"   lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
             <div class="layui-tab"   lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
 
 
@@ -348,6 +365,7 @@
         </div>
         </div>
     </script>
     </script>
 
 
+
     <!-- 主体内容 -->
     <!-- 主体内容 -->
     <div class="layui-body" id="LAY_app_body">
     <div class="layui-body" id="LAY_app_body">
         <!-- 单页模式接入-->
         <!-- 单页模式接入-->

@@ -27,7 +27,7 @@
     flex: 1;
     flex: 1;
 }
 }
 .tabItem{
 .tabItem{
-    padding:0px 53px;
+    /*padding:0px 53px;*/
     border-bottom: 3px solid #1ac045;
     border-bottom: 3px solid #1ac045;
     background-color: #0c1532;
     background-color: #0c1532;
     border-radius: 3px;
     border-radius: 3px;
@@ -36,6 +36,8 @@
     cursor: pointer;
     cursor: pointer;
     font-family: "PingFang SC";
     font-family: "PingFang SC";
     box-sizing: border-box;
     box-sizing: border-box;
+    width: 170px;
+    justify-content: center;
     height: 40px;
     height: 40px;
     align-items: center;
     align-items: center;
     display: flex;
     display: flex;

@@ -79,8 +79,11 @@ export default {
             }
             }
             $.get(proxy.domainName +proxy.apiUrl1+'?access_token='+localStorage.getItem('access_token'),params,function (res) {
             $.get(proxy.domainName +proxy.apiUrl1+'?access_token='+localStorage.getItem('access_token'),params,function (res) {
                 if(res){
                 if(res){
-                    proxy.$global.showMsg("删除成功","warning")
-                    proxy.getData();
+                    proxy.$global.confirm("确认删除数据吗？", function () {
+                        proxy.$global.showMsg("删除成功","warning")
+                        proxy.getData();
+                    })
+
                 }
                 }
             })
             })
         }
         }

@@ -71,6 +71,9 @@ export default {
                     }else{
                     }else{
                         if(val=='left'){
                         if(val=='left'){
                             proxy.checkId=listArray[index-1]
                             proxy.checkId=listArray[index-1]
+                            if(index%5==0){
+                                proxy.preNext()
+                            }
                         }else{
                         }else{
 
 
                             // proxy.checkId=listArray[index+1]
                             // proxy.checkId=listArray[index+1]