vue2-client 1.22.28 → 1.22.30

package/src/base-client/components/common/XInspectionDetailDrawer/components/HazardPhotos.vue

@@ -99,6 +99,24 @@
               :ref="el => registerFig(el)"
             />
           </div>
+          <div class="hazard-photos-section" v-if="hazard.handleMethod && hazard.handleMethod !== '现场处理' && hazard.handleimages && hazard.handleimages.length > 0">
+            <div class="photos-label">
+              <a-icon type="camera" />
+              处理后照片
+            </div>
+            <file-image-group
+              :file-ids="hazard.handleimages"
+              :service-name="serviceName"
+              :columns="3"
+              :image-size="70"
+              :gap="10"
+              alt-prefix="处理后照片"
+              empty-text="暂无处理后照片"
+              :no-preview="true"
+              @image-click="handleImageClick"
+              :ref="el => registerFig(el)"
+            />
+          </div>
         </div>
 
         <!-- 无隐患状态 -->

package/src/base-client/components/common/XInspectionDetailDrawer/index.vue

@@ -265,7 +265,6 @@ import ImagePreviewModal from '@vue2-client/base-client/components/common/ImageP
 import { printWithHtmlToImage, exportToPDFWithJpeg } from '@vue2-client/utils/htmlToImage'
 import { runLogic } from '@vue2-client/services/api/common'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-
 export default {
   name: 'XInspectionDetailDrawer',
   components: {
@@ -464,6 +463,12 @@ export default {
       }
       console.warn('datra', data)
       this.formFigInstances = []
+      //遍历隐患明细,获取隐患处理后照片
+      for (let i = 0; i < data.hazardList.length; i++) {
+        let  param = { defectId:data.hazardList[i].id }
+        const res = await runLogic('getDefectDetailList', param,'af-safecheck')
+        data.hazardList[i].handleimages=res[0].handleimages
+      }
       this.inspectionData = {
         ...data,
         historyList: this.inspectionData.historyList || data.historyList || []

package/src/base-client/components/common/XMarkdownViewer/demo.vue

@@ -1,102 +1,102 @@
-<template>
-  <div style="padding: 16px">
-    <h2>XMarkdownViewer Demo</h2>
-
-    <div style="margin: 12px 0; padding: 12px; background: #f5f5f5; border-radius: 4px">
-      <h4 style="margin: 0 0 8px 0">流式 AI 调用示例</h4>
-      <div style="margin-bottom: 8px">
-        <input
-          v-model="userMessage"
-          type="text"
-          placeholder="输入消息"
-          style="width: 300px; padding: 6px 8px; border: 1px solid #ddd; border-radius: 4px"
-          @keyup.enter="sendMessage"
-        >
-        <button
-          type="button"
-          style="margin-left: 8px; padding: 6px 16px; background: #1890ff; color: #fff; border: none; border-radius: 4px; cursor: pointer"
-          @click="sendMessage"
-        >
-          发送
-        </button>
-        <button
-          v-if="isStreaming"
-          type="button"
-          style="margin-left: 8px; padding: 6px 16px; background: #ff4d4f; color: #fff; border: none; border-radius: 4px; cursor: pointer"
-          @click="stopMessage"
-        >
-          停止
-        </button>
-      </div>
-      <div v-if="isStreaming" style="color: #1890ff; font-size: 12px">AI 正在思考中...</div>
-    </div>
-
-    <div style="margin: 8px 0; color: #666; font-size: 12px">
-      <span v-if="fileName">当前文件：{{ fileName }}（{{ md.length }} 字符）</span>
-      <span v-else-if="md">当前内容：流式响应（{{ md.length }} 字符）</span>
-      <span v-else>请输入消息并点击发送</span>
-    </div>
-
-    <x-markdown-viewer ref="viewer" :markdown="md" />
-  </div>
-</template>
-
-<script>
-import XMarkdownViewer from './XMarkdownViewer.vue'
-
-export default {
-  name: 'XMarkdownViewerDemo',
-  components: {
-    XMarkdownViewer
-  },
-  data () {
-    return {
-      md: '',
-      fileName: '',
-      userMessage: '',
-      isStreaming: false,
-      currentStream: null
-    }
-  },
-  methods: {
-    async sendMessage () {
-      const message = this.userMessage.trim()
-      if (!message) return
-
-      const viewer = this.$refs.viewer
-      if (!viewer || typeof viewer.callAiStream !== 'function') {
-        console.warn('[Demo] viewer 不存在或没有 callAiStream 方法')
-        return
-      }
-
-      // 开始时显示提示
-      viewer.receiveMarkdownString('### 思考中，请稍后...\n')
-      this.isStreaming = true
-
-      // 调用流式接口
-      const stream = viewer.callAiStream(message, {
-        onChunk: (text) => {
-          viewer.receiveMarkdownString('### 思考中，请稍后...\n\n' + viewer.getStreamContent())
-        },
-        onEnd: (fullContent) => {
-          viewer.receiveMarkdownString(fullContent)
-          this.isStreaming = false
-        },
-        onError: (error) => {
-          viewer.receiveMarkdownString('### 抱歉，发生了错误\n\n' + error)
-          this.isStreaming = false
-        }
-      })
-
-      this.currentStream = stream
-    },
-    stopMessage () {
-      if (this.currentStream && typeof this.currentStream.stop === 'function') {
-        this.currentStream.stop()
-        this.isStreaming = false
-      }
-    }
-  }
-}
-</script>
-
+<template>
+  <div style="padding: 16px">
+    <h2>XMarkdownViewer Demo</h2>
+
+    <div style="margin: 12px 0; padding: 12px; background: #f5f5f5; border-radius: 4px">
+      <h4 style="margin: 0 0 8px 0">流式 AI 调用示例</h4>
+      <div style="margin-bottom: 8px">
+        <input
+          v-model="userMessage"
+          type="text"
+          placeholder="输入消息"
+          style="width: 300px; padding: 6px 8px; border: 1px solid #ddd; border-radius: 4px"
+          @keyup.enter="sendMessage"
+        >
+        <button
+          type="button"
+          style="margin-left: 8px; padding: 6px 16px; background: #1890ff; color: #fff; border: none; border-radius: 4px; cursor: pointer"
+          @click="sendMessage"
+        >
+          发送
+        </button>
+        <button
+          v-if="isStreaming"
+          type="button"
+          style="margin-left: 8px; padding: 6px 16px; background: #ff4d4f; color: #fff; border: none; border-radius: 4px; cursor: pointer"
+          @click="stopMessage"
+        >
+          停止
+        </button>
+      </div>
+      <div v-if="isStreaming" style="color: #1890ff; font-size: 12px">AI 正在思考中...</div>
+    </div>
+
+    <div style="margin: 8px 0; color: #666; font-size: 12px">
+      <span v-if="fileName">当前文件：{{ fileName }}（{{ md.length }} 字符）</span>
+      <span v-else-if="md">当前内容：流式响应（{{ md.length }} 字符）</span>
+      <span v-else>请输入消息并点击发送</span>
+    </div>
+
+    <x-markdown-viewer ref="viewer" :markdown="md" />
+  </div>
+</template>
+
+<script>
+import XMarkdownViewer from './XMarkdownViewer.vue'
+
+export default {
+  name: 'XMarkdownViewerDemo',
+  components: {
+    XMarkdownViewer
+  },
+  data () {
+    return {
+      md: '',
+      fileName: '',
+      userMessage: '',
+      isStreaming: false,
+      currentStream: null
+    }
+  },
+  methods: {
+    async sendMessage () {
+      const message = this.userMessage.trim()
+      if (!message) return
+
+      const viewer = this.$refs.viewer
+      if (!viewer || typeof viewer.callAiStream !== 'function') {
+        console.warn('[Demo] viewer 不存在或没有 callAiStream 方法')
+        return
+      }
+
+      // 开始时显示提示
+      viewer.receiveMarkdownString('### 思考中，请稍后...\n')
+      this.isStreaming = true
+
+      // 调用流式接口
+      const stream = viewer.callAiStream(message, {
+        onChunk: (text) => {
+          viewer.receiveMarkdownString('### 思考中，请稍后...\n\n' + viewer.getStreamContent())
+        },
+        onEnd: (fullContent) => {
+          viewer.receiveMarkdownString(fullContent)
+          this.isStreaming = false
+        },
+        onError: (error) => {
+          viewer.receiveMarkdownString('### 抱歉，发生了错误\n\n' + error)
+          this.isStreaming = false
+        }
+      })
+
+      this.currentStream = stream
+    },
+    stopMessage () {
+      if (this.currentStream && typeof this.currentStream.stop === 'function') {
+        this.currentStream.stop()
+        this.isStreaming = false
+      }
+    }
+  }
+}
+</script>
+