zd

8605b4da · cat · d3b7283d · 8605b4da · 8605b4da · 8605b4da
Commit 8605b4da authored Nov 04, 2025 by cat
8 changed files
--- a/src/api/hyjyxx/hyjyxx.js
+++ b/src/api/hyjyxx/hyjyxx.js
-import request from "@/utils/request";
+import request from '@/utils/request'
 // 简单去重：相同 id 的详情请求在同一时刻仅发起一次
-const inFlightDetailMap = new Map();
+const inFlightDetailMap = new Map()
 // 查询会议信息列表
 export function listHyjyxx(query) {
  return request({
-    url: "/hyjyxx/hyjyxx/list",
+    url: '/hyjyxx/hyjyxx/list',
-    method: "get",
+    method: 'get',
    params: query,
-  });
+  })
 }
 // 查询会议信息详细
 export function getHyjyxx(id) {
-  const key = String(id);
+  const key = String(id)
  if (inFlightDetailMap.has(key)) {
-    return inFlightDetailMap.get(key);
+    return inFlightDetailMap.get(key)
  }
  const p = request({
-    url: "/hyjyxx/hyjyxx/" + id,
+    url: '/hyjyxx/hyjyxx/hyxx/' + id,
-    method: "get",
+    // url: "/hyjyxx/hyjyxx/" + id,
+    method: 'get',
  }).finally(() => {
    // 请求结束后清理，允许后续新的刷新
-    inFlightDetailMap.delete(key);
+    inFlightDetailMap.delete(key)
-  });
+  })
-  inFlightDetailMap.set(key, p);
+  inFlightDetailMap.set(key, p)
-  return p;
+  return p
 }
 // 新增会议信息
 export function addHyjyxx(data) {
  return request({
-    url: "/hyjyxx/hyjyxx",
+    url: '/hyjyxx/hyjyxx',
-    method: "post",
+    method: 'post',
    data: data,
-  });
+  })
 }
 // 修改会议信息
 export function updateHyjyxx(data) {
  return request({
-    url: "/hyjyxx/hyjyxx",
+    url: '/hyjyxx/hyjyxx',
-    method: "put",
+    method: 'put',
    data: data,
-  });
+  })
 }
 // 删除会议信息
 export function delHyjyxx(id) {
  return request({
-    url: "/hyjyxx/hyjyxx/" + id,
+    url: '/hyjyxx/hyjyxx/' + id,
-    method: "delete",
+    method: 'delete',
-  });
+  })
 }
 //下拉框
 export function getHyjyxxAll() {
  return request({
-    url: "/hyjyxxMb/hymb/selectHybm",
+    url: '/hyjyxxMb/hymb/selectHybm',
-    method: "get",
+    method: 'get',
-  });
+  })
 }
 // 开始转录
 export function startConvert(id) {
  return request({
    url: `/hyjyxx/hyjyxx/hyzl/${id}`,
-    method: "post",
+    method: 'post',
-  });
+  })
 }
--- a/src/api/hyjyxxFile/file.js
+++ b/src/api/hyjyxxFile/file.js
+import request from '@/utils/request'
+// 查询会议纪要_附件列表
+export function listFile(query) {
+  return request({
+    url: '/hyjyxxFile/file/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询会议纪要_附件详细
+export function getFile(id) {
+  return request({
+    url: '/hyjyxxFile/file/' + id,
+    method: 'get'
+  })
+}
+// 新增会议纪要_附件
+export function addFile(data) {
+  return request({
+    url: '/hyjyxxFile/file',
+    method: 'post',
+    data: data
+  })
+}
+// 修改会议纪要_附件
+export function updateFile(data) {
+  return request({
+    url: '/hyjyxxFile/file',
+    method: 'put',
+    data: data
+  })
+}
+// 删除会议纪要_附件
+export function delFile(id) {
+  return request({
+    url: '/hyjyxxFile/file/' + id,
+    method: 'delete'
+  })
+}
--- a/src/api/ysqqXmxx/ysqqXmxx.js
+++ b/src/api/ysqqXmxx/ysqqXmxx.js
-import request from "@/utils/request";
+import request from '@/utils/request'
 // 查询验收前期-项目信息列表
 export function listYsqqXmxx(query) {
  return request({
-    url: "/ysqqXmxx/ysqqXmxx/list",
+    url: '/ysqqXmxx/ysqqXmxx/list',
-    method: "get",
+    method: 'get',
    params: query,
-  });
+  })
 }
 // 查询验收前期-项目信息详细
 export function getYsqqXmxx(id) {
  return request({
-    url: "/ysqqXmxx/ysqqXmxx/" + id,
+    url: '/ysqqXmxx/ysqqXmxx/' + id,
-    method: "get",
+    method: 'get',
-  });
+  })
 }
 // 新增验收前期-项目信息
 export function addYsqqXmxx(data) {
  return request({
-    url: "/ysqqXmxx/ysqqXmxx",
+    url: '/ysqqXmxx/ysqqXmxx',
-    method: "post",
+    method: 'post',
    data: data,
-  });
+  })
 }
 // 修改验收前期-项目信息
 export function updateYsqqXmxx(data) {
  return request({
-    url: "/ysqqXmxx/ysqqXmxx",
+    url: '/ysqqXmxx/ysqqXmxx',
-    method: "put",
+    method: 'put',
    data: data,
-  });
+  })
 }
 // 删除验收前期-项目信息
 export function delYsqqXmxx(id) {
  return request({
-    url: "/ysqqXmxx/ysqqXmxx/" + id,
+    url: '/ysqqXmxx/ysqqXmxx/' + id,
-    method: "delete",
+    method: 'delete',
-  });
+  })
 }
 //提交按钮
 export function startConvert(id) {
  return request({
-    url: "/ysqqXmxx/ysqqXmxx/toDys/" + id,
+    url: '/ysqqXmxx/ysqqXmxx/toDys/' + id,
-    method: "post",
+    method: 'post',
-  });
+  })
 }
 //撤回按钮
 export function withdraw(id) {
  return request({
-    url: "/ysqqXmxx/ysqqXmxx/toWtj/" + id,
+    url: '/ysqqXmxx/ysqqXmxx/toWtj/' + id,
-    method: "post",
+    method: 'post',
-  });
+  })
 }
 export function toDht(id) {
+  // 参数验证：确保 id 有效
+  if (!id || id === 'null' || id === 'undefined' || String(id).trim() === '') {
+    return Promise.reject(new Error('无效的ID参数'))
+  }
  return request({
-    url: "/ysqqXmxx/ysqqXmxx/dht/" + id,
+    url: '/ysqqXmxx/ysqqXmxx/dht/' + id,
-    method: "get",
+    method: 'get',
-  });
+  })
 }
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -102,6 +102,19 @@ export const constantRoutes = [
    ],
  },
  {
+    path: '/hyjyxxFile',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'file/index',
+        component: () => import('@/views/hyjyxxFile/file/index'),
+        name: 'HyjyxxFileIndex',
+        meta: { title: '会议纪要附件', activeMenu: '/hyjyxx/hyjyxx' },
+      },
+    ],
+  },
+  {
    path: '/ysqqXmxxJxx/jxx',
    component: Layout,
    hidden: true,

--- a/src/views/hyjyxx/hyjyxx/detail.vue
+++ b/src/views/hyjyxx/hyjyxx/detail.vue
@@ -7,17 +7,26 @@
            </div>
            <el-row :gutter="20">
-                <el-col :span="12">
+                <el-col :span="16">
                    <el-card shadow="never"
                        body-style="padding: 12px; height: calc(100vh - 220px); overflow: hidden; display: flex; flex-direction: column;background-color:#f6f8fa  ">
                        <div style="font-weight: 600; margin-bottom: 8px;">转录文本</div>
                        <div class="transcript-area flex-scroll" style="margin-left: 10px;">
                            <div style="padding-bottom: 10px;">
-                                <div v-for="(segment, index) in transcriptList" :key="index" placement="top">
+                                <div v-for="(segment, index) in transcriptList" :key="index" placement="top" style="margin-bottom: 15px;">
+                                    <!-- start: 发言人头部信息 -->
                                    <div class="seg-header">
-                                        <span style="color: #000000; margin-right: 6px;">{{ segment.speaker }}</span>
+                                        <span class="speaker-name">{{ segment.speaker }}</span>
-                                        <span style="color: #C0C4CC;">{{ segment.timestamp || segment.time }}</span>
+                                        <span class="time-badge time-start">
+                                            <i class="el-icon-time"></i>
+                                            <span class="time-value">{{ segment.timestamp || segment.time }}</span>
+                                        </span>
+                                        <span v-if="segment.realTime" class="time-badge time-end">
+                                            <i class="el-icon-time"></i>
+                                            <span class="time-value">{{ segment.realTime }}</span>
+                                        </span>
                                    </div>
+                                    <!-- end: 发言人头部信息 -->
                                    <div class="seg-body">
                                        <el-avatar :class="getAvatarClass(getSpeakerIndex(segment.speaker))">
                                            <img :src="getSpeakerIcon(getSpeakerIndex(segment.speaker))"
@@ -29,6 +38,20 @@
                                                title="点击跳转到该时间播放">{{
                                                    segment.content
                                                    || segment.text }}</div>
+                                            <!-- start: 图片展示区域 -->
+                                            <div v-if="segment.file && segment.file.length > 0" class="seg-images">
+                                                <el-image
+                                                    v-for="(imgUrl, imgIndex) in segment.file"
+                                                    :key="imgIndex"
+                                                    :src="getImageUrl(imgUrl)"
+                                                    :preview-src-list="getPreviewImageList(segment.file)"
+                                                    :initial-index="imgIndex"
+                                                    fit="cover"
+                                                    class="seg-image-item"
+                                                    lazy>
+                                                </el-image>
+                                            </div>
+                                            <!-- end: 图片展示区域 -->
                                        </div>
                                    </div>
                                </div>
@@ -39,7 +62,7 @@
                        </div>
                    </el-card>
                </el-col>
-                <el-col :span="12">
+                <el-col :span="8">
                    <el-card shadow="never" body-style="padding: 12px; height: calc(100vh - 220px); overflow: auto;">
                        <div
                            style="display:flex; align-items:center; justify-content: space-between; margin-bottom: 12px;">
@@ -163,6 +186,27 @@ export default {
            const base = process.env.VUE_APP_BASE_API || ''
            return `${base}${path}`
        },
+        /**
+         * 获取图片完整URL
+         * @param {string} path - 图片路径
+         * @returns {string} 完整URL
+         */
+        getImageUrl(path) {
+            if (!path) return ''
+            // 绝对地址直接返回，相对地址补全网关前缀
+            if (/^https?:\/\//i.test(path)) return path
+            const base = process.env.VUE_APP_BASE_API || ''
+            return `${base}${path}`
+        },
+        /**
+         * 获取预览图片列表（用于图片预览功能）
+         * @param {Array} fileList - 文件路径数组
+         * @returns {Array} 完整URL数组
+         */
+        getPreviewImageList(fileList) {
+            if (!Array.isArray(fileList) || fileList.length === 0) return []
+            return fileList.map(path => this.getImageUrl(path))
+        },
        load() {
            if (!this.id) return
            if (this._loadedId === this.id) {
@@ -296,12 +340,84 @@ export default {
 .seg-header {
    display: flex;
    align-items: center;
-    gap: 6px;
+    gap: 8px;
-    flex-wrap: nowrap;
+    flex-wrap: wrap;
-    white-space: nowrap;
    margin-bottom: 8px;
 }
+/* 发言人名称样式 */
+.speaker-name {
+    color: #303133;
+    font-weight: 600;
+    font-size: 14px;
+    margin-right: 4px;
+}
+/* 时间标签容器 */
+.time-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    padding: 4px 8px;
+    border-radius: 4px;
+    font-size: 12px;
+    line-height: 1;
+    transition: all 0.3s;
+    margin-left: -4px;
+}
+/* 开始时间样式 */
+.time-start {
+    background-color: #ecf5ff;
+    color: #409eff;
+    border: 1px solid #b3d8ff;
+}
+.time-start i {
+    font-size: 12px;
+}
+.time-start .time-label {
+    color: #66b1ff;
+    font-weight: 500;
+}
+.time-start .time-value {
+    color: #409eff;
+    font-weight: 600;
+}
+/* 结束时间样式 */
+.time-end {
+    background-color: #f0f9ff;
+    /* color: #67c23a;
+    border: 1px solid #c2e7b0; */
+    color: #ff0000;
+    border: 1px solid #e7b0b0;
+}
+.time-end i {
+    font-size: 12px;
+}
+.time-end .time-label {
+    color: #f47777;
+    /* color: #85ce61; */
+    font-weight: 500;
+}
+.time-end .time-value {
+    color: #ec5656;
+    /* color: #67c23a; */
+    font-weight: 600;
+}
+/* 时间标签悬浮效果 */
+.time-badge:hover {
+    transform: translateY(-1px);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
 /* 下方头像 + 内容布局 */
 .seg-body {
    display: flex;
@@ -348,7 +464,7 @@ export default {
    border: 1px solid #ebeef5;
    border-radius: 8px;
    padding: 8px 10px;
-    margin-left: 10px;
+    margin-left:22px;
    flex: 1 1 auto;
 }
@@ -357,6 +473,29 @@ export default {
    background-color: #f0f8ff;
 }
+/* 图片展示区域 */
+.seg-images {
+    margin-top: 10px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+}
+.seg-image-item {
+    width: 35px;
+    height: 35px;
+    border-radius: 4px;
+    overflow: hidden;
+    cursor: pointer;
+    border: 1px solid #ebeef5;
+    transition: all 0.3s;
+}
+.seg-image-item:hover {
+    border-color: #409EFF;
+    transform: scale(1.02);
+}
 /* 11种可区分的颜色，按发言人编号映射 */
 .avatar-color-1 {
    color: #14a1ff;

--- a/src/views/hyjyxx/hyjyxx/index.vue
+++ b/src/views/hyjyxx/hyjyxx/index.vue
@@ -82,7 +82,7 @@
      </el-table-column>
      <el-table-column label="音频文件名称" align="center" prop="ypwjName" min-width="140" show-overflow-tooltip />
      <el-table-column label="会议模版名称" align="center" prop="mbmc" min-width="140" show-overflow-tooltip />
-      <el-table-column label="会议开始时间" align="center" prop="jxwcsj" width="180">
+      <el-table-column label="音频开始时间" align="center" prop="jxwcsj" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.jxwcsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
        </template>
@@ -104,13 +104,14 @@
      <el-table-column label="备用1" align="center" prop="ext1" />
      <el-table-column label="备用2" align="center" prop="ext2" />
      <el-table-column label="备用3" align="center" prop="ext3" /> -->
-      <el-table-column label="操作" min-width="120" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" min-width="200" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['hyjyxx:hyjyxx:edit']">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['hyjyxx:hyjyxx:remove']">删除</el-button>
          <el-button size="mini" type="text" icon="el-icon-bottom-right" @click="handleKszr(scope.row)">开始转录</el-button>
+          <el-button size="mini" type="text" icon="el-icon-document" @click="handleHyjyxxFile(scope.row)">截图管理</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -150,7 +151,7 @@
        <!-- <el-form-item label="会议纪要" prop="hyjy">
          <el-input v-model="form.hyjy" type="textarea" placeholder="请输入内容" />
        </el-form-item> -->
-        <el-form-item label="会议开始时间" prop="jxwcsj">
+        <el-form-item label="音频开始时间" prop="jxwcsj">
          <el-date-picker clearable v-model="form.jxwcsj" type="datetime" format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择会议开始时间" style="width: 100%;">
          </el-date-picker>
@@ -238,6 +239,18 @@ export default {
      form: {},
      // 表单校验
      rules: {
+        hymc: [
+          { required: true, message: "会议名称不能为空", trigger: "blur" }
+        ],
+        ypwj: [
+          { required: true, message: "会议音频文件不能为空", trigger: "change" }
+        ],
+        mbmc: [
+          { required: true, message: "会议模版不能为空", trigger: "change" }
+        ],
+        jxwcsj: [
+          { required: true, message: "音频开始时间不能为空", trigger: "change" }
+        ]
      }
    }
  },
@@ -431,6 +444,14 @@ export default {
      this.download('hyjyxx/hyjyxx/export', {
        ...this.queryParams
      }, `hyjyxx_${new Date().getTime()}.xlsx`)
+    },
+    /** 截图管理按钮操作 */
+    handleHyjyxxFile(row) {
+      if (!row || !row.id) {
+        this.$modal.msgError("未找到会议ID")
+        return
+      }
+      this.$router.push({ path: `/hyjyxxFile/file/index`, query: { hyid: row.id } })
    }
  }
 }

--- a/src/views/hyjyxxFile/file/index.vue
+++ b/src/views/hyjyxxFile/file/index.vue
--- a/src/views/ysqqXmxx/ysgc/index.vue
+++ b/src/views/ysqqXmxx/ysgc/index.vue
@@ -304,14 +304,6 @@ export default {
          lineStyle: { color: '#00aa66', width: 2 },
          tooltip: { show: false }
        })
-        // 调试：在每条线之上叠加小点，便于核对路径
-        series.push({
-          type: 'scatter',
-          data: line,
-          symbolSize: 3,
-          itemStyle: { color: '#888' },
-          tooltip: { show: false }
-        })
      }
      // 垂直参考线（可选）
      if (this.verticalLineX != null && this.yMin != null && this.yMax != null) {
@@ -362,7 +354,37 @@ export default {
          } 
        } : { type: 'value', min: this.yMin, max: this.yMax, scale: false, axisLine: { show: true }, axisTick: { show: true }, axisLabel: { color: '#666' }, splitLine: { show: true, lineStyle: { color: '#9bb3e7', opacity: 0.6 } } },
        series,
-        tooltip: { trigger: 'item' }
+        // 提示框
+        tooltip: {
+          trigger: 'item',
+          backgroundColor: 'rgba(33, 41, 54, 0.95)',
+          borderColor: '#1f6feb',
+          borderWidth: 0,
+          padding: [8, 10],
+          textStyle: { color: '#fff', fontSize: this.compact ? 10 : 12, fontWeight: 500 },
+          extraCssText: 'box-shadow: 0 6px 16px rgba(0,0,0,.20); border-radius: 8px;',
+          formatter: params => {
+            const formatNum = n => {
+              if (n == null || isNaN(n)) return '-'
+              return Number(n).toLocaleString('zh-CN')
+            }
+            if (params && params.seriesType === 'scatter') {
+              const d = params.data || []
+              const name = d[2] || ''
+              const x = d[0]
+              const y = d[1]
+              return (name ? name + '<br/>' : '') + `X：${formatNum(x)}<br/>Y：${formatNum(y)}`
+            }
+            if (params && params.seriesType === 'line') {
+              const d = params.data || []
+              const x = d[0]
+              const y = d[1]
+              return `X：${formatNum(x)}<br/>Y：${formatNum(y)}`
+            }
+            const v = Array.isArray(params && params.value) ? params.value[1] : (params && params.value)
+            return v != null ? formatNum(v) : ''
+          }
+        }
      }
    },
    // 渲染或更新图表
@@ -384,15 +406,15 @@ export default {
        // 如果有井点散点，最前面占 1 个 series
        const hasPoints = Array.isArray(this.points) && this.points.length > 0
        const base = hasPoints ? 1 : 0
-        // 每条线我们 push 了两个 series：line 和一个灰色散点
+        // 现在每条 SEGY 线只对应一个 line series
        if (seriesIndex < base) return -1
        const offset = seriesIndex - base
-        // 偶数 -> 折线；奇数 -> 叠加的灰色散点
+        if (offset < 0 || offset >= this.segyLines.length) return -1
-        return Math.floor(offset / 2)
+        return offset
      }
      const emitPick = (params) => {
-        if (!params || (params.seriesType !== 'line' && params.seriesType !== 'scatter')) return
+        if (!params || params.seriesType !== 'line') return
        const idx = getLineIndexBySeries(params.seriesIndex)
        if (idx >= 0 && idx < this.segyLines.length) {
          this.$emit('segyLinePick', { index: idx })