Merge branch 'master-v32-xwx' into 'master'

杭州-大屏-地图左上角名称



See merge request !183

@@ -3457,6 +3457,7 @@ grayColor{
     display: flex;
     display: flex;
 }
 }
 
 
+
 .machineroom-info  .room-info-item .ip-info-title-left span{
 .machineroom-info  .room-info-item .ip-info-title-left span{
     font-size: 20px;
     font-size: 20px;
     margin-left: 10px;
     margin-left: 10px;

@@ -46,7 +46,7 @@
             <!--判定是否有daping角色，如果有则显示该菜单 joke add 20211203-->
             <!--判定是否有daping角色，如果有则显示该菜单 joke add 20211203-->
             <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/checkHasRole?roleCode=daping">
             <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/checkHasRole?roleCode=daping">
                 {{# if(d.count > 0){  }}
                 {{# if(d.count > 0){  }}
-                <li class="layui-nav-item" lay-tips="大屏">
+                <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>
                     <a href="javascript:;" layadmin-event="toBigScreen" ><img src="/src/style/img/icon-daping.png" style="width: 16px;height: 16px"></a>
                 </li>
                 </li>
                 {{# } }}
                 {{# } }}

@@ -46,6 +46,14 @@
     left: 1%;
     left: 1%;
     top: 55%;
     top: 55%;
 }
 }
+.screen-header .title-right{
+    display: flex;
+    align-items: center;
+    position:absolute;
+    transform: translateY(-80%);
+    right: 1%;
+    top: 55%;
+}
 .screen-header .timelog{
 .screen-header .timelog{
     cursor: pointer;
     cursor: pointer;
 }
 }

@@ -108,7 +108,7 @@ table td .cabinetId{
 }
 }
 .outlinediv .xiaoshanseven-rightcabinet{
 .outlinediv .xiaoshanseven-rightcabinet{
     margin-left: 5px;
     margin-left: 5px;
-    width: 40%;
+    width: 49%;
 }
 }
 .outlinediv .xiaoshanseven-middlecabinet{
 .outlinediv .xiaoshanseven-middlecabinet{
     margin-top: 20px;
     margin-top: 20px;

@@ -8,6 +8,9 @@
             <img src="/vue3/src/assets/images/digitalDp/icon-time.png" :style="timelogoStyle" class="timelog">
             <img src="/vue3/src/assets/images/digitalDp/icon-time.png" :style="timelogoStyle" class="timelog">
             <span :style="datetimeStyle" >{{dateTime}}</span>
             <span :style="datetimeStyle" >{{dateTime}}</span>
         </div>
         </div>
+        <div class="title-right">
+            <img @click="goDP" router-link to='/daping' id="goDP" src="/vue3/src/assets/images/zjdp/icon-return.png"  class="img-link" style="display:none; height:30px">
+        </div>
     </header>
     </header>
     <div class="screen-body">
     <div class="screen-body">
         <section class="screen-left" >
         <section class="screen-left" >

@@ -48,6 +48,15 @@ export default {
             () => myImport('views/dp/components/deduction/index')
             () => myImport('views/dp/components/deduction/index')
         ),
         ),
     },
     },
+    setup(props, {attrs, slots, emit}) {
+        const {proxy} = Vue.getCurrentInstance();
+        const goDP=()=>{
+            proxy.$router.push({path:'/zjdaping',query: {access_token:localStorage.getItem('access_token')}})
+        }
+        return{
+            goDP
+        }
+    },
     data () {
     data () {
         return {
         return {
             titleFontSize: 30,
             titleFontSize: 30,
@@ -119,7 +128,11 @@ export default {
         },1000);
         },1000);
 
 
         window.addEventListener('resize', this.screenAdapter)
         window.addEventListener('resize', this.screenAdapter)
-        this.screenAdapter()
+        this.screenAdapter();
+
+        if (this.$route.query.msgKey){
+            document.getElementById("goDP").style.display="block"
+        }
     },
     },
     unmounted () {
     unmounted () {
         window.removeEventListener('resize', this.screenAdapter)
         window.removeEventListener('resize', this.screenAdapter)

@@ -18,7 +18,7 @@ export default {
         return {
         return {
             timer:null,
             timer:null,
             domainName:sessionStorage.getItem('domainName'),
             domainName:sessionStorage.getItem('domainName'),
-            apiUrl:'/api-web/sxview/getBizListForHzDp?access_token=',
+            apiUrl:'/api-web/sxview/getbizListByUser?access_token=',
             checkId:0,//当前选中的tabs
             checkId:0,//当前选中的tabs
             listItem:1,//轮播数-总页数
             listItem:1,//轮播数-总页数
             pageSize:5,//每页显示5条数据
             pageSize:5,//每页显示5条数据

@@ -68,7 +68,6 @@ export default {
 
 
         }
         }
 
 
-
         return {
         return {
             datetimeStyle,
             datetimeStyle,
             timeFormat,
             timeFormat,