diff --git a/src/api/analysis/analysis.js b/src/api/analysis/analysis.js
index 9190cd1..fa14645 100644
--- a/src/api/analysis/analysis.js
+++ b/src/api/analysis/analysis.js
@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
-// 工器具库->查询列表
+// 招标解析->查询列表
 export function listAPI(params) {
     return request({
-        url: '/smartBid/mainDatabase/tool/getList',
+        url: '/smartBid/analysis/getList',
         method: 'GET',
         params
     })
diff --git a/src/api/common/select.js b/src/api/common/select.js
new file mode 100644
index 0000000..2894156
--- /dev/null
+++ b/src/api/common/select.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 招标解析模板下拉选
+export function getAnalysisTemplateSelectApi(data) {
+    return request({
+        url: '/smartBid/commonSelect/getAnalysisSelects',
+        method: 'GET',
+        params: data
+    })
+}
\ No newline at end of file
diff --git a/src/views/analysis/components/AnalysisForm.vue b/src/views/analysis/components/AnalysisForm.vue
index 1c3ee6e..b4e2928 100644
--- a/src/views/analysis/components/AnalysisForm.vue
+++ b/src/views/analysis/components/AnalysisForm.vue
@@ -30,6 +30,7 @@
 <script>
 import _ from 'lodash'
 import UploadMoreFile from '@/views/common/UploadMoreFile.vue'
+import { getAnalysisTemplateSelectApi } from '@/api/common/select'
 // 默认参数
 const defaultParams = {
     fileUploadRule: {
@@ -55,7 +56,7 @@ export default {
             defaultParams,
             uploadType: [],
             modelList: [
-                {
+                /* {
                     id: 1,
                     name: '南网工程类模板',
                     uploadType: '招标文件,招标公告',
@@ -64,7 +65,7 @@ export default {
                     id: 2,
                     name: '南网服务类模板',
                     uploadType: '评标文件',
-                },
+                }, */
             ],
             form: {
                 templateId: null,
@@ -114,8 +115,18 @@ export default {
             immediate: true,
         },
     },
-
+    created() {
+        this.getAnalysisTemplateSelect()
+    },
     methods: {
+        // 获取招标解析模板下拉选
+        async getAnalysisTemplateSelect() {
+            const res = await getAnalysisTemplateSelectApi()
+            if (res.code === 200) {
+                this.modelList = res.data
+            }
+        },
+
         /* 模板变化选择对应的需要上传的文件 */
         handleTemplateChange(val) {
             const uploadType = this.modelList.find(
diff --git a/src/views/analysis/config.js b/src/views/analysis/config.js
index 0f450bf..5cc07d3 100644
--- a/src/views/analysis/config.js
+++ b/src/views/analysis/config.js
@@ -11,7 +11,7 @@ export const formLabel = [
         isShow: false, // 是否展示label
         f_type: 'ipt',
         f_label: '招标人',
-        f_model: 'personName',
+        f_model: 'tenderer',
         f_max: 32,
         f_width: '250px',
     },
@@ -21,7 +21,7 @@ export const formLabel = [
         f_label: '开标时间',
         f_model: 'openTime',
         f_width: '350px',
-        dateType: ['openStartTime', 'openEndTime'], // 开始时间和结束时间字段名
+        dateType: ['startDate', 'endDate'], // 开始时间和结束时间字段名
     },
 ]
 
@@ -57,15 +57,15 @@ export const bidFormLabel = [
 ]
 
 export const columnsList = [
-    { t_props: 'toolName', t_label: '模板名称' },
-    { t_props: 'model', t_label: '项目名称' },
-    { t_props: 'unit', t_label: '项目编号' },
-    { t_props: 'technicalParameters', t_label: '招标人' },
-    { t_props: 'mainFunction', t_label: '代理机构' },
-    { t_props: 'mainFunction', t_label: '开标时间' },
-    { t_props: 'mainFunction', t_label: '开标方式' },
-    { t_props: 'mainFunction', t_label: '解析状态' },
-    { t_props: 'mainFunction', t_label: '创建时间' },
+    { t_props: 'templateName', t_label: '模板名称' },
+    { t_props: 'proName', t_label: '项目名称' },
+    { t_props: 'proCode', t_label: '项目编号' },
+    { t_props: 'tenderer', t_label: '招标人' },
+    { t_props: 'agency', t_label: '代理机构' },
+    { t_props: 'bidOpeningTime', t_label: '开标时间' },
+    { t_props: 'bidOpeningMethod', t_label: '开标方式' },
+    { t_slot: 'analysisStatus', t_label: '解析状态' },
+    { t_props: 'createTime', t_label: '创建时间' },
 ]
 
 export const detailColumnsList = [
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 69c8df2..65cd7ec 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -16,6 +16,11 @@
                     <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-else-if="data.analysisStatus === 1" type="success">解析成功</el-tag>
+                    <el-tag v-else-if="data.analysisStatus === 2" type="danger">解析失败</el-tag>
+                </template>
                 <template slot="handle" slot-scope="{ data }">
                     <el-button type="text" v-hasPermi="['enterpriseLibrary:analysis:detail']" class="action-btn"
                         @click="handleDetail(data)">