Merge branch 'develop' of http://173.18.12.196:3000/front/toid-client into develop

src/api/statistics/report.js

@@ -104,3 +104,11 @@ export async function getAssemblyAccessionList(keyword) {
     method: 'get',
   })
 }
+
+export function qqlxbxjcsj(data) {
+  return request({
+    url: '/data/report/qqlxbxjcsj',
+    method: 'post',
+    data: data
+  })
+}

src/views/data/dataBase/byt.vue

@@ -92,7 +92,6 @@
           @click="$refs.upload_file.click()"
         >导入</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataBaseList" >
@@ -131,6 +130,12 @@
       <el-table-column label="耐药药品" align="center" prop="nyjy" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['data:dataReportByt:edit']"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
@@ -156,11 +161,11 @@
     />
 
     <!-- 添加或修改病原体管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="NCBI基因组序列编号" prop="assemblyAccession">
           <el-select
-            v-model="form.assemblyAccession"
+            v-if="!view" v-model="form.assemblyAccession"
             filterable
             remote
             reserve-keyword
@@ -178,10 +183,11 @@
             >
             </el-option>
           </el-select>
+           <span v-else>{{ form.assemblyAccession }}</span>
         </el-form-item>
         <el-form-item label="病原体名称" prop="organismName">
           <el-select
-            v-model="form.organismName"
+            v-if="!view" v-model="form.organismName"
             filterable
             remote
             reserve-keyword
@@ -198,99 +204,131 @@
             >
             </el-option>
           </el-select>
+           <span v-else>{{ form.organismName }}</span>
         </el-form-item>
         <el-form-item label="病原类型" prop="group">
-          <el-input v-model="form.group" placeholder="请输入病原类型" />
+          <el-input v-if="!view" v-model="form.group" placeholder="请输入病原类型" />
+          <span v-else>{{ form.group }}</span>
         </el-form-item>
         <el-form-item label="子类标签" prop="group1">
-          <el-input v-model="form.group1" placeholder="请输入子类标签" />
+          <el-input v-if="!view" v-model="form.group1" placeholder="请输入子类标签" />
+          <span v-else>{{ form.group1 }}</span>
         </el-form-item>
         <el-form-item label="中文注释" prop="defined">
-          <el-input type="textarea" v-model="form.defined" placeholder="请输入中文注释" />
+          <el-input v-if="!view" type="textarea" v-model="form.defined" placeholder="请输入中文注释" />
+          <span v-else>{{ form.defined }}</span>
         </el-form-item>
         <el-form-item label="解释的来源" prop="definedSource">
-          <el-input v-model="form.definedSource" placeholder="请输入解释的来源" />
+          <el-input v-if="!view" v-model="form.definedSource" placeholder="请输入解释的来源" />
+          <span v-else>{{ form.definedSource }}</span>
         </el-form-item>
         <el-form-item label="参考基因组类型" prop="refseqCategory">
-          <el-input v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
+          <el-input v-if="!view" v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
+          <span v-else>{{ form.refseqCategory }}</span>
         </el-form-item>
         <el-form-item label="分类号" prop="taxid">
-          <el-input v-model="form.taxid" placeholder="请输入分类号" />
+          <el-input v-if="!view" v-model="form.taxid" placeholder="请输入分类号" />
+          <span v-else>{{ form.taxid }}</span>
         </el-form-item>
         <el-form-item label="种分类号" prop="speciesTaxid">
-          <el-input v-model="form.speciesTaxid" placeholder="请输入种分类号" />
+          <el-input v-if="!view" v-model="form.speciesTaxid" placeholder="请输入种分类号" />
+          <span v-else>{{ form.speciesTaxid }}</span>
         </el-form-item>
         <el-form-item label="亚种名称" prop="infraspecificName">
-          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
+          <el-input v-if="!view" v-model="form.infraspecificName" placeholder="请输入亚种名称" />
+          <span v-else>{{ form.infraspecificName }}</span>
         </el-form-item>
         <el-form-item label="分类类型" prop="isolate">
-          <el-input v-model="form.isolate" placeholder="请输入分类类型" />
+          <el-input v-if="!view" v-model="form.isolate" placeholder="请输入分类类型" />
+          <span v-else>{{ form.isolate }}</span>
         </el-form-item>
         <el-form-item label="拼装级别" prop="assemblyLevel">
-          <el-input v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
+          <el-input v-if="!view" v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
+          <span v-else>{{ form.assemblyLevel }}</span>
         </el-form-item>
         <el-form-item label="基因组级别" prop="genomeRep">
-          <el-input v-model="form.genomeRep" placeholder="请输入基因组级别" />
+          <el-input v-if="!view" v-model="form.genomeRep" placeholder="请输入基因组级别" />
+          <span v-else>{{ form.genomeRep }}</span>
         </el-form-item>
         <el-form-item label="seq_rel_date" prop="seqRelDate">
-          <el-input v-model="form.seqRelDate" placeholder="请输入seq_rel_date" />
+          <el-input v-if="!view" v-model="form.seqRelDate" placeholder="请输入seq_rel_date" />
+          <span v-else>{{ form.seqRelDate }}</span>
         </el-form-item>
         <el-form-item label="ASM编号" prop="asmName">
-          <el-input v-model="form.asmName" placeholder="请输入ASM编号" />
+          <el-input v-if="!view" v-model="form.asmName" placeholder="请输入ASM编号" />
+          <span v-else>{{ form.asmName }}</span>
         </el-form-item>
         <el-form-item label="gbrs_paired_asm" prop="gbrs_paired_asm">
-          <el-input v-model="form.gbrs_paired_asm" placeholder="请输入gbrs_paired_asm" />
+          <el-input v-if="!view" v-model="form.gbrs_paired_asm" placeholder="请输入gbrs_paired_asm" />
+          <span v-else>{{ form.gbrs_paired_asm }}</span>
         </el-form-item>
         <el-form-item label="paired_asm_comp" prop="paired_asm_comp">
-          <el-input v-model="form.paired_asm_comp" placeholder="请输入paired_asm_comp" />
+          <el-input v-if="!view" v-model="form.paired_asm_comp" placeholder="请输入paired_asm_comp" />
+          <span v-else>{{ form.paired_asm_comp }}</span>
         </el-form-item>
         <el-form-item label="ftp_path" prop="ftp_path">
-          <el-input v-model="form.ftp_path" placeholder="请输入ftp_path" />
+          <el-input v-if="!view" v-model="form.ftp_path" placeholder="请输入ftp_path" />
+          <span v-else>{{ form.ftp_path }}</span>
         </el-form-item>
         <el-form-item label="excluded_from_refseq" prop="excluded_from_refseq">
-          <el-input v-model="form.excluded_from_refseq" placeholder="请输入excluded_from_refseq" />
+          <el-input v-if="!view" v-model="form.excluded_from_refseq" placeholder="请输入excluded_from_refseq" />
+          <span v-else>{{ form.excluded_from_refseq }}</span>
         </el-form-item>
         <el-form-item label="装配类型" prop="assemblyType">
-          <el-input v-model="form.assemblyType" placeholder="请输入装配类型" />
+          <el-input v-if="!view" v-model="form.assemblyType" placeholder="请输入装配类型" />
+          <span v-else>{{ form.assemblyType }}</span>
         </el-form-item>
         <el-form-item label="基因组大小" prop="genomeSize">
-          <el-input v-model="form.genomeSize" placeholder="请输入基因组大小" />
+          <el-input v-if="!view" v-model="form.genomeSize" placeholder="请输入基因组大小" />
+          <span v-else>{{ form.genomeSize }}</span>
         </el-form-item>
         <el-form-item label="基因组大小(无缺口)" prop="genomeSizeUngapped">
-          <el-input v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小(无缺口)" />
+          <el-input v-if="!view" v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小(无缺口)" />
+          <span v-else>{{ form.genomeSizeUngapped }}</span>
         </el-form-item>
         <el-form-item label="GC比例" prop="gcPercent">
-          <el-input v-model="form.gcPercent" placeholder="请输入GC比例" />
+          <el-input v-if="!view" v-model="form.gcPercent" placeholder="请输入GC比例" />
+          <span v-else>{{ form.gcPercent }}</span>
         </el-form-item>
         <el-form-item label="replicon_count" prop="replicon_count">
-          <el-input v-model="form.replicon_count" placeholder="请输入replicon_count" />
+          <el-input v-if="!view" v-model="form.replicon_count" placeholder="请输入replicon_count" />
+          <span v-else>{{ form.replicon_count }}</span>
         </el-form-item>
         <el-form-item label="scaffold_count" prop="scaffold_count">
-          <el-input v-model="form.scaffold_count" placeholder="请输入scaffold_count" />
+          <el-input v-if="!view" v-model="form.scaffold_count" placeholder="请输入scaffold_count" />
+          <span v-else>{{ form.scaffold_count }}</span>
         </el-form-item>
         <el-form-item label="contig_count" prop="contig_count">
-          <el-input v-model="form.contig_count" placeholder="请输入contig_count" />
+          <el-input v-if="!view" v-model="form.contig_count" placeholder="请输入contig_count" />
+          <span v-else>{{ form.contig_count }}</span>
         </el-form-item>
         <el-form-item label="总基因数" prop="totalGeneCount">
-          <el-input v-model="form.totalGeneCount" placeholder="请输入总基因数" />
+          <el-input v-if="!view" v-model="form.totalGeneCount" placeholder="请输入总基因数" />
+          <span v-else>{{ form.totalGeneCount }}</span>
         </el-form-item>
         <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-          <el-input v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
+          <el-input v-if="!view" v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
+          <span v-else>{{ form.proteinCodingGeneCount }}</span>
         </el-form-item>
         <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-          <el-input v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
+          <el-input v-if="!view" v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
+          <span v-else>{{ form.nonCodingGeneCount }}</span>
         </el-form-item>
         <el-form-item label="毒力基因" prop="dljy">
-          <el-input v-model="form.dljy" placeholder="请输入毒力基因" />
+          <el-input v-if="!view" v-model="form.dljy" placeholder="请输入毒力基因" />
+          <span v-else>{{ form.dljy }}</span>
         </el-form-item>
         <el-form-item label="毒力基因注释" prop="dljyExpress">
-          <el-input v-model="form.dljyExpress" placeholder="请输入毒力基因注释" />
+          <el-input v-if="!view" v-model="form.dljyExpress" placeholder="请输入毒力基因注释" />
+          <span v-else>{{ form.dljyExpress }}</span>
         </el-form-item>
         <el-form-item label="毒力基因注释来源" prop="dljySource">
-          <el-input v-model="form.dljySource" placeholder="请输入毒力基因注释来源" />
+          <el-input v-if="!view" v-model="form.dljySource" placeholder="请输入毒力基因注释来源" />
+          <span v-else>{{ form.dljySource }}</span>
         </el-form-item>
         <el-form-item label="耐药药品" prop="nyjy">
-          <el-input v-model="form.nyjy" placeholder="请输入耐药药品" />
+          <el-input v-if="!view" v-model="form.nyjy" placeholder="请输入耐药药品" />
+          <span v-else>{{ form.nyjy }}</span>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -330,6 +368,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      view: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -514,6 +553,18 @@ importDataBase(formData).then(response => {
       this.disabledAssemblyAccession = false
       this.title = "添加病原体信息"
     },
+    handleView(row) {
+      this.reset()
+      const id = row.assemblyAccession
+      this.disabledAssemblyAccession = true;
+      getDataBase(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.view = true
+        this.title = "查看病原体信息"
+      })
+    },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
@@ -522,6 +573,7 @@ importDataBase(formData).then(response => {
       getDataBase(id).then(response => {
         this.form = response.data
         this.open = true
+        this.view = false
         this.title = "修改病原体信息"
       })
     },

src/views/data/dataBase/dljy.vue

@@ -128,7 +128,6 @@
           @click="$refs.upload_file.click()"
           >导入</el-button>
         </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <el-table v-loading="loading" :data="dataBaseList" >
@@ -167,6 +166,12 @@
       <el-table-column label="耐药药品" align="center" prop="nyjy" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['data:dataReportByt:edit']"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
@@ -192,11 +197,10 @@
     />
 
     <!-- 添加或修改病原体管理对话框 -->
-    <!-- 添加或修改病原体管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="NCBI基因组序列编号" prop="assemblyAccession">
-           <!-- <el-input v-model="form.assemblyAccession" :disabled="disabledAssemblyAccession" placeholder="请输入NCBI基因组序列编号" /> -->
+           <!-- <el-input v-if="!view" v-model="form.assemblyAccession" :disabled="disabledAssemblyAccession" placeholder="请输入NCBI基因组序列编号" /> -->
              <!-- 修改为支持远程搜索的选择器 -->
         <el-select
           v-model="form.assemblyAccession"
@@ -216,9 +220,10 @@
           >
           </el-option>
         </el-select>
+           <span v-else>{{ form.assemblyAccession }}</span>
         </el-form-item>
         <el-form-item label="病原体名称" prop="organismName">
-           <!-- <el-input v-model="form.organismName" placeholder="请输入病原体名称" /> -->
+           <!-- <el-input v-if="!view" v-model="form.organismName" placeholder="请输入病原体名称" /> -->
                 <!-- 修改为支持远程搜索的选择器 -->
         <el-select
           v-model="form.organismName"
@@ -238,97 +243,132 @@
           >
           </el-option>
         </el-select>
+           <span v-else>{{ form.organismName }}</span>
         </el-form-item>
         <el-form-item label="病原类型" prop="group">
-          <el-input v-model="form.group" placeholder="请输入病原类型" />
+          <el-input v-if="!view" v-model="form.group" placeholder="请输入病原类型" />
+          <span v-else>{{ form.group }}</span>
         </el-form-item>
         <el-form-item label="子类标签" prop="group1">
-          <el-input v-model="form.group1" placeholder="请输入子类标签" />
+          <el-input v-if="!view" v-model="form.group1" placeholder="请输入子类标签" />
+          <span v-else>{{ form.group1 }}</span>
         </el-form-item>
         <el-form-item label="中文注释" prop="defined">
-          <el-input type="textarea" v-model="form.defined" placeholder="请输入中文注释" />
+          <el-input v-if="!view" type="textarea" v-model="form.defined" placeholder="请输入中文注释" />
+          <span v-else>{{ form.defined }}</span>
         </el-form-item>
         <el-form-item label="解释的来源" prop="definedSource">
-          <el-input v-model="form.definedSource" placeholder="请输入解释的来源" />
+          <el-input v-if="!view" v-model="form.definedSource" placeholder="请输入解释的来源" />
+          <span v-else>{{ form.definedSource }}</span>
         </el-form-item>
         <el-form-item label="参考基因组类型" prop="refseqCategory">
-          <el-input v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
+          <el-input v-if="!view" v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
+          <span v-else>{{ form.refseqCategory }}</span>
         </el-form-item>
         <el-form-item label="分类号" prop="taxid">
-          <el-input v-model="form.taxid" placeholder="请输入分类号" />
+          <el-input v-if="!view" v-model="form.taxid" placeholder="请输入分类号" />
+          <span v-else>{{ form.taxid }}</span>
         </el-form-item>
         <el-form-item label="种分类号" prop="speciesTaxid">
-          <el-input v-model="form.speciesTaxid" placeholder="请输入种分类号" />
+          <el-input v-if="!view" v-model="form.speciesTaxid" placeholder="请输入种分类号" />
+          <span v-else>{{ form.speciesTaxid }}</span>
         </el-form-item>
         <el-form-item label="亚种名称" prop="infraspecificName">
-          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
+          <el-input v-if="!view" v-model="form.infraspecificName" placeholder="请输入亚种名称" />
+          <span v-else>{{ form.infraspecificName }}</span>
         </el-form-item>
         <el-form-item label="分类类型" prop="isolate">
-          <el-input v-model="form.isolate" placeholder="请输入分类类型" />
+          <el-input v-if="!view" v-model="form.isolate" placeholder="请输入分类类型" />
+          <span v-else>{{ form.isolate }}</span>
         </el-form-item>
         <el-form-item label="拼装级别" prop="assemblyLevel">
-          <el-input v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
+          <el-input v-if="!view" v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
+          <span v-else>{{ form.assemblyLevel }}</span>
         </el-form-item>
         <el-form-item label="基因组级别" prop="genomeRep">
-          <el-input v-model="form.genomeRep" placeholder="请输入基因组级别" />
+          <el-input v-if="!view" v-model="form.genomeRep" placeholder="请输入基因组级别" />
+          <span v-else>{{ form.genomeRep }}</span>
         </el-form-item>
         <el-form-item label="seq_rel_date" prop="seqRelDate">
-          <el-input v-model="form.seqRelDate" placeholder="请输入seq_rel_date" />
+          <el-input v-if="!view" v-model="form.seqRelDate" placeholder="请输入seq_rel_date" />
+          <span v-else>{{ form.seqRelDate }}</span>
         </el-form-item>
         <el-form-item label="ASM编号" prop="asmName">
-          <el-input v-model="form.asmName" placeholder="请输入ASM编号" />
+          <el-input v-if="!view" v-model="form.asmName" placeholder="请输入ASM编号" />
+          <span v-else>{{ form.asmName }}</span>
         </el-form-item>
         <el-form-item label="gbrs_paired_asm" prop="gbrs_paired_asm">
-          <el-input v-model="form.gbrs_paired_asm" placeholder="请输入gbrs_paired_asm" />
+          <el-input v-if="!view" v-model="form.gbrs_paired_asm" placeholder="请输入gbrs_paired_asm" />
+          <span v-else>{{ form.gbrs_paired_asm }}</span>
         </el-form-item>
         <el-form-item label="paired_asm_comp" prop="paired_asm_comp">
-          <el-input v-model="form.paired_asm_comp" placeholder="请输入paired_asm_comp" />
+          <el-input v-if="!view" v-model="form.paired_asm_comp" placeholder="请输入paired_asm_comp" />
+          <span v-else>{{ form.paired_asm_comp }}</span>
         </el-form-item>
         <el-form-item label="ftp_path" prop="ftp_path">
-          <el-input v-model="form.ftp_path" placeholder="请输入ftp_path" />
+          <el-input v-if="!view" v-model="form.ftp_path" placeholder="请输入ftp_path" />
+          <span v-else>{{ form.ftp_path }}</span>
         </el-form-item>
         <el-form-item label="excluded_from_refseq" prop="excluded_from_refseq">
-          <el-input v-model="form.excluded_from_refseq" placeholder="请输入excluded_from_refseq" />
+          <el-input v-if="!view" v-model="form.excluded_from_refseq" placeholder="请输入excluded_from_refseq" />
+          <span v-else>{{ form.excluded_from_refseq }}</span>
         </el-form-item>
         <el-form-item label="装配类型" prop="assemblyType">
-          <el-input v-model="form.assemblyType" placeholder="请输入装配类型" />
+          <el-input v-if="!view" v-model="form.assemblyType" placeholder="请输入装配类型" />
+          <span v-else>{{ form.assemblyType }}</span>
         </el-form-item>
         <el-form-item label="基因组大小" prop="genomeSize">
-          <el-input v-model="form.genomeSize" placeholder="请输入基因组大小" />
+          <el-input v-if="!view" v-model="form.genomeSize" placeholder="请输入基因组大小" />
+          <span v-else>{{ form.genomeSize }}</span>
         </el-form-item>
         <el-form-item label="基因组大小(无缺口)" prop="genomeSizeUngapped">
-          <el-input v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小(无缺口)" />
+          <el-input v-if="!view" v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小(无缺口)" />
+          <span v-else>{{ form.genomeSizeUngapped }}</span>
         </el-form-item>
         <el-form-item label="GC比例" prop="gcPercent">
-          <el-input v-model="form.gcPercent" placeholder="请输入GC比例" />
+          <el-input v-if="!view" v-model="form.gcPercent" placeholder="请输入GC比例" />
+          <span v-else>{{ form.gcPercent }}</span>
         </el-form-item>
         <el-form-item label="replicon_count" prop="replicon_count">
-          <el-input v-model="form.replicon_count" placeholder="请输入replicon_count" />
+          <el-input v-if="!view" v-model="form.replicon_count" placeholder="请输入replicon_count" />
+          <span v-else>{{ form.replicon_count }}</span>
         </el-form-item>
         <el-form-item label="scaffold_count" prop="scaffold_count">
-          <el-input v-model="form.scaffold_count" placeholder="请输入scaffold_count" />
+          <el-input v-if="!view" v-model="form.scaffold_count" placeholder="请输入scaffold_count" />
+          <span v-else>{{ form.scaffold_count }}</span>
         </el-form-item>
         <el-form-item label="contig_count" prop="contig_count">
-          <el-input v-model="form.contig_count" placeholder="请输入contig_count" />
+          <el-input v-if="!view" v-model="form.contig_count" placeholder="请输入contig_count" />
+          <span v-else>{{ form.contig_count }}</span>
         </el-form-item>
         <el-form-item label="总基因数" prop="totalGeneCount">
-          <el-input v-model="form.totalGeneCount" placeholder="请输入总基因数" />
+          <el-input v-if="!view" v-model="form.totalGeneCount" placeholder="请输入总基因数" />
+          <span v-else>{{ form.totalGeneCount }}</span>
         </el-form-item>
         <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-          <el-input v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
+          <el-input v-if="!view" v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
+          <span v-else>{{ form.proteinCodingGeneCount }}</span>
         </el-form-item>
         <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-          <el-input v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
+          <el-input v-if="!view" v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
+          <span v-else>{{ form.nonCodingGeneCount }}</span>
         </el-form-item>
         <el-form-item label="毒力基因" prop="dljy">
-          <el-input v-model="form.dljy" placeholder="请输入毒力基因" />
+          <el-input v-if="!view" v-model="form.dljy" placeholder="请输入毒力基因" />
+          <span v-else>{{ form.dljy }}</span>
         </el-form-item>
         <el-form-item label="毒力基因注释" prop="dljyExpress">
-          <el-input v-model="form.dljyExpress" placeholder="请输入毒力基因注释" />
+          <el-input v-if="!view" v-model="form.dljyExpress" placeholder="请输入毒力基因注释" />
+          <span v-else>{{ form.dljyExpress }}</span>
         </el-form-item>
         <el-form-item label="毒力基因注释来源" prop="dljySource">
-          <el-input v-model="form.dljySource" placeholder="请输入毒力基因注释来源" />
+          <el-input v-if="!view" v-model="form.dljySource" placeholder="请输入毒力基因注释来源" />
+          <span v-else>{{ form.dljySource }}</span>
         </el-form-item>
+        <!-- <el-form-item label="耐药药品" prop="nyjy">
+          <el-input v-if="!view" v-model="form.nyjy" placeholder="请输入耐药药品" />
+          <span v-else>{{ form.nyjy }}</span>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -367,6 +407,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      view: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -564,6 +605,17 @@ importDataBase(formData).then(response => {
       this.disabledAssemblyAccession = false
       this.title = "添加病原体信息"
     },
+    handleView(row) {
+      this.reset()
+      const id = row.assemblyAccession
+      this.disabledAssemblyAccession = true;
+      getDataBase(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.view = true
+        this.title = "查看病原体信息"
+      })
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()

src/views/data/dataBase/nyjy.vue

@@ -112,7 +112,6 @@
           @click="$refs.upload_file.click()"
         >导入</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataBaseList" >
@@ -151,6 +150,12 @@
       <el-table-column label="毒力基因注释来源" align="center" prop="dljySource" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['data:dataReportByt:edit']"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
@@ -176,11 +181,10 @@
     />
 
     <!-- 添加或修改病原体管理对话框 -->
-    <!-- 添加或修改病原体管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="NCBI基因组序列编号" prop="assemblyAccession">
-           <!-- <el-input v-model="form.assemblyAccession" :disabled="disabledAssemblyAccession" placeholder="请输入NCBI基因组序列编号" /> -->
+           <!-- <el-input v-if="!view" v-model="form.assemblyAccession" :disabled="disabledAssemblyAccession" placeholder="请输入NCBI基因组序列编号" /> -->
            <!-- 修改为支持远程搜索的选择器 -->
         <el-select
           v-model="form.assemblyAccession"
@@ -200,9 +204,10 @@
           >
           </el-option>
         </el-select>
+           <span v-else>{{ form.assemblyAccession }}</span>
         </el-form-item>
         <el-form-item label="病原体名称" prop="organismName">
-           <!-- <el-input v-model="form.organismName" placeholder="请输入病原体名称" /> -->
+           <!-- <el-input v-if="!view" v-model="form.organismName" placeholder="请输入病原体名称" /> -->
                 <!-- 修改为支持远程搜索的选择器 -->
         <el-select
           v-model="form.organismName"
@@ -222,90 +227,131 @@
           >
           </el-option>
         </el-select>
+           <span v-else>{{ form.organismName }}</span>
         </el-form-item>
         <el-form-item label="病原类型" prop="group">
-          <el-input v-model="form.group" placeholder="请输入病原类型" />
+          <el-input v-if="!view" v-model="form.group" placeholder="请输入病原类型" />
+          <span v-else>{{ form.group }}</span>
         </el-form-item>
         <el-form-item label="子类标签" prop="group1">
-          <el-input v-model="form.group1" placeholder="请输入子类标签" />
+          <el-input v-if="!view" v-model="form.group1" placeholder="请输入子类标签" />
+          <span v-else>{{ form.group1 }}</span>
         </el-form-item>
         <el-form-item label="中文注释" prop="defined">
-          <el-input type="textarea" v-model="form.defined" placeholder="请输入中文注释" />
+          <el-input v-if="!view" type="textarea" v-model="form.defined" placeholder="请输入中文注释" />
+          <span v-else>{{ form.defined }}</span>
         </el-form-item>
         <el-form-item label="解释的来源" prop="definedSource">
-          <el-input v-model="form.definedSource" placeholder="请输入解释的来源" />
+          <el-input v-if="!view" v-model="form.definedSource" placeholder="请输入解释的来源" />
+          <span v-else>{{ form.definedSource }}</span>
         </el-form-item>
         <el-form-item label="参考基因组类型" prop="refseqCategory">
-          <el-input v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
+          <el-input v-if="!view" v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
+          <span v-else>{{ form.refseqCategory }}</span>
         </el-form-item>
         <el-form-item label="分类号" prop="taxid">
-          <el-input v-model="form.taxid" placeholder="请输入分类号" />
+          <el-input v-if="!view" v-model="form.taxid" placeholder="请输入分类号" />
+          <span v-else>{{ form.taxid }}</span>
         </el-form-item>
         <el-form-item label="种分类号" prop="speciesTaxid">
-          <el-input v-model="form.speciesTaxid" placeholder="请输入种分类号" />
+          <el-input v-if="!view" v-model="form.speciesTaxid" placeholder="请输入种分类号" />
+          <span v-else>{{ form.speciesTaxid }}</span>
         </el-form-item>
         <el-form-item label="亚种名称" prop="infraspecificName">
-          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
+          <el-input v-if="!view" v-model="form.infraspecificName" placeholder="请输入亚种名称" />
+          <span v-else>{{ form.infraspecificName }}</span>
         </el-form-item>
         <el-form-item label="分类类型" prop="isolate">
-          <el-input v-model="form.isolate" placeholder="请输入分类类型" />
+          <el-input v-if="!view" v-model="form.isolate" placeholder="请输入分类类型" />
+          <span v-else>{{ form.isolate }}</span>
         </el-form-item>
         <el-form-item label="拼装级别" prop="assemblyLevel">
-          <el-input v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
+          <el-input v-if="!view" v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
+          <span v-else>{{ form.assemblyLevel }}</span>
         </el-form-item>
         <el-form-item label="基因组级别" prop="genomeRep">
-          <el-input v-model="form.genomeRep" placeholder="请输入基因组级别" />
+          <el-input v-if="!view" v-model="form.genomeRep" placeholder="请输入基因组级别" />
+          <span v-else>{{ form.genomeRep }}</span>
         </el-form-item>
         <el-form-item label="seq_rel_date" prop="seqRelDate">
-          <el-input v-model="form.seqRelDate" placeholder="请输入seq_rel_date" />
+          <el-input v-if="!view" v-model="form.seqRelDate" placeholder="请输入seq_rel_date" />
+          <span v-else>{{ form.seqRelDate }}</span>
         </el-form-item>
         <el-form-item label="ASM编号" prop="asmName">
-          <el-input v-model="form.asmName" placeholder="请输入ASM编号" />
+          <el-input v-if="!view" v-model="form.asmName" placeholder="请输入ASM编号" />
+          <span v-else>{{ form.asmName }}</span>
         </el-form-item>
         <el-form-item label="gbrs_paired_asm" prop="gbrs_paired_asm">
-          <el-input v-model="form.gbrs_paired_asm" placeholder="请输入gbrs_paired_asm" />
+          <el-input v-if="!view" v-model="form.gbrs_paired_asm" placeholder="请输入gbrs_paired_asm" />
+          <span v-else>{{ form.gbrs_paired_asm }}</span>
         </el-form-item>
         <el-form-item label="paired_asm_comp" prop="paired_asm_comp">
-          <el-input v-model="form.paired_asm_comp" placeholder="请输入paired_asm_comp" />
+          <el-input v-if="!view" v-model="form.paired_asm_comp" placeholder="请输入paired_asm_comp" />
+          <span v-else>{{ form.paired_asm_comp }}</span>
         </el-form-item>
         <el-form-item label="ftp_path" prop="ftp_path">
-          <el-input v-model="form.ftp_path" placeholder="请输入ftp_path" />
+          <el-input v-if="!view" v-model="form.ftp_path" placeholder="请输入ftp_path" />
+          <span v-else>{{ form.ftp_path }}</span>
         </el-form-item>
         <el-form-item label="excluded_from_refseq" prop="excluded_from_refseq">
-          <el-input v-model="form.excluded_from_refseq" placeholder="请输入excluded_from_refseq" />
+          <el-input v-if="!view" v-model="form.excluded_from_refseq" placeholder="请输入excluded_from_refseq" />
+          <span v-else>{{ form.excluded_from_refseq }}</span>
         </el-form-item>
         <el-form-item label="装配类型" prop="assemblyType">
-          <el-input v-model="form.assemblyType" placeholder="请输入装配类型" />
+          <el-input v-if="!view" v-model="form.assemblyType" placeholder="请输入装配类型" />
+          <span v-else>{{ form.assemblyType }}</span>
         </el-form-item>
         <el-form-item label="基因组大小" prop="genomeSize">
-          <el-input v-model="form.genomeSize" placeholder="请输入基因组大小" />
+          <el-input v-if="!view" v-model="form.genomeSize" placeholder="请输入基因组大小" />
+          <span v-else>{{ form.genomeSize }}</span>
         </el-form-item>
         <el-form-item label="基因组大小(无缺口)" prop="genomeSizeUngapped">
-          <el-input v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小(无缺口)" />
+          <el-input v-if="!view" v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小(无缺口)" />
+          <span v-else>{{ form.genomeSizeUngapped }}</span>
         </el-form-item>
         <el-form-item label="GC比例" prop="gcPercent">
-          <el-input v-model="form.gcPercent" placeholder="请输入GC比例" />
+          <el-input v-if="!view" v-model="form.gcPercent" placeholder="请输入GC比例" />
+          <span v-else>{{ form.gcPercent }}</span>
         </el-form-item>
         <el-form-item label="replicon_count" prop="replicon_count">
-          <el-input v-model="form.replicon_count" placeholder="请输入replicon_count" />
+          <el-input v-if="!view" v-model="form.replicon_count" placeholder="请输入replicon_count" />
+          <span v-else>{{ form.replicon_count }}</span>
         </el-form-item>
         <el-form-item label="scaffold_count" prop="scaffold_count">
-          <el-input v-model="form.scaffold_count" placeholder="请输入scaffold_count" />
+          <el-input v-if="!view" v-model="form.scaffold_count" placeholder="请输入scaffold_count" />
+          <span v-else>{{ form.scaffold_count }}</span>
         </el-form-item>
         <el-form-item label="contig_count" prop="contig_count">
-          <el-input v-model="form.contig_count" placeholder="请输入contig_count" />
+          <el-input v-if="!view" v-model="form.contig_count" placeholder="请输入contig_count" />
+          <span v-else>{{ form.contig_count }}</span>
         </el-form-item>
         <el-form-item label="总基因数" prop="totalGeneCount">
-          <el-input v-model="form.totalGeneCount" placeholder="请输入总基因数" />
+          <el-input v-if="!view" v-model="form.totalGeneCount" placeholder="请输入总基因数" />
+          <span v-else>{{ form.totalGeneCount }}</span>
         </el-form-item>
         <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-          <el-input v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
+          <el-input v-if="!view" v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
+          <span v-else>{{ form.proteinCodingGeneCount }}</span>
         </el-form-item>
         <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-          <el-input v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
+          <el-input v-if="!view" v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
+          <span v-else>{{ form.nonCodingGeneCount }}</span>
+        </el-form-item>
+        <!-- <el-form-item label="毒力基因" prop="dljy">
+          <el-input v-if="!view" v-model="form.dljy" placeholder="请输入毒力基因" />
+          <span v-else>{{ form.dljy }}</span>
         </el-form-item>
+        <el-form-item label="毒力基因注释" prop="dljyExpress">
+          <el-input v-if="!view" v-model="form.dljyExpress" placeholder="请输入毒力基因注释" />
+          <span v-else>{{ form.dljyExpress }}</span>
+        </el-form-item>
+        <el-form-item label="毒力基因注释来源" prop="dljySource">
+          <el-input v-if="!view" v-model="form.dljySource" placeholder="请输入毒力基因注释来源" />
+          <span v-else>{{ form.dljySource }}</span>
+        </el-form-item> -->
         <el-form-item label="耐药药品" prop="nyjy">
-          <el-input type="textarea" v-model="form.nyjy" placeholder="请输入耐药药品" />
+          <el-input v-if="!view" v-model="form.nyjy" placeholder="请输入耐药药品" />
+          <span v-else>{{ form.nyjy }}</span>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -345,6 +391,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      view: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -542,6 +589,17 @@ importDataBase(formData).then(response => {
       this.disabledAssemblyAccession = false
       this.title = "添加病原体信息"
     },
+    handleView(row) {
+      this.reset()
+      const id = row.assemblyAccession
+      this.disabledAssemblyAccession = true;
+      getDataBase(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.view = true
+        this.title = "查看病原体信息"
+      })
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()

src/views/data/dataDrugs/index.vue

@@ -65,7 +65,6 @@
           @click="$refs.upload_file.click()"
         >导入</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataDrugsList" @selection-change="handleSelectionChange">

src/views/data/dataReportByt/index.vue

@@ -63,7 +63,7 @@
           placeholder="请选择统计时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="区域编号" prop="areaId">
+      <el-form-item label="区域名称" prop="areaId">
        <el-cascader
           v-model="queryParams.areaId"
           :options="areaOptions"
@@ -78,26 +78,10 @@
             clickTrigger: 'select'
           }"
           @change="handleQueryAreaChange"
-          placeholder="请选择区域编号"
+          placeholder="请选择区域名称"
         >
       </el-cascader>
       </el-form-item>
-      <!-- <el-form-item label="区域名称" prop="areaName">
-        <el-input
-          v-model="queryParams.areaName"
-          placeholder="请输入区域名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="数量" prop="num">
-        <el-input
-          v-model="queryParams.num"
-          placeholder="请输入数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -115,53 +99,17 @@
           v-hasPermi="['data:dataReportByt:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['data:dataReportByt:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['data:dataReportByt:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['data:dataReportByt:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataReportBytList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" />
+    <el-table v-loading="loading" :data="dataReportBytList">
       <el-table-column label="NCBI基因组序列编号" align="center" prop="assemblyAccession" />
+      <el-table-column label="亚种名称" align="center" prop="infraspecificName" />
       <el-table-column label="病原体名称" align="center" prop="name" />
       <el-table-column label="统计时间" align="center" prop="reportDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="区域类型；" align="center" prop="areaType" />
-      <el-table-column label="区域编号" align="center" prop="areaId" />
       <el-table-column label="区域名称" align="center" prop="areaName" />
       <el-table-column label="数量" align="center" prop="num" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -217,6 +165,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="亚种名称" prop="infraspecificName">
+          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
+        </el-form-item>
         <el-form-item label="病原体名称" prop="name">
           <!-- 修改为支持远程搜索的选择器 -->
           <el-select
@@ -246,7 +197,7 @@
             placeholder="请选择统计时间" style="width: 100%;">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="区域编号" prop="areaId">
+        <el-form-item label="区域名称" prop="areaId">
           <el-cascader
           style="width: 100%;"
             v-model="form.areaId"
@@ -262,12 +213,9 @@
               clickTrigger: 'select'
             }"
             @change="handleFormAreaChange"
-            placeholder="请选择区域编号"
+            placeholder="请选择区域名称"
           />
         </el-form-item>
-        <!-- <el-form-item label="区域名称" prop="areaName">
-          <el-input v-model="form.areaName" placeholder="请输入区域名称" />
-        </el-form-item> -->
         <el-form-item label="数量" prop="num">
           <el-input v-model="form.num" placeholder="请输入数量" />
         </el-form-item>
@@ -316,7 +264,6 @@ export default {
         assemblyAccession: null,
         name: null,
         reportDate: null,
-        areaType: null,
         areaId: null,
         areaName: null,
         num: null,
@@ -489,7 +436,6 @@ export default {
         assemblyAccession: null,
         name: null,
         reportDate: null,
-        areaType: null,
         areaId: null,
         areaName: null,
         num: null,

src/views/monitor/job/index.vue

@@ -88,7 +88,6 @@
           v-hasPermi="['monitor:job:query']"
         >日志</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">

src/views/monitor/job/log.vue

@@ -98,7 +98,6 @@
           @click="handleClose"
         >关闭</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">

src/views/monitor/logininfor/index.vue

@@ -95,7 +95,6 @@
           v-hasPermi="['monitor:logininfor:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">

src/views/monitor/operlog/index.vue

@@ -108,7 +108,6 @@
           v-hasPermi="['monitor:operlog:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">

src/views/sample/sampleDept/index.vue

@@ -66,7 +66,6 @@
           v-hasPermi="['sample:sampleDept:remove']"
         >删除</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="sampleDeptList" @selection-change="handleSelectionChange">

src/views/sample/sampleExperiment/index.vue

@@ -68,7 +68,6 @@
           @click="handleBack"
         >返回</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="sampleExperimentList" @selection-change="handleSelectionChange">

src/views/sample/sampleHospital/index.vue

@@ -92,7 +92,6 @@
           v-hasPermi="['sample:sampleHospital:remove']"
         >删除</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="sampleHospitalList" @selection-change="handleSelectionChange">

src/views/sample/sampleInfo/index.vue

@@ -141,10 +141,6 @@
       <el-col :span="1.5">
         <el-button plain size="mini" @click="handleBack">返回</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
 
     <el-table

src/views/sample/samplePatient/index.vue

@@ -89,7 +89,6 @@
           @click="$refs.upload_file.click()"
         >导入</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="samplePatientList" @selection-change="handleSelectionChange">

src/views/sample/sampleType/index.vue

@@ -66,7 +66,6 @@
           v-hasPermi="['sample:sampleType:remove']"
         >删除</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="sampleTypeList" @selection-change="handleSelectionChange">

src/views/statistics/Spatiotemporal-distribution/index.vue

@@ -3,7 +3,7 @@
     <!-- 筛选条件 -->
     <el-card class="filter-card">
       <el-form :inline="true" :model="form" size="small">
-        <el-form-item label="病原体名称">
+        <el-form-item label="NCBI基因组序列编号">
           <!-- <el-input
             v-model="form.bytName"
             placeholder="请输入病原体名称"
@@ -11,11 +11,11 @@
             @keyup.enter="fetchAllData"
           /> -->
           <el-select
-            v-model="form.bytName"
+            v-model="form.assemblyAccession"
             filterable
             remote
             reserve-keyword
-            placeholder="请输入病原体名称"
+            placeholder="请输入NCBI基因组序列编号"
             :remote-method="queryInfo"
             :loading="loading"
             @change="handleSelect"
@@ -69,6 +69,13 @@
           <div ref="chinaMapContainer" style="width: 100%; height: 600px"></div>
         </el-card>
       </el-col>
+
+       <el-col :span="24">
+        <el-card class="map-card">
+          <div slot="header">全球流行病学监测数据</div>
+          <div v-html="qqlxbxjcsjtxt"></div>
+        </el-card>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -83,8 +90,7 @@ import {
   getbytzzfbnfo,
   getsjbytztqkInfo,
   getzgbytztqkInfo,
-  getAssemblyAccessionList,
-} from "@/api/statistics/report";
+  getAssemblyAccessionList,qqlxbxjcsj} from "@/api/statistics/report";
 
 echarts.registerMap("china", chinaJson);
 echarts.registerMap("world", worldJson);
@@ -115,15 +121,15 @@ export default {
       worldMapChart: null,
       chinaMapChart: null,
       form: {
-        bytName: "",
+        assemblyAccession: "",
         endDate: "",
-        province: "",
         startDate: "",
         dateRange: [],
       },
       Assoptions: [],
       AssTimer: null,
       loading: false,
+      qqlxbxjcsjtxt:''
     };
   },
   mounted() {
@@ -157,7 +163,7 @@ export default {
       }, 500);
     },
     handleSelect() {
-      if (this.form.bytName) {
+      if (this.form.assemblyAccession) {
         this.fetchAllData();
       }
     },
@@ -167,15 +173,18 @@ export default {
         this.form.startDate = startDate;
         this.form.endDate = endDate;
       }
-
       // 获取数据
       try {
         const response2 = await getbytzzfbnfo(this.form);
         const response3 = await getsjbytztqkInfo(this.form);
         const response4 = await getzgbytztqkInfo(this.form);
+        const response5 = await qqlxbxjcsj(this.form);
+
         this.barData = response2.data;
         this.worldMapData = response3.data;
         this.chinaMapData = response4.data;
+        this.qqlxbxjcsjtxt = response5.msg
+        console.log(response5)
       } catch (error) {
         console.error("获取数据失败:", error);
         this.$message.error("获取数据失败，请稍后重试");

src/views/statistics/sample-statistics/index.vue

@@ -4,7 +4,7 @@
     <el-row  :gutter="20" class="top-bar">
       <el-col :span="10">
        <div style="display: flex;align-items: center;">
-       <span style="display: block;"> NCBI基因组序列编号：</span>
+       <span style="display: block;">NCBI基因组序列编号：</span>
         <!-- <el-input style="flex: 1;" v-model="assemblyAccession" placeholder="请输入病原体注册号"></el-input> -->
          <el-select
                 v-model="assemblyAccession"
@@ -47,10 +47,10 @@
 
     <!-- 动态图表 -->
      <el-row>
-      <el-col :span="12" class="pie-row">
+      <el-col :span="24" class="pie-row">
         <div style="display: flex;align-items: center;">
-          <div>诊断统计设置编号：</div>
-           <el-select style="flex: 1;" v-model="value" multiple placeholder="请选择">
+          <div>诊断统计设置：</div>
+           <el-select style="flex: 1;width:100%" v-model="value" multiple placeholder="请选择">
     <el-option
       v-for="item in options"
       :key="item.value"
@@ -180,9 +180,9 @@ export default {
           );
           console.log(optionItem,'optionItem.label')
           if (optionItem.isNum === 'Y') {
-            this.renderViolinChart(res.data, optionItem.keyword);
+            this.renderViolinChart(res.data, optionItem.title);
           } else {
-            this.renderLineChart(res.data, optionItem.keyword);
+            this.renderLineChart(res.data, optionItem.title);
           }
         }
       });

src/views/system/area/index.vue

@@ -66,7 +66,6 @@
           v-hasPermi="['system:area:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">

src/views/system/cnarea/index.vue

@@ -114,7 +114,6 @@
           v-hasPermi="['system:cnarea:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="cnareaList" @selection-change="handleSelectionChange">

src/views/system/dept/index.vue

@@ -45,7 +45,6 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table

src/views/system/dict/data.vue

@@ -87,7 +87,6 @@
           @click="handleClose"
         >关闭</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">

src/views/system/dict/index.vue

@@ -104,7 +104,6 @@
           v-hasPermi="['system:dict:remove']"
         >刷新缓存</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">

src/views/system/menu/index.vue

@@ -45,7 +45,6 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table

src/views/system/pathogenConfig/index.vue

@@ -42,7 +42,6 @@
           v-hasPermi="['system:pathogenConfig:add']"
         >新增</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="pathogenConfigList">

src/views/system/role/authUser.vue

@@ -56,7 +56,6 @@
           @click="handleClose"
         >关闭</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

src/views/system/role/index.vue

@@ -86,7 +86,6 @@
           v-hasPermi="['system:role:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">

src/views/system/systemConfig/index.vue

@@ -46,7 +46,6 @@
           v-hasPermi="['system:systemConfig:add']"
         >新增</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" :data="systemConfigList" @selection-change="handleSelectionChange">
       <el-table-column label="关键字" align="center" prop="keyword" />

src/views/system/user/index.vue

@@ -53,7 +53,6 @@
               <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
               </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

src/views/tool/gen/index.vue

@@ -88,7 +88,6 @@
           v-hasPermi="['tool:gen:remove']"
         >删除</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table ref="tables" v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">