Merge branch 'master' of http://182.92.126.35:3000/hrx/vent-forewarn-micro

src/api/sys/monitor.ts

@@ -9,7 +9,6 @@ import {
   MonitorSiteParams,
   MonitorSiteTreeNode,
   MonitorSiteTreeParams,
-  Response,
   SaveMonitorSiteParams,
   DeleteMonitorSiteParams,
 } from './model/monitorModel';
@@ -27,7 +26,7 @@ export function getMonitorSiteTree(
   params: MonitorSiteTreeParams,
   mode: ErrorMessageMode = 'message',
 ) {
-  return defHttp.get<Response<MonitorSiteTreeNode>>(
+  return defHttp.get<MonitorSiteTreeNode[]>(
     {
       url: Api.getMonitorSiteTree,
       params,
@@ -42,7 +41,7 @@ export function getMonitorSiteTree(
  * 保存测点数据
  */
 export function saveMonitorSite(params: SaveMonitorSiteParams, mode: ErrorMessageMode = 'message') {
-  return defHttp.post<Response<MonitorSite>>(
+  return defHttp.post<MonitorSite>(
     {
       url: Api.saveMonitorSite,
       params,
@@ -60,7 +59,7 @@ export function deleteMonitorSite(
   params: DeleteMonitorSiteParams,
   mode: ErrorMessageMode = 'message',
 ) {
-  return defHttp.delete<Response<MonitorSite>>(
+  return defHttp.delete<MonitorSite>(
     {
       url: Api.saveMonitorSite,
       params,
@@ -74,7 +73,7 @@ export function deleteMonitorSite(
  * 获取测点详情数据
  */
 export function getMonitorSite(params: MonitorSiteParams, mode: ErrorMessageMode = 'message') {
-  return defHttp.post<Response<MonitorSite>>(
+  return defHttp.post<MonitorSite>(
     {
       url: Api.getMonitorSite,
       params,
@@ -86,7 +85,7 @@ export function getMonitorSite(params: MonitorSiteParams, mode: ErrorMessageMode
 }
 
 /** 测点操作内嵌的iframe地址 */
-export const monitorSiteOperationUrl = 'http://172.16.253.23:91/valkyrja/';
+export const monitorSiteOperationUrl = 'http://172.16.253.23:91/valkyrja/?type=tf';
 
 /** 发送测点操作指令 */
 export function postMonitorOperation(el: Window, params: MonitorSiteOperationParams) {

src/views/vent/dust/dustHome/index.vue

@@ -49,7 +49,7 @@
             <img src="../../../../assets/images/scalc.png" alt="" />
           </div>
           <iframe
-            src="http://82.157.13.146:18224/valkyrja/"
+            src="http://172.16.253.23:91/valkyrja/?type=tf"
             width="100%"
             height="100%"
             frameborder="0"

src/views/vent/fire/fireHome/index.vue

@@ -46,7 +46,7 @@
           <div class="center-scalc" @click="getScalc">
             <img src="../../../../assets/images/scalc.png" alt="" />
           </div>
-          <iframe src="http://82.157.13.146:18224/valkyrja/" width="100%" height="100%" frameborder="0"></iframe>
+          <iframe src="http://172.16.253.23:91/valkyrja/?type=tf" width="100%" height="100%" frameborder="0"></iframe>
         </div>
         <transition name="fade" mode="out-in">
           <div class="center-b" v-if="isShow">
@@ -326,7 +326,7 @@ async function getFireAreaInfoListDs() {
     dsCode.value = dsCode.value ? dsCode.value : selectListDs[0].value;
     let dataName = dataDs.filter((v) => v.areaName == dsCode.value)[0];
     outFireData.push(
-      { title: '光纤预警', val: dataName.infoTypeTwo.maxTemperature, dw: '℃', label: '最高温度' },
+      { title: '光钎预警', val: dataName.infoTypeTwo.maxTemperature, dw: '℃', label: '最高温度' },
       {
         title: '一氧化碳预警',
         val: dataName.infoTypeTwo.returnAirCornerCO,
@@ -524,6 +524,7 @@ onUnmounted(() => {
     timer = null;
   }
 });
+
 </script>
 
 <style lang="less" scoped>

src/views/vent/monitor/site/components/siteTree.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="overflow-auto">
     <Tree
       v-if="processedTreeData.length"
       :tree-data="processedTreeData"
@@ -10,7 +10,12 @@
     >
       <template #icon="scope">
         <Icon v-if="scope.selected" icon="material-symbols:circle" color="green" />
-        <Icon v-else-if="scope.selectable" icon="material-symbols:circle" />
+        <Icon v-else-if="scope.leaf && scope.selectable" icon="material-symbols:circle" />
+        <Icon
+          v-else-if="scope.leaf && !scope.selectable"
+          icon="material-symbols:circle"
+          color="red"
+        />
       </template>
     </Tree>
 
@@ -37,7 +42,8 @@
     const res: TreeNode = {
       title: node.label,
       key: node.id,
-      selectable: !!node.x,
+      selectable: !!node.display,
+      leaf: !!node.leafNode,
       raw: node,
       children: [],
     };
@@ -77,3 +83,8 @@
     expandedKeys,
   });
 </script>
+<style scoped>
+  ::v-deep(.vMonitor-tree) {
+    background-color: transparent;
+  }
+</style>

src/views/vent/monitor/site/index.vue

@@ -55,7 +55,7 @@
   const treeData = ref<MonitorSiteTreeNode>();
   function refreshTree(params: MonitorSiteTreeParams) {
     getMonitorSiteTree(params).then((r) => {
-      if (r.code === 200) treeData.value = r.result[0];
+      if (r.length) treeData.value = r[0];
     });
   }
 
@@ -89,6 +89,11 @@
   function handleSave(formData: SaveMonitorSiteParams) {
     saveMonitorSite(formData).then(() => {
       notification.success({ message: '保存成功' });
+      // 成功保存后刷新
+      postMonitorOperation(iframeRef.value!, {
+        clickType: 'refreshPoint',
+        from: 'tank',
+      });
     });
   }
 
@@ -110,7 +115,6 @@
   .monitor-site {
     position: relative;
     width: 100%;
-    height: calc(100vh - 60px);
-    margin-top: 50px;
+    height: 100%;
   }
 </style>

src/views/vent/monitor/site/types/siteTree.ts

@@ -3,5 +3,6 @@ export interface TreeNode {
   key: string;
   children: TreeNode[];
   selectable: boolean;
+  leaf: boolean;
   [k: string]: unknown;
 }