Merge branch '视频修改0829' into zwy_video

# Conflicts:
#	.env.dev
#	vite.config.ts

.env.dev

@@ -1,16 +1,32 @@
-# .env.dev
+# .env.zwy
 
-NODE_ENV = development
+NODE_ENV = dev
 
-VITE_API_SERVER = 'http://10.11.208.17:30876'
-VITE_MAP_SERVER = 'http://10.11.208.19:21009'
-VITE_MAP_KEY = '38025fbc9e3f4e1fb64b34b2b55080ab'
-VITE_LOGIN_SERVER = 'http://10.11.208.32:9999'
 
-VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
-VITE_SP_USER = 'huashe1'
-VITE_MAP_SOLUTION = '12887'
-VITE_URL_YXJC = 'http://10.11.208.13:30080/tles-hcdp-web/#/OperationMonitoring'
-VITE_URL_ZHDD = 'http://10.11.208.13:30080/tles-hcdp-web/#/HCdpView'
-VITE_URL_YJZH = 'http://10.11.208.12:31000/sqpchd/#/home'
-VITE_URL_YXJCS = 'http://10.11.208.39:9999/screen/#/home/country-home'
+#VITE_API_SERVER = 'http://10.11.208.17:30876'
+#VITE_MAP_SERVER = 'http://10.11.208.19:21009'
+#VITE_MAP_KEY = '38025fbc9e3f4e1fb64b34b2b55080ab'
+#VITE_LOGIN_SERVER = 'http://10.11.208.32:9999'
+
+#VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+#VITE_SP_USER = 'huashe1'
+#VITE_MAP_SOLUTION = '12887'
+#VITE_URL_YXJC = 'http://10.11.208.13:30080/tles-hcdp-web/#/OperationMonitoring'
+#VITE_URL_ZHDD = 'http://10.11.208.13:30080/tles-hcdp-web/#/HCdpView'
+#VITE_URL_YJZH = 'http://10.11.208.12:31000/sqpchd/#/home'
+#VITE_URL_YXJCS = 'http://10.11.208.39:9999/screen/#/home/country-home'
+
+VITE_API_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/server'
+VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
+VITE_MAP_KEY = '63b68d77877a4ed686e8bc30894975e5'
+VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999'
+VITE_BG_SERVER = 'https://tocc.jtj.suqian.gov.cn:30030/sqbg'
+VITE_DH_SERVER = 'http://sqtestdh.xt.wenhq.top:8083'
+VITE_SP_USER = 'huashe2'
+VITE_MAP_KEY = '63b68d77877a4ed686e8bc30894975e5'
+VITE_MAP_SOLUTION = '222525'
+VITE_URL_YXJC = 'http://10.11.230.144:30080/tles-hcdp-web/#/OperationMonitoring'
+VITE_URL_ZHDD = 'http://10.11.230.144:30080/tles-hcdp-web/#/HCdpView'
+VITE_URL_YJZH = 'http://10.11.230.154:31000/sqpchd/#/home'
+VITE_URL_YXJCS = 'http://10.11.230.150:30010/screen/#/home/country-home'
+

index.html

@@ -26,7 +26,7 @@
     <!--    <script src="../webClient/webClient_initWnd.js"></script>-->
     <script src="./js/common.js?time=3"></script>
 
-    <script src="./meeting.js?time=14"></script>
+    <script src="./meeting.js?time=15"></script>
     <script src="./js/videoplay.js?time=2"></script>
 
     <!-- <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.g6-3.1.1/build/g6.js"></script> -->

public/meeting.js

@@ -1,3 +1,5 @@
+
+
 var Meeting = function Meeting() {
     this.localUserInfo = {
         //创建会议的参数对象
@@ -620,7 +622,9 @@ Meeting.prototype = {
                 _this.InvitedMembersTalkie.inviteName = res.userName;
                 _this.InvitedMembersTalkie.inviteNumber = res.userPhone;
             },
-            error: function(data) {},
+            error: function (data) {
+                 _this.$Message.error('获取视屏用户失败');
+            },
         });
     },
     _debug(tip, res) {

public/webClient/initWebSocket.js

@@ -1,3 +1,5 @@
+
+
 function getRandomString(len = 10) {
     const chars =
         "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678"; /** **默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
@@ -90,6 +92,7 @@ class InitWebSocketClass {
                             this.settings.loginSuccess &&
                                 this.settings.loginSuccess("success");
                             resolve("success");
+                             
                             return;
                         }
                         const data = JSON.parse(evt.data);
@@ -146,6 +149,7 @@ class InitWebSocketClass {
                 };
             } catch (exception) {
                 // this.debug('ERROR: ' + exception);
+              
             }
         });
     }

public/webClient/webClient_initWnd.js

@@ -48,6 +48,16 @@ class VideoPlay {
         this.status = document.querySelector(spaceId).clientHeight !== 0;
     }
 
+    createHeader(){
+        var obj ={};
+        obj.loginIp = this.settings.letLoginIp,;
+        obj.method = "";
+        obj.userCode = this.settings.letUserCode;
+        obj.params = {};
+        obj.params.array = [];
+        return obj;
+    }
+
     // 初始化
     init() {
             this.calcTools();

src/api/resource.ts

@@ -165,7 +165,8 @@ export const getAllvideoDevice = () => {
 
 export const getDHUserToken = () => {
   return request<DHUserResponse>('GET', {
-    url: `zhdd/dh/getVideoToken`,
+    // url: `zhdd/dh/getVideoToken`,
+    url: `zhdd/dh/test/getVideoToken`,
   });
 };
 

src/components/MapView/index.tsx

@@ -91,7 +91,7 @@ export default defineComponent({
           '/service/solu/style/id/' +
           (import.meta.env.VITE_MAP_SOLUTION as string) /*底图样式*/,
         center: [118.29564, 33.97441] /*地图中心点*/,
-        zoom: 11 /*地图默认缩放等级*/,
+        zoom: 16 /*地图默认缩放等级*/,
         pitch: 0 /*地图俯仰角度*/,
         maxZoom: 17 /*地图最大缩放等级*/,
         minZoom: 3 /*地图最小缩放等级*/,

src/components/MarkerMap/dialog.ts

@@ -167,15 +167,15 @@ export const GET_VEHICLES_DIALOG_HTML = (item: ResourceItemDetail) => {
   const el = document.createElement('div');
   el.innerHTML = `
     <div>
-      <div class="title">应急车辆信息</div>
-      <div class="content">
-        <div><span>车牌号：</span><span>${item.name ?? '-'}</span></div>
-        <div><span>管理单位：</span><span>${item.manageUnit ?? '-'}</span></div>
-        <div><span>车辆类型：</span><span>${item.carType ?? '-'}</span></div>
-      </div>
-      <i class="card-border-bottom-left"></i>
-      <i class="card-border-bottom-right"></i>
+    <div class="title">应急车辆信息</div>
+    <div class="content">
+     <div><span>管理单位：</span><span>${item.manageUnit ?? '-'}</span></div>
+     <div><span>地点：</span><span>${item.address ?? '-'}</span></div>
+     <div><span>车船数：</span><span>${item.num ?? '-'}</span></div>
+    <div><span>联系人：</span><span>${item.contactName ?? '-'}</span></div>
+    <div><span>联系方式：</span><span>${item.contactPhone ?? '-'}</span></div>
     </div>
+  </div>
   `;
   return el;
 };
@@ -193,16 +193,14 @@ export const GET_TEAM_DIALOG_HTML = (item: ResourceItemDetail) => {
   el.innerHTML = `
 <div>
   <div class="title">应急队伍信息</div>
-  <div class="content">
-    <div><span>队伍名称：</span><span>${item.name ?? '-'}</span></div>
+<div class="content">
     <div><span>管理单位：</span><span>${item.manageUnit ?? '-'}</span></div>
-    <div><span>携带物资：</span><span>${item.carryGoods ?? '-'}</span></div>
-    <div><span>人数：</span><span>${item.num ?? '-'}</span></div>
+    <div><span>队伍名称：</span><span>${item.name ?? '-'}</span></div>
+    <div><span>地点：</span><span>${item.address ?? '-'}</span></div>
+     <div><span>人数：</span><span>${item.num ?? '-'}</span></div>
     <div><span>联系人：</span><span>${item.contactName ?? '-'}</span></div>
     <div><span>联系方式：</span><span>${item.contactPhone ?? '-'}</span></div>
-  </div>
-  <i class="card-border-bottom-left"></i>
-  <i class="card-border-bottom-right"></i>
+</div>
 </div>
   `;
   return el;

src/components/MarkerMap/index.scss

@@ -339,8 +339,9 @@
             margin-right: 0;
             padding-bottom: px2rem(40px);
             &>span {
-                font-size: 14px;
-                font-size: px2rem(15px * 2);
+                // font-size: 14px;
+                // font-size: px2rem(15px * 2);
+                font-size: px2rem(12px * 2) !important;
                 font-weight: 400;
             }
             .tipicon {

src/components/MarkerMap/index.tsx

@@ -316,6 +316,7 @@ export default defineComponent({
       
                    }else{
                     const meeting = new Meeting();
+                    meeting.$Message = ElMessage;
                     if(window.theSocket){
                       meeting.settargetId("vPlayArea");
                       meeting.playVideo({
@@ -419,7 +420,8 @@ export default defineComponent({
                 
 
              }else{
-              const meeting = new Meeting();
+               const meeting = new Meeting();
+               meeting.$Message = ElMessage;
               if(window.theSocket){
                 meeting.settargetId("vPlayArea");
                 meeting.playVideo({
@@ -470,10 +472,16 @@ export default defineComponent({
 
              }
              if(type==2){
-              window.indexp = (window.indexp == 1?2:1);
-              const meeting = new Meeting();
+               window.indexp = (window.indexp == 1 ? 2 : 1);
+               try {
+                 document.getElementById(
+                   'relvideo' + window.indexp
+                 )!.childNodes[0].style.display = 'none';
+               } catch (error) {}
+               const meeting = new Meeting();
+               meeting.$Message = ElMessage;
               if(window.theSocket){
-                meeting.settargetId("relvideo"+window.indexp);
+                meeting.settargetId("relvideo" + window.indexp);
                 meeting.playVideo({
                   type: 'single',
                   deviceId: marker['deviceCode'],
@@ -891,6 +899,9 @@ export default defineComponent({
         if(type==="单兵"){
           i.name = i.userName;
         }
+          if (type === '应急车辆') {
+            i.name = i.manageUnit+'应急车船';
+          }
 
         imagep.onmouseover = ()=>{
           //console.log(222)
@@ -921,16 +932,17 @@ export default defineComponent({
 
       
       handleFitBounds();
-      
-      try {
-        state.map?.setZoom(11);
-        state.map?.setCenter({
-          lng: parseFloat(markers[0].locations?.split(',')[0] ?? '0'),
-          lat: parseFloat(markers[0].locations?.split(',')[1] ?? '0'),
-        });
+      if (type === '应急事件') {
+        try {
+          state.map?.setZoom(14);
+          state.map?.setCenter({
+            lng: parseFloat(markers[0].locations?.split(',')[0] ?? '0'),
+            lat: parseFloat(markers[0].locations?.split(',')[1] ?? '0'),
+          });
         
-      } catch (E) { 
+        } catch (E) {
 
+        }
       }
       
 

src/layout/BaseLayout/index.tsx

@@ -8,6 +8,7 @@ import clsx from "clsx";
 import moment from 'moment';
 // @ts-ignore
 import closeicon from '@/assets/icons/detail/close.png';
+import { ElMessage } from "element-plus";
 
 moment.locale('zh-cn', {
   months:
@@ -156,6 +157,7 @@ export default defineComponent({
     // login da hua
     onMounted(async () => {
       const meeting = new Meeting();
+      meeting.$Message = ElMessage;
       meeting.openClient(() => {
         // console.log("======")
         meeting.settargetId("vPlayArea");
@@ -292,7 +294,8 @@ export default defineComponent({
 
           }, 1000);
          }else{
-          const meeting = new Meeting();
+           const meeting = new Meeting();
+           meeting.$Message = ElMessage;
           meeting.settargetId("vPlayArea");
           window.metting = meeting;
           setTimeout(() => {
@@ -302,7 +305,8 @@ export default defineComponent({
          }
 
        }else{
-        const meeting = new Meeting();
+         const meeting = new Meeting();
+         meeting.$Message = ElMessage;
         meeting.openClient(() => {
 
           meeting.settargetId("vPlayArea");

src/store/useMarkerStore.ts

@@ -22,6 +22,7 @@ import {
   SINGLE_PAWN,
   // EMERGENCY_TEAM,
 } from '@/components/MarkerMap/constants';
+import { ElMessage } from 'element-plus';
 import { type } from 'os';
 import { defineStore } from 'pinia';
 
@@ -97,13 +98,16 @@ export default defineStore<'marker', MarkerStateType, {}, MainActionsType>(
       async initDHUser() {
         const { data } = await getDHUserToken();
         if (data.token) {
-          // localStorage.setItem('token', data.token.toString());
-          // localStorage.setItem('userId', data.userId.toString());
-          // localStorage.setItem('userName', data.userName.toString());
+          localStorage.setItem('token', data.token.toString());
+          localStorage.setItem('userId', data.userId.toString());
+          localStorage.setItem('userName', data.userName.toString());
+          ElMessage.success(
+            '成功获取后台登陆的视频账号：' + data.userName.toString(),
+          );
 
-          localStorage.setItem('token','S4NbecfYB19QUJHT4T8M7G_6566288360343616')
-          localStorage.setItem('userId', 'S4NbecfYB19QUJHT4T8M7G');
-          localStorage.setItem('userName', 'system');
+          // localStorage.setItem('token','S4NbecfYB19QUJHT4T8M7G_6566288360343616')
+          // localStorage.setItem('userId', 'S4NbecfYB19QUJHT4T8M7G');
+          // localStorage.setItem('userName', 'system');
         }
       },
       async getAllsingleDevice() {

src/views/IncidentDetail/index.scss

@@ -240,7 +240,8 @@
                     }
                     // line-height: px2rem(50px * 2);
                     // height: px2rem(50px * 2);
-                    font-size: px2rem(18px * 2);
+                    // font-size: px2rem(18px * 2);
+                    font-size: px2rem(12px * 2);
                     flex: 1;
                     width: 100%;
                     .info-item-lebel {
@@ -285,6 +286,21 @@
                         overflow: hidden;
                         text-overflow: ellipsis;
                         white-space: nowrap;
+                        >div {
+                            &::-webkit-scrollbar-thumb {
+                                background: #39d6fe;
+                                border-radius: 3px;
+                            }
+                            // &::-webkit-scrollbar-track {
+                            //     border-radius: 3px;
+                            //     background-color: #39d6fe;
+                            // }
+                            &::-webkit-scrollbar {
+                                width: 6px;
+                                background-color: rgba(0, 0, 0, 0);
+                                opacity: 1;
+                            }
+                        }
                     }
                 }
             }
@@ -438,7 +454,8 @@
                         background-repeat: no-repeat;
                         text-align: center;
                         line-height: px2rem(32px * 2);
-                        font-size: px2rem(14px * 2);
+                        // font-size: px2rem(14px * 2);
+                        font-size: px2rem(12px * 2);
                         &[datatype='0'] {
                             margin-bottom: px2rem(10px * 2);
                         }
@@ -810,7 +827,8 @@
                             padding-bottom: px2rem(10px * 2);
                             z-index: 1;
                             position: relative;
-                            font-size: px2rem(17px * 2);
+                            font-size: px2rem(12px * 2);
+                            // font-size: px2rem(17px * 2);
                             font-family: Source Han Sans CN, Source Han Sans CN-Regular;
                             font-weight: 400;
                             .pdesc {
@@ -822,7 +840,8 @@
                             }
                             .exdesc {
                                 opacity: 0.6;
-                                font-size: px2rem(15px * 2);
+                                // font-size: px2rem(15px * 2);
+                                font-size: px2rem(12px * 2);
                                 font-family: Source Han Sans CN, Source Han Sans CN-Regular;
                                 font-weight: 400;
                             }
@@ -833,7 +852,8 @@
                                 background-repeat: no-repeat;
                                 background-size: 100% 100%;
                                 // line-height: px2rem(35px * 2);
-                                font-size: px2rem(19px * 2);
+                                // font-size: px2rem(19px * 2);
+                                font-size: px2rem(12px * 2);
                                 font-weight: 500;
                                 span {
                                     // margin-left: px2rem(10px * 2);
@@ -899,7 +919,8 @@
                 }
             }
             &-bg-emergency-plan {
-                font-size: px2rem(16px * 2);
+                // font-size: px2rem(16px * 2);
+                font-size: px2rem(12px * 2);
                 font-family: Source Han Sans CN, Source Han Sans CN-Regular;
                 font-weight: 400;
                 text-align: left;
@@ -982,7 +1003,8 @@
             &-bg-accident-scene {
                 position: relative;
                 .dis {
-                    font-size: px2rem(34px);
+                    // font-size: px2rem(34px);
+                    font-size: px2rem(12px * 2);
                     top: px2rem(160px);
                     position: absolute;
                     width: 100%;
@@ -990,7 +1012,8 @@
                     left: 0;
                 }
                 .el-carousel__arrow {
-                    font-size: px2rem(22px*2) !important;
+                    font-size: px2rem(12px * 2) !important;
+                    // font-size: px2rem(22px*2) !important;
                 }
             }
             &-bg-wz-all {
@@ -1105,7 +1128,8 @@
                                 }
                             }
                             .plan-content {
-                                font-size: px2rem(17px * 2);
+                                // font-size: px2rem(17px * 2);
+                                font-size: px2rem(12px * 2);
                                 font-family: Source Han Sans CN, Source Han Sans CN-Regular;
                                 font-weight: 400;
                                 text-align: left;
@@ -1151,7 +1175,7 @@
                         }
                     }
                     .exc {
-                        font-size: px2rem(16px * 2);
+                        font-size: px2rem(12px * 2);
                         font-family: Source Han Sans CN, Source Han Sans CN-Regular;
                         font-weight: 400;
                         text-align: left;

vite.config.ts

@@ -35,6 +35,8 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
         '/api': {
           // target: 'http://61.147.254.211:30876/YJZH-SQ/',
           target: 'http://10.11.208.17:30876/YJZH-SQ/',
+          // target: 'https://tocc.jtj.suqian.gov.cn:9999/server/YJZH-SQ/',
+          // target: 'http://sqpcbg.xt.wenhq.top:8083/',
           changeOrigin: true,
           // rewrite: (path) => path.replace(/^\/api/, ''),
         },