Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/components/Consultation/components/audioAndVoice.vue

@@ -67,13 +67,14 @@
 </template>
 
 <script setup>
+import { getItem } from "@/utils/storage";
 import { timeValidate } from '@/utils/tools'
 import { ref,defineEmits, onMounted } from 'vue'
 const props = defineProps({
   modelValue:Boolean,
 })
 const emit = defineEmits(['update:modelValue','save'])
-const baseInfo = localStorage.getItem('rhInfo') ? JSON.parse(localStorage.getItem('rhInfo')) : {};
+const baseInfo = getItem('rhInfo') || {};
 const formData = ref({
   alarm:1,
   duration:'30',

src/components/Consultation/components/draggerAble.vue

@@ -34,6 +34,7 @@
 </template>
 
 <script setup>
+import { getItem } from "@/utils/storage";
 import useCallModule from '@/components/Consultation/sdk/call';
 import useRecorder from '@/components/Consultation/hooks/recorder';
 import DraggableResizableVue from "draggable-resizable-vue3";
@@ -43,7 +44,7 @@ const props = defineProps({
   modelValue:Boolean,
 })
 const emit = defineEmits(['update:modelValue'])
-const baseInfo = localStorage.getItem('rhInfo') ? JSON.parse(localStorage.getItem('rhInfo')) : {};
+const baseInfo = getItem('rhInfo') || {};
 let waveContainer;
 let audioWave = SiriWave || undefined;
 const element = ref({

src/components/Consultation/demo.vue

@@ -24,7 +24,7 @@ const modleType = ref('')
 const store = useStore();
 const inDustRialId = getItem('inDustRialId'); // 当前用户的警号
 const sdkBDModule = useBaseDataModule();
-const baseInfo = localStorage.getItem('rhInfo') ? JSON.parse(localStorage.getItem('rhInfo')) : {};
+const baseInfo = getItem('rhInfo') || {};
 const showVideo = ref(false)//拖动视频
 const showDailog = ref(false)//showDailog
 const openMeeting = ref(false) //打开会议
@@ -155,45 +155,6 @@ const fetchConferences = (it) =>{
     }).catch(err=> {})
 }
 
-
-const Init = () => {
-  let token = window.localStorage.getItem("rhToken");
-  if (!token) {
-    let userInfo = {
-      username: inDustRialId, //用户名
-      password: "123456",
-      realm: "puc.com",
-      webpucUrl: "https://89.40.9.95:16888"
-    };
-    lemon.login.login(userInfo).then((esacpe) => {
-      token = esacpe.token;
-      window.localStorage.setItem("rhToken", esacpe.token);
-      listenerEvents()
-    });
-  } else {
-    ConnectWebsocket(token);
-  }
-};
-
-const ConnectWebsocket = (token) => {
-  lemon.login.reConnectWebsocket({
-    username: inDustRialId, //用户名
-    realm: "puc.com",
-    webpucUrl: "https://89.40.9.95:16888",
-    token: token
-  }).then((resp) => {
-        if(resp.result != 0){
-            localStorage.removeItem('rhToken')
-            localStorage.removeItem('user_basedata_id')
-            let messge = jsonData.value['errorCode'][resp.result] +',请重新刷新页面'
-            ElMessage.error(messge);
-            lemon.login.logout().then(res=> {}).catch(err=> {})   
-        }else{
-            listenerEvents();
-       }
-  });
-};
-
 // 初始化后需要监听的方法
 const listenerEvents = () =>{
     getLoginAccountInfo() //前账号的登录信息
@@ -241,6 +202,47 @@ const openInit = (it,type) =>{
 }
 
 
+const Init = () => {
+  let token = window.localStorage.getItem("rhToken");
+  console.log(token,'=======token');
+  if (!token || 'undefined' == token || token == 'null') {
+    console.log('融合通信登录=======token');
+    let userInfo = {
+      username: inDustRialId, //用户名
+      password: "123456",
+      realm: "puc.com",
+      webpucUrl: "https://89.40.9.95:16888"
+    };
+    lemon.login.login(userInfo).then((esacpe) => {
+      token = esacpe.token;
+      window.localStorage.setItem("rhToken", esacpe.token);
+      listenerEvents()
+    });
+  } else {
+    console.log('融合通信链接=======token');
+    ConnectWebsocket(token);
+  }
+};
+
+const ConnectWebsocket = (token) => {
+  lemon.login.reConnectWebsocket({
+    username: inDustRialId, //用户名
+    realm: "puc.com",
+    webpucUrl: "https://89.40.9.95:16888",
+    token: token
+  }).then((resp) => {
+        if(resp.result != 0){
+            localStorage.removeItem('rhToken')
+            localStorage.removeItem('user_basedata_id')
+            let messge = jsonData.value['errorCode'][resp.result] +',请重新刷新页面'
+            ElMessage.error(messge);
+            lemon.login.logout().then(res=> {}).catch(err=> {})   
+        }else{
+            listenerEvents();
+       }
+  });
+};
+
 onMounted(()=>{
     console.log('组件挂载了');
     jsonData.value = require('./components/zh_CN.json');

src/store/modules/user.js

@@ -118,8 +118,7 @@ export default {
     oatuhLogin(ctx, userInfo) {
       const { token, systemId } = userInfo;
       return new Promise((resolve, reject) => {
-        unifiedLogin({ token, systemId, ssxt: "sgxt" })
+        unifiedLogin({ token, systemId, ssxt: "sgxt" }).then((data) => {
-          .then((data) => {
           if (data.deptList.length === 1) {
             this.commit("user/setToken", data.jwtToken);
             this.commit("user/setDeptId", data.deptList);
@@ -147,8 +146,7 @@ export default {
           // 保存登录时间
           setTimeStamp();
           resolve(data);
-          })
+        }).catch((err) => {
-          .catch((err) => {
           reject(err);
         });
       });

src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue

@@ -72,10 +72,11 @@
   </div>
   <!-- 详情 -->
   <DetailForm ref="detailDiloag" @updateDate="getList" />
+
   <RoomDetail />
 
   <!-- 音视频会议窗口 -->
-  <MeetingView ref="refMeetingView" :update="updateItem"></MeetingView>
+  <MeetingView ref="refMeetingView" @update="updateItem"></MeetingView>
 
   <!-- 反馈弹窗 -->
   <FeedbackForm ref="feedbackFormRef" @success="getList" />
@@ -84,8 +85,12 @@
   <ViewFeedback ref="viewFeedbackRef" />
 
   <Information v-model="showDialog" title="发送指令" @submit="seedFqzl" @close='close'>
-    <SemdFqzl ref="semdFqzlRef" :itemData="itemData" @handleClose="handleClose" identification="meeting"
+    <SemdFqzl 
-      :tacitly="tacitly" />
+      ref="semdFqzlRef" 
+      :itemData="itemData" 
+      @handleClose="handleClose" 
+      identification="meeting"
+    />
   </Information>
 
 </template>
@@ -124,9 +129,7 @@ const itemData = ref({})
 const cityIntelligenceCommand = ref(isShiQingZhi())
 /** 下发指令 */
 const showDialog = ref(false)
-const tacitly = {
+
-  // title:'ryXm'
-}
 
 const searchConfiger = ref([
   {
@@ -152,12 +155,8 @@ const pageData = reactive({
     pageCurrent: 1
   },
 });
-const jsonData = ref('')
-/** 当前行数据 */
-const currRow = ref({})
 
 onMounted(() => {
-  jsonData.value = require('@/components/Consultation/components/zh_CN.json');
   getList();
   tabHeightFn();
 });
@@ -223,7 +222,9 @@ const handleSumbit = (item) => {
 const joinMeeting = (item, type) => {
   item.number = item.hybh;
   refMeetingView.value.openInit(item, type)
+  
 };
+
 // 反馈情况
 const feedBack = (item) => {
   feedbackFormRef.value.open(item.id);

src/views/login/zeroTrust_login.vue

@@ -78,6 +78,7 @@ const idCardNoLoginLogin = (idCard, orgId) => {
     orgCode: orgId,
     ssxt: "sgxt"
   }).then((resIdCard) => {
+    setItem("inDustRialId", resIdCard.inDustRialId);
     // 登录成功后设置token和用户信息到store
     store.commit("user/setToken", resIdCard.jwtToken);
     store.commit("user/setDeptList", resIdCard.deptList);