Merge branch 'master' of http://39.97.59.228:8013/hrx/mky-vent-base

src/views/system/message/components/useSysMessage.ts

@@ -1,11 +1,11 @@
 import { ref, reactive } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { getDictItemsByCode } from '/@/utils/dict/index';
-import { useRouter, useRoute } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router';
 import { useAppStore } from '/@/store/modules/app';
 import { useTabs } from '/@/hooks/web/useTabs';
 import { useModal } from '/@/components/Modal';
-import {useMessage} from "/@/hooks/web/useMessage";
+import { useMessage } from '/@/hooks/web/useMessage';
 
 /**
  * 列表接口
@@ -27,87 +27,85 @@ export function useSysMessage() {
   console.log('+++++++++++++++++++++');
 
   const messageList = ref<any[]>([]);
-  const pageNo = ref(1)
-  let pageSize = 10;
-  
+  const pageNo = ref(1);
+  const pageSize = 10;
+
   const searchParams = reactive({
     fromUser: '',
     rangeDateKey: '',
     rangeDate: [],
-    starFlag: ''
+    starFlag: '',
   });
 
-
   function getQueryParams() {
-    let { fromUser, rangeDateKey, rangeDate, starFlag } = searchParams;
-    let params = {
+    const { fromUser, rangeDateKey, rangeDate, starFlag } = searchParams;
+    const params = {
       fromUser,
       starFlag,
       rangeDateKey,
       beginDate: '',
       endDate: '',
       pageNo: pageNo.value,
-      pageSize
+      pageSize,
     };
     if (rangeDateKey == 'zdy') {
-      params.beginDate = rangeDate[0]+' 00:00:00';
-      params.endDate = rangeDate[1]+' 23:59:59';
+      params.beginDate = rangeDate[0] + ' 00:00:00';
+      params.endDate = rangeDate[1] + ' 23:59:59';
     }
     return params;
   }
 
   // 数据是否加载完了
   const loadEndStatus = ref(false);
-  
+
   //请求数据
   async function loadData() {
-    if(loadEndStatus.value === true){
+    if (loadEndStatus.value === true) {
       return;
     }
-    let params = getQueryParams();
+    const params = getQueryParams();
     const data = await queryMessageList(params);
     console.log('获取结果', data);
-    if(!data || data.length<=0){
+    if (!data || data.length <= 0) {
       loadEndStatus.value = true;
       return;
     }
-    if(data.length<pageSize){
+    if (data.length < pageSize) {
       loadEndStatus.value = true;
     }
-    pageNo.value = pageNo.value+1
-    let temp:any[] = messageList.value;
+    pageNo.value = pageNo.value + 1;
+    const temp: any[] = messageList.value;
     temp.push(...data);
     messageList.value = temp;
   }
 
   //重置
-  function reset(){
-    messageList.value = []
+  function reset() {
+    messageList.value = [];
     pageNo.value = 1;
     loadEndStatus.value = false;
   }
-  
+
   //标星
-  async function updateStarMessage(item){
+  async function updateStarMessage(item) {
     const url = '/sys/sysAnnouncementSend/edit';
     let starFlag = '1';
-    if(item.starFlag==starFlag){
-      starFlag = '0'
+    if (item.starFlag == starFlag) {
+      starFlag = '0';
     }
     const params = {
       starFlag,
-      id: item.sendId
-    }
+      id: item.sendId,
+    };
     //update-begin-author:taoyan date:2023-3-6 for: QQYUN-4491【应用】一些小问题  4、标星不需要提示吧
-    const data:any = await defHttp.put({url, params}, {isTransformResponse: false});
-    if(data.success === true){
-    }else{
-      createMessage.warning(data.message)
+    const data: any = await defHttp.put({ url, params }, { isTransformResponse: false });
+    if (data.success === true) {
+    } else {
+      createMessage.warning(data.message);
     }
     //update-end-author:taoyan date:2023-3-6 for: QQYUN-4491【应用】一些小问题  4、标星不需要提示吧
   }
 
-
   const loadingMoreStatus = ref(false);
   async function onLoadMore() {
     loadingMoreStatus.value = true;
@@ -124,13 +122,13 @@ export function useSysMessage() {
 
   // 消息类型
   function getMsgCategory(item) {
-    if(item.busType=='email'){
+    if (item.busType == 'email') {
       return '邮件提醒:';
-    } else if(item.busType=='bpm'){
+    } else if (item.busType == 'bpm') {
       return '流程催办:';
-    } else if(item.busType=='bpm_cc'){
+    } else if (item.busType == 'bpm_cc') {
       return '流程抄送:';
-    }else if(item.busType=='bpm_task'){
+    } else if (item.busType == 'bpm_task') {
       return '流程任务:';
     } else if (item.msgCategory == '2') {
       return '系统消息:';
@@ -139,7 +137,7 @@ export function useSysMessage() {
     }
     return '';
   }
-  
+
   return {
     messageList,
     reset,
@@ -147,39 +145,38 @@ export function useSysMessage() {
     loadEndStatus,
     searchParams,
     updateStarMessage,
-    
+
     onLoadMore,
     noRead,
     getMsgCategory,
-    
   };
 }
 
 /**
  * 用于消息跳转
  */
-export function useMessageHref(emit, props){
-  const messageHrefArray:any[] = getDictItemsByCode('messageHref');
+export function useMessageHref(emit, props) {
+  const messageHrefArray: any[] = getDictItemsByCode('messageHref');
   const router = useRouter();
   const appStore = useAppStore();
   const rt = useRoute();
   const { close: closeTab, closeSameRoute } = useTabs();
- // const defaultPath = '/monitor/mynews';
+  // const defaultPath = '/monitor/mynews';
   //const bpmPath = '/task/handle/'
-  
-  async function goPage(record, openModalFun?){
-    if(!record.busType || record.busType == 'msg_node'){
-      if(!openModalFun){
+
+  async function goPage(record, openModalFun?) {
+    if (!record.busType || record.busType == 'msg_node') {
+      if (!openModalFun) {
         // 从首页的消息通知跳转
         await goPageFromOuter(record);
-      }else{
+      } else {
         // 从消息页面列表点击详情查看 直接打开modal
-        openModalFun()
+        openModalFun();
       }
-    }else{
-      await goPageWithBusType(record)
+    } else {
+      await goPageWithBusType(record);
     }
-/*    busId: "1562035005173587970"
+    /*    busId: "1562035005173587970"
     busType: "email"
     openPage: "modules/eoa/email/modals/EoaEmailInForm"
     openType: "component"*/
@@ -189,37 +186,37 @@ export function useMessageHref(emit, props){
    * 根据busType不同跳转不同页面
    * @param record
    */
-  async function goPageWithBusType(record){
+  async function goPageWithBusType(record) {
     const { busType, busId, msgAbstract } = record;
-    let temp = messageHrefArray.filter(item=>item.value === busType);
-    if(!temp || temp.length==0){
+    const temp = messageHrefArray.filter((item) => item.value === busType);
+    if (!temp || temp.length == 0) {
       console.error('当前业务类型不识别', busType);
       return;
     }
     let path = temp[0].text;
-    path = path.replace('{DETAIL_ID}', busId)
+    path = path.replace('{DETAIL_ID}', busId);
     //固定参数 detailId 用于查询表单数据
-    let query:any = {
-      detailId: busId
+    const query: any = {
+      detailId: busId,
     };
     // 额外参数处理
-    if(msgAbstract){
+    if (msgAbstract) {
       try {
-        let json = JSON.parse(msgAbstract);
-        Object.keys(json).map(k=>{
-          query[k] = json[k]
+        const json = JSON.parse(msgAbstract);
+        Object.keys(json).map((k) => {
+          query[k] = json[k];
         });
-      }catch (e) {
-        console.error('msgAbstract参数不是JSON格式', msgAbstract)
+      } catch (e) {
+        console.error('msgAbstract参数不是JSON格式', msgAbstract);
       }
     }
     // 跳转路由
     appStore.setMessageHrefParams(query);
-    if(rt.path.indexOf(path)>=0){
+    if (rt.path.indexOf(path) >= 0) {
       await closeTab();
-      await router.replace({ path: path, query:{ time: new Date().getTime() } });
-    }else{
-      closeSameRoute(path)
+      await router.replace({ path: path, query: { time: new Date().getTime() } });
+    } else {
+      closeSameRoute(path);
       await router.push({ path: path });
     }
   }
@@ -228,12 +225,12 @@ export function useMessageHref(emit, props){
    * 从首页的消息通知跳转消息列表打开modal
    * @param record
    */
-  async function goPageFromOuter(record){
+  async function goPageFromOuter(record) {
     //没有定义业务类型 直接跳转我的消息页面
-    emit('detail', record)
+    emit('detail', record);
   }
-  
+
   return {
-    goPage
-  }
+    goPage,
+  };
 }

src/views/vent/home/configurable/belt/components/customHeader-belt.vue

@@ -102,8 +102,14 @@ const dropdownStyle = {
 
 // 当前路由（计算属性）
 const currentPath = computed(() => {
-  return router.currentRoute.value.fullPath.split('?')[0];
+  return router.currentRoute.value ? router.currentRoute.value.fullPath.split('?')[0] : router.currentRoute.fullPath.split('?')[0];
 });
+// 判断导航是否选中
+const isActive = (menuPath: string): boolean => {
+  if (!menuPath) return false;
+  const menuRoutePath = menuPath.split('?')[0];
+  return currentPath.value.startsWith(menuRoutePath);
+};
 // 监听父组件传入的 optionValue 同步更新
 watch(
   () => props.optionValue,
@@ -111,12 +117,6 @@ watch(
     currentTitleValue.value = val;
   }
 );
-// 判断导航是否选中
-const isActive = (menuPath: string): boolean => {
-  if (!menuPath) return false;
-  const menuRoutePath = menuPath.split('?')[0];
-  return currentPath.value.startsWith(menuRoutePath);
-};
 
 // 导航点击跳转
 const handleNavClick = (item: MenuItem) => {
@@ -196,33 +196,13 @@ const handleTitleChange = (value: string) => {
     }
   }
 
-  .container-title {
-    width: 380px;
-    height: 34px;
-    left: 20px;
-    background: var(--image-select-bg) no-repeat;
-    background-size: contain;
-    padding: 0 0 0 20px;
-    font-size: 20px;
-    pointer-events: auto;
-    position: relative;
-    z-index: 9999;
-    top: 70px;
-
-    .title-select {
-      width: 340px;
-      position: absolute;
-      top: 0;
-    }
-  }
-
   .nav {
     width: 100%;
     position: fixed;
     top: 0;
     display: flex;
-    left: 20px;
-    gap: 30px;
+    left: 15px;
+    gap: 20px;
     top: 15px;
     pointer-events: auto;
 
@@ -257,12 +237,92 @@ const handleTitleChange = (value: string) => {
     .zxm-select-selection-item {
       color: #fff !important;
       font-size: 20px;
-      margin-left: 20px !important;
+      pointer-events: auto;
+      position: relative;
+      z-index: 9999;
+      top: 70px;
+
+      .title-select {
+        width: 340px;
+        position: absolute;
+        top: 0;
+      }
+    }
+
+    .nav {
+      width: 100%;
+      position: fixed;
+      top: 0;
+      display: flex;
+      left: 20px;
+      gap: 30px;
+      top: 15px;
+      pointer-events: auto;
+
+      .nav-item {
+        flex: 1;
+        max-width: 120px;
+        height: 35px;
+        line-height: 35px;
+        padding: 0;
+        box-sizing: border-box;
+        padding-bottom: 10px;
+        text-align: center;
+        background: url('/@/assets/images/beltFire/titleNav.png') no-repeat center center;
+        background-size: 100% 90%;
+        cursor: pointer;
+        color: #fff;
+      }
+      .nav-item.active {
+        background: url('/@/assets/images/beltFire/titleNavActive.png') no-repeat center center !important;
+        background-size: 100% 190% !important;
+      }
+    }
+
+    .history-nav {
+      position: fixed;
+      top: 15px;
+      right: 230px;
+      pointer-events: auto;
+
+      .nav-item {
+        width: 120px;
+        height: 35px;
+        line-height: 35px;
+        padding: 0;
+        box-sizing: border-box;
+        padding-bottom: 10px;
+        text-align: center;
+        background: url('/@/assets/images/beltFire/titleNav.png') no-repeat center center;
+        background-size: 100% 90%;
+        cursor: pointer;
+        color: #fff;
+      }
+      .nav-item.active {
+        background: url('/@/assets/images/beltFire/titleNavActive.png') no-repeat center center !important;
+        background-size: 100% 190% !important;
+      }
     }
   }
 
-  .@{ventSpace}-select-arrow {
-    color: #fff !important;
+  :deep(.zxm-select) {
+    width: 100%;
+
+    .@{ventSpace}-select-selector {
+      background: transparent !important;
+      border: none !important;
+      box-shadow: none !important;
+
+      .zxm-select-selection-item {
+        color: #fff !important;
+        font-size: 20px;
+        margin-left: 20px !important;
+      }
+    }
+
+    .@{ventSpace}-select-arrow {
+      color: #fff !important;
+    }
   }
 }
 </style>

src/views/vent/home/configurable/belt/threejs/belt.threejs.ts

@@ -23,6 +23,7 @@ let clickSelecteObject;
 const modalData = ref(null);
 const warningPartitionIndex = ref('-1');
 const warningPartitionIndexList: number[] = [];
+const blinkAnimationList: any[] = [];
 
 export async function modalAnimate(modal, modalMonitorData: Ref<any, any>) {
   // const data = modalMonitorData.value;
@@ -44,7 +45,7 @@ export async function modalAnimate(modal, modalMonitorData: Ref<any, any>) {
   // const res = await defHttp.post({ url: api, params: { sysId: '2028657172566073346' } });
   // modalData.value = res?.device;
   // const len = Object.keys(res?.device).length;
-  const { partitionList, blinkAnimationList } = drawPartition(beltModal, 100, 2000);
+  const { partitionList } = drawPartition(beltModal, 100, 2000);
 
   const { sprayPartitionList } = drawSprayPartition(beltModal, 100, 2000);
 
@@ -790,7 +791,7 @@ function drawPartition(beltModal: THREE.Group, partitionLen: number, len: number
   const penlin = beltModal.getObjectByName('penlin') as THREE.Object3D;
   const group1 = penlin?.getObjectByName('qiang8');
   const partitionList: THREE.Object3D[] = [];
-  const blinkAnimationList: any[] = [];
+
   if (group1) {
     const box = new THREE.Box3();
     box.setFromObject(group1);
@@ -1142,4 +1143,8 @@ export function destroy(modal) {
   warningPartitionIndexList.length = 0;
   panelManager.destroyAll();
   modal.canvasContainer?.removeEventListener('mousemove', mouseoverEvent);
+  for (let i = 0; i < blinkAnimationList.length; i++) {
+    if (blinkAnimationList[i]) blinkAnimationList[i].kill();
+  }
+  blinkAnimationList.length = 0;
 }

src/views/vent/home/configurable/components/content.vue

@@ -518,12 +518,12 @@ const layoutConfig = computed(() => {
       case 'table': {
         const cfg = table.shift();
         if (!cfg) break;
-        // const data = getData(refData, cfg.readFrom, cfg.parser);
+        const data = getData(refData, cfg.readFrom, cfg.parser);
         arr.push({
           ...cfg,
           ...item,
           columns: cfg.columns,
-          data: refData,
+          data: data,
         });
         break;
       }