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

杭州-大屏-监控一体化视图改名为展示大屏



See merge request !307

@@ -46,7 +46,7 @@
             <!--判定是否有daping角色，如果有则显示该菜单 joke add 20211203-->
             <script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-user/users/checkHasRole?roleCode=daping">
                 {{# 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>
                 </li>
                 {{# } }}

@@ -94,15 +94,19 @@ export default {
                 proxy.$global.showMsg("资源编号不存在，请确认！", "warning")
                 return;
             }
-
-            proxy.$http.post(`/api-web/favorites/save/res?favId=${favIds.value}&resIds=${props.resId}`, {}, function (res) {
-                if (res && res.code ==0) {
-                    let msg = !res.msg ? '收藏成功！' : res.msg;
-                    let type = !res.success ? 'warning' : 'success';
-                    proxy.$global.showMsg(msg,type);
-                    showDialog(false);
-                }
-            });
+            if (favIds.value != '' && favIds.value != null) {
+
+                proxy.$http.post(`/api-web/favorites/save/res?favId=${favIds.value}&resIds=${props.resId}`, {}, function (res) {
+                    if (res && res.code == 0) {
+                        let msg = !res.msg ? '收藏成功！' : res.msg;
+                        let type = !res.success ? 'warning' : 'success';
+                        proxy.$global.showMsg(msg, type);
+                        showDialog(false);
+                    }
+                });
+            }else {
+                proxy.$global.showMsg('请选择收藏夹', 'warning');
+            }
         }
 
 

@@ -59,7 +59,7 @@ export default {
             setInterval(function(){
                 getDateTime();
             },1000);
-            document.title = '监控一体化视图'
+            document.title = '展示大屏'
 
         })
         let getDateTime=()=>{