Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/layouts/default/sider/bottomSider2.vue

@@ -71,9 +71,10 @@
                 <div v-else class="system-message">
                   <div class="answerIcon"></div>
                   <div class="answer-message">
-                    <div>
+                    <!-- <div>
                       <span>{{ message.content }}</span>
-                    </div>
+                    </div> -->
+                    <div v-html="formatMessage(message.content)"></div>
                   </div>
                 </div>
               </div>
@@ -173,47 +174,56 @@ async function handleSend() {
   };
   inputText.value = ''; // 清空输入框
   //将用户输入的内容发送到后端
-  let response = await fetch('http://182.92.126.35:6005/chat', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(params),
-  });
-  const data = await response.json();
-  const assistantReply = data.reply; // 获取助手回复
-  systemMessage.value = assistantReply;
-  // 添加系统回答
-  messageList.value.push({
-    id: `system_${Date.now()}`,
-    type: 'system',
-    content: systemMessage.value,
-    timestamp: Date.now(),
-  });
-  spinning.value = false;
+  try {
+    // 将用户输入的内容发送到后端
+    let response = await fetch('http://182.92.126.35:6005/chat', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(params),
+    });
+
+    if (!response.ok) {
+      throw new Error('Network response was not ok');
+    }
+
+    const data = await response.json();
+    const assistantReply = data.reply; // 获取助手回复
+    formatMessage(assistantReply);
+    systemMessage.value = assistantReply;
+
+    // 添加系统回答
+    messageList.value.push({
+      id: `system_${Date.now()}`,
+      type: 'system',
+      content: systemMessage.value,
+      timestamp: Date.now(),
+    });
+  } catch (error) {
+    // 请求失败时设置系统消息为"服务器异常"
+    systemMessage.value = '服务器异常';
+    console.error('请求失败:', error);
+  } finally {
+    spinning.value = false; // 无论请求成功与否，都停止加载指示器
+  }
+}
+//格式化消息
+function formatMessage(text: string) {
+  let formatted = text
+    // 处理换行
+    .replace(/\n\n/g, '<br>')
+    .replace(/\n###/g, '<br> ')
+    .replace(/###/g, '')
+    .replace(/---/g, '')
+    // 处理粗体
+    .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
+    // 处理斜体
+    .replace(/\*(.*?)\*/g, '<em>$1</em>')
+    // 处理行内代码
+    .replace(/`([^`]+)`/g, '<code>$1</code>');
+  return formatted;
 }
-// async function handleSend() {
-//   spinning.value = true;
-//   userMessage.value.push({
-//     msg: inputText.value, // 消息内容
-//   });
-//   inputText.value = ''; // 清空输入框
-//   const params = {
-//     messages: [{ role: 'user', content: inputText.value }],
-//   };
-//   //将用户输入的内容发送到后端
-//   let response = await fetch('http://182.92.126.35:6005/chat', {
-//     method: 'POST',
-//     headers: {
-//       'Content-Type': 'application/json',
-//     },
-//     body: JSON.stringify(params),
-//   });
-//   const data = await response.json();
-//   spinning.value = false;
-//   const assistantReply = data.reply; // 获取助手回复
-//   systemMessage.value = assistantReply;
-// }
 // 初始化按钮定位
 onMounted(() => {});
 </script>
@@ -387,6 +397,7 @@ onMounted(() => {});
   flex-direction: row;
 }
 .answerIcon {
+  flex-shrink: 0;
   margin-top: 10px;
   width: 35px;
   height: 35px;
@@ -395,7 +406,6 @@ onMounted(() => {});
 }
 .answer-message {
   float: left;
-  max-width: 80%;
   padding: 10px;
   margin: 10px;
   border-radius: 5px;
@@ -408,7 +418,7 @@ onMounted(() => {});
   display: flex;
   flex-direction: row;
   align-self: flex-start;
-  max-width: 90%;
+  width: 100%;
   padding: 12px;
   display: flex;
 }
@@ -421,7 +431,7 @@ onMounted(() => {});
 }
 .answer-message {
   float: left;
-  max-width: 80%;
+  width: 100%;
   padding: 10px;
   margin: 10px;
   border-radius: 5px;
@@ -439,7 +449,7 @@ onMounted(() => {});
   min-height: 40px; /* 避免高度塌陷 */
 }
 .message-item.user {
-  margin-bottom: 30px;
+  margin-bottom: 50px;
 }
 .input-area {
   background-color: #043256 !important;

src/views/vent/monitorManager/comment/FanDeviceEcharts.vue

@@ -319,7 +319,7 @@
               if (props.dataSource['stationtype'] !== 'redis') {
                 resultXAxisPropType.value = 'ttime';
                 historyList = (params) => defHttp.get({ url: '/safety/ventanalyMonitorData/listdays', params });
-                const datas = await historyList({
+                const datas1 = await historyList({
                   ttime_begin: newHistoryParams.ttime_begin,
                   ttime_end: newHistoryParams.ttime_end,
                   strtype: device.deviceType,
@@ -328,14 +328,27 @@
                   pageSize: pageSize.value,
                   pageNo: currentPage.value,
                   column: 'createTime',
+                  deviceNum: 'Fan1',
                 });
-                res = datas['datalist']['records'];
+                const datas2 = await historyList({
+                  ttime_begin: newHistoryParams.ttime_begin,
+                  ttime_end: newHistoryParams.ttime_end,
+                  strtype: device.deviceType,
+                  gdeviceid: newDeviceId,
+                  skip: historyParams.skip,
+                  pageSize: pageSize.value,
+                  pageNo: currentPage.value,
+                  column: 'createTime',
+                  deviceNum: 'Fan2',
+                });
+                res = datas1['datalist']['records'];
+                const res2 = datas2['datalist']['records'];
                 if (res && res.length > 0) {
-                  resultDataSource.value = res.map((item) => Object.assign(item, item.readData));
+                  resultDataSource.value = res.map((item, index) => Object.assign(item, item.readData, res2[index]['readData']));
                 } else {
                   resultDataSource.value = [];
                 }
-                total.value = datas['datalist'].total;
+                total.value = datas1['datalist'].total;
               } else {
                 historyList = (params) => defHttp.post({ url: '/monitor/history/getHistoryData', params });
                 resultXAxisPropType.value = 'time';
@@ -348,6 +361,7 @@
                   strtype: device.deviceType,
                   interval: historyParams.interval,
                   column: 'createTime',
+                  deviceNum: 'Fan2',
                 });
                 if (res && res.records && res.records.length > 0) {
                   resultDataSource.value = res.records.map((item) => Object.assign(item, item.readData));

src/views/vent/monitorManager/deviceMonitor/components/device/modal/atomizing.modal.vue

@@ -99,8 +99,7 @@
                 >
               </div>
             </div>
-
-            <div class="base-item">
+            <!-- <div class="base-item">
               <span class="title">支架主机数量：</span>
               <span class="value">{{ atomizingMonitor['holderCounts'] ? atomizingMonitor['holderCounts'] : '-' }}</span>
             </div>
@@ -111,7 +110,7 @@
             <div class="base-item">
               <span class="title">支架喷雾延时：</span>
               <span class="value">{{ atomizingMonitor['holderDelayed'] ? atomizingMonitor['holderDelayed'] : '-' }} h</span>
-            </div>
+            </div> -->
           </div>
         </div>
         <div class="right-monitor">
@@ -384,7 +383,7 @@
       .base-info {
         .base-box {
           width: calc(100% - 20px);
-          height: 130px;
+          height: 120px;
           font-size: 14px;
           display: flex;
           flex-direction: row;