Merge remote-tracking branch 'origin/main'

src/api/analysis/analysis.js

@@ -55,11 +55,19 @@ export function editBidDataAPI(data) {
     })
 }
 
+// 招标解析->删除项目数据
+export function delProDataAPI(data) {
+    return request({
+        url: '/smartBid/analysis/delProData',
+        method: 'POST',
+        data
+    })
+}
 
 /* 测试 mq */
 export function testMQAPI(params) {
     return request({
-        url: '/smartBid/analysis/testAsyncMq2',
+        url: '/smartBid/analysis/testAsyncMq',
         method: 'GET',
         params
     })

src/views/analysis/components/AnalysisForm.vue

@@ -192,10 +192,11 @@ export default {
             try {
                 const data = await this.validate(formName)
                 console.log('data:', data);
-
+                const analysisLabelId = this.modelList.find(item => item.id === data.templateId).analysisLabelId;
                 // 所有校验通过，组装完整数据
                 let formData = {
                     ...data,
+                    analysisLabelId,
                     allFiles: Object.keys(data)
                         .filter(key => key.startsWith('fileList'))
                         .flatMap(key =>

src/views/analysis/index.vue

@@ -10,14 +10,10 @@
                 <template slot="tableActions">
                     <el-button @click="handleAdd" v-hasPermi="['analysis:analysis:add']" class="add-btn"><i
                             class="el-icon-plus"></i> 新建项目</el-button>
-                    <!-- <el-button @click="handleOnlyOffice">预览文档</el-button>
-                    <el-button @click="handleDocumentSearch">文档搜索功能</el-button>
-                    <el-button @click="handleDocumentSearchWord">Word文档搜索功能</el-button>
-                    <el-button @click="handleDocumentExcel">Excel文档查看</el-button>
-                    <el-button @click="handleTestMQ">测试MQ</el-button> -->
                 </template>
                 <template slot="analysisStatus" slot-scope="{ data }">
-                    <el-tag v-if="data.analysisStatus === '0'" type="info">解析中</el-tag>
+                    <el-tag v-if="!data.analysisStatus" type="info">待解析</el-tag>
+                    <el-tag v-else-if="data.analysisStatus === '0'" type="warn">解析中</el-tag>
                     <el-tag v-else-if="data.analysisStatus === '1'" type="success">解析成功</el-tag>
                     <el-tag v-else-if="data.analysisStatus === '2'" type="danger">解析失败</el-tag>
                 </template>
@@ -51,7 +47,7 @@
 import TableModel from '@/components/TableModel2'
 import { columnsList, formLabel } from './config'
 import { encryptWithSM4 } from '@/utils/sm'
-import { listAPI, delDataAPI, testMQAPI } from '@/api/analysis/analysis'
+import { listAPI, delProDataAPI, testMQAPI } from '@/api/analysis/analysis'
 import OnlyOfficeViewer from '@/views/common/OnlyOfficeViewer.vue'
 import AnalysisForm from './components/AnalysisForm.vue'
 export default {
@@ -69,64 +65,16 @@ export default {
             sendParams: {
                 enterpriseId: 2,
             },
-            showViewer: false,
-            documentUrl: 'http://192.168.0.14:9090/smart-bid/technicalSolutionDatabase/2025/11/03/716d9f3d89434c56bc49296dbbccc226.docx',
-            documentTitle: '716d9f3d89434c56bc49296dbbccc226.docx',
-            documentKey: '716d9f3d89434c56bc49296dbbccc226',
-            mode: 'edit',
-            type: 'desktop', // desktop, mobile embedded
             showAnalysisForm: false,
             title: '',
             row: {},
-            selectedRow: null, // 单选框选中的行数据
         }
     },
 
     created() { },
 
     methods: {
-        handleDocumentReady() {
-            console.log('文档已准备就绪');
-        },
-        handleAppReady() {
-            console.log('应用已准备就绪');
-        },
-        handleError(error) {
-            console.error('发生错误:', error);
-            this.$message.error('文档加载失败');
-        },
-        handleInitialized(editor) {
-            console.log('编辑器已初始化', editor);
-        },
-        handleOnlyOffice() {
-            this.$router.push({
-                name: 'TestOnlyOffice',
-            })
-        },
-        handleDocumentSearch() {
-            this.$router.push({
-                name: 'DocumentSearch',
-            })
-        },
-        handleDocumentSearchWord() {
-            this.$router.push({
-                name: 'DocumentSearchWord',
-            })
-        },
-        handleDocumentExcel() {
-            this.$router.push({
-                name: 'DocumentExcel',
-            })
-        },
-        handleTestMQ() {
-            testMQAPI().then(res => {
-                if (res.code === 200) {
-                    this.$message.success('测试MQ成功')
-                } else {
-                    this.$message.error(res.msg || '测试MQ失败')
-                }
-            })
-        },
+
         /** 新增按钮操作 */
         handleAdd() {
             this.title = '新建项目'
@@ -177,7 +125,7 @@ export default {
         /** 删除操作 */
         handleDelete(row) {
             this.$confirm(
-                `确定要删除"${row.toolName}"吗？删除后将无法恢复！`,
+                `确定要删除"${row.proName}"吗？删除后将无法恢复！`,
                 '操作提示',
                 {
                     confirmButtonText: '确定',
@@ -187,9 +135,8 @@ export default {
                     customClass: 'delete-confirm-dialog',
                 },
             ).then(() => {
-                delDataAPI({
-                    toolId: row.toolId,
-                    enterpriseId: this.enterpriseId,
+                delProDataAPI({
+                    proId: row.proId,
                 })
                     .then((res) => {
                         if (res.code === 200) {