攻心小虫 1 неделя назад
Родитель
Сommit
8ca482c6e4

+ 88 - 442
src/views/data/dataBase/byt.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="唯一注册号" prop="assemblyAccession">
         <el-input
           v-model="queryParams.assemblyAccession"
@@ -9,30 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="参考基因组类型" prop="refseqCategory">
-        <el-input
-          v-model="queryParams.refseqCategory"
-          placeholder="请输入参考基因组类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="分类号" prop="taxid">
-        <el-input
-          v-model="queryParams.taxid"
-          placeholder="请输入分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="种分类号" prop="speciesTaxid">
-        <el-input
-          v-model="queryParams.speciesTaxid"
-          placeholder="请输入种分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="生物名称" prop="organismName">
         <el-input
           v-model="queryParams.organismName"
@@ -41,86 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="亚种名称" prop="infraspecificName">
-        <el-input
-          v-model="queryParams.infraspecificName"
-          placeholder="请输入亚种名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="分类类型" prop="isolate">
-        <el-input
-          v-model="queryParams.isolate"
-          placeholder="请输入分类类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拼装级别" prop="assemblyLevel">
-        <el-input
-          v-model="queryParams.assemblyLevel"
-          placeholder="请输入拼装级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="基因组级别" prop="genomeRep">
-        <el-input
-          v-model="queryParams.genomeRep"
-          placeholder="请输入基因组级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="seq_rel_date" prop="seqRelDate">
-        <el-date-picker clearable
-          v-model="queryParams.seqRelDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择seq_rel_date">
-        </el-date-picker>
-      </el-form-item> -->
-      <!-- <el-form-item label="ASM编号" prop="asmName">
-        <el-input
-          v-model="queryParams.asmName"
-          placeholder="请输入ASM编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-        <el-input
-          v-model="queryParams.gbrsPairedAsm"
-          placeholder="请输入gbrs_paired_asm"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-        <el-input
-          v-model="queryParams.pairedAsmComp"
-          placeholder="请输入paired_asm_comp"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="来源地址" prop="ftpPath">
-        <el-input
-          v-model="queryParams.ftpPath"
-          placeholder="请输入来源地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-        <el-input
-          v-model="queryParams.excludedFromRefseq"
-          placeholder="请输入excluded_from_refseq"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item label="病源类型" prop="group">
         <el-input
           v-model="queryParams.group"
@@ -129,158 +25,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="基因组大小" prop="genomeSize">
-        <el-input
-          v-model="queryParams.genomeSize"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-        <el-input
-          v-model="queryParams.genomeSizeUngapped"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="GC比例" prop="gcPercent">
-        <el-input
-          v-model="queryParams.gcPercent"
-          placeholder="请输入GC比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="replicon_count" prop="repliconCount">
-        <el-input
-          v-model="queryParams.repliconCount"
-          placeholder="请输入replicon_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="scaffold_count" prop="scaffoldCount">
-        <el-input
-          v-model="queryParams.scaffoldCount"
-          placeholder="请输入scaffold_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="contig_count" prop="contigCount">
+      <el-form-item label="子类标签" prop="group1">
         <el-input
-          v-model="queryParams.contigCount"
-          placeholder="请输入contig_count"
+          v-model="queryParams.group1"
+          placeholder="请输入子类标签"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="总基因数" prop="totalGeneCount">
+      <el-form-item label="中文解释" prop="defined">
         <el-input
-          v-model="queryParams.totalGeneCount"
-          placeholder="请输入总基因数"
+          v-model="queryParams.defined"
+          placeholder="请输入中文解释"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-        <el-input
-          v-model="queryParams.proteinCodingGeneCount"
-          placeholder="请输入翻译蛋白基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-        <el-input
-          v-model="queryParams.nonCodingGeneCount"
-          placeholder="请输入非编码基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="中文名" prop="nameCn">
-        <el-input
-          v-model="queryParams.nameCn"
-          placeholder="请输入中文名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="序列来源" prop="seqSource">
-        <el-input
-          v-model="queryParams.seqSource"
-          placeholder="请输入序列来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="解释来源" prop="express">
-        <el-input
-          v-model="queryParams.express"
-          placeholder="请输入解释来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="文件路径" prop="filePath">
-        <el-input
-          v-model="queryParams.filePath"
-          placeholder="请输入文件路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="点突变耐药基因" prop="dtpnyjy">
-        <el-input
-          v-model="queryParams.dtpnyjy"
-          placeholder="请输入点突变耐药基因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
-        <el-input
-          v-model="queryParams.dtpnyjyExpress"
-          placeholder="请输入点突变耐药基因说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="耐药基因" prop="nyjy">
-        <el-input
-          v-model="queryParams.nyjy"
-          placeholder="请输入耐药基因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="耐药基因说明" prop="nyjyExpress">
-        <el-input
-          v-model="queryParams.nyjyExpress"
-          placeholder="请输入耐药基因说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="毒力基因" prop="dljy">
-        <el-input
-          v-model="queryParams.dljy"
-          placeholder="请输入毒力基因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="毒力基因说明" prop="dljyExpress">
-        <el-input
-          v-model="queryParams.dljyExpress"
-          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>
@@ -288,16 +48,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -310,56 +60,56 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataBaseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="dataBaseList" >
       <el-table-column label="唯一注册号" align="center" prop="assemblyAccession" />
-      <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
+      <el-table-column label="生物名称" align="center" prop="organismName" />
+      <el-table-column label="病源类型" align="center" prop="group" />
+      <el-table-column label="子类标签" align="center" prop="group1" />
+      <el-table-column label="中文解释" align="center" prop="defined"  width="500" />
+      <el-table-column label="解释的来源" align="center" prop="definedSource" width="200" />
+      <!-- <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
       <el-table-column label="分类号" align="center" prop="taxid" />
       <el-table-column label="种分类号" align="center" prop="speciesTaxid" />
-      <el-table-column label="生物名称" align="center" prop="organismName" />
-      <el-table-column label="亚种名称" align="center" prop="infraspecificName" />
+      <el-table-column label="亚种名称" align="center" prop="infraspecificName"/>
       <el-table-column label="分类类型" align="center" prop="isolate" />
       <el-table-column label="拼装级别" align="center" prop="assemblyLevel" />
       <el-table-column label="基因组级别" align="center" prop="genomeRep" />
-      <!-- <el-table-column label="seq_rel_date" align="center" prop="seqRelDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.seqRelDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column> -->
-      <!-- <el-table-column label="ASM编号" align="center" prop="asmName" />
+      <el-table-column label="seqRelDate" align="center" prop="seqRelDate" />     
+      <el-table-column label="ASM编号" align="center" prop="asmName" />
       <el-table-column label="gbrs_paired_asm" align="center" prop="gbrsPairedAsm" />
-      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" /> -->
-      <el-table-column label="来源地址" align="center" prop="ftpPath" width="200"/>
-      <!-- <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" /> -->
+      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" />
+      <el-table-column label="ftp_path" align="center" prop="ftpPath" />
+      <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" />
       <el-table-column label="装配类型" align="center" prop="assemblyType" />
-      <el-table-column label="病源类型" align="center" prop="group" />
       <el-table-column label="基因组大小" align="center" prop="genomeSize" />
-      <el-table-column label="基因组大小" align="center" prop="genomeSizeUngapped" />
-      <!-- <el-table-column label="GC比例" align="center" prop="gcPercent" />
+      <el-table-column label="基因组大小(无缺口)" align="center" prop="genomeSizeUngapped" />
+      <el-table-column label="GC比例" align="center" prop="gcPercent" />
       <el-table-column label="replicon_count" align="center" prop="repliconCount" />
       <el-table-column label="scaffold_count" align="center" prop="scaffoldCount" />
-      <el-table-column label="contig_count" align="center" prop="contigCount" /> -->
+      <el-table-column label="contig_count" align="center" prop="contigCount" />
       <el-table-column label="总基因数" align="center" prop="totalGeneCount" />
-      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />
-      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />
-      <el-table-column label="中文名" align="center" prop="nameCn" />
-      <!-- <el-table-column label="定义" align="center" prop="defined" /> -->
-      <el-table-column label="序列来源" align="center" prop="seqSource" />
-      <el-table-column label="解释来源" align="center" prop="express" />
-      <el-table-column label="文件路径" align="center" prop="filePath" />
-      <el-table-column label="点突变耐药基因" align="center" prop="dtpnyjy" />
-      <el-table-column label="点突变耐药基因说明" align="center" prop="dtpnyjyExpress" />
-      <el-table-column label="耐药基因" align="center" prop="nyjy" />
-      <el-table-column label="耐药基因说明" align="center" prop="nyjyExpress" />
-      <el-table-column label="毒力基因" align="center" prop="dljy" />
-      <el-table-column label="毒力基因说明" align="center" prop="dljyExpress" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />      
+      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />      
+      <el-table-column label="毒力基因" align="center" prop="dljy" />      
+      <el-table-column label="毒力基因解释" align="center" prop="dljyExpress" />      
+      <el-table-column label="毒力基因解释来源" align="center" prop="dljySource" />
+      <el-table-column label="耐药基因" align="center" prop="nyjy" />      
+      <el-table-column label="耐药基因解释" align="center" prop="nyjyExpress" />      
+      <el-table-column label="耐药基因解释来源" align="center" prop="nyjySource" />
+      <el-table-column label="点突变" align="center" prop="dtpnyjy" />      
+      <el-table-column label="点突变解释" align="center" prop="dtpnyjyExpress" />      
+      <el-table-column label="点突变解释来源" align="center" prop="dtpnyjySource" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['data:dataReportByt:edit']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['data:dataBase:remove']"
           >删除</el-button>
@@ -376,124 +126,46 @@
     />
 
     <!-- 添加或修改病原体管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="唯一注册号" prop="assemblyAccession">
-          <el-input v-model="form.assemblyAccession" placeholder="请输入唯一注册号" />
-        </el-form-item>
-        <el-form-item label="参考基因组类型" prop="refseqCategory">
-          <el-input v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
-        </el-form-item>
-        <el-form-item label="分类号" prop="taxid">
-          <el-input v-model="form.taxid" placeholder="请输入分类号" />
-        </el-form-item>
-        <el-form-item label="种分类号" prop="speciesTaxid">
-          <el-input v-model="form.speciesTaxid" placeholder="请输入种分类号" />
-        </el-form-item>
-        <el-form-item label="生物名称" prop="organismName">
-          <el-input v-model="form.organismName" placeholder="请输入生物名称" />
-        </el-form-item>
-        <el-form-item label="亚种名称" prop="infraspecificName">
-          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
-        </el-form-item>
-        <el-form-item label="分类类型" prop="isolate">
-          <el-input v-model="form.isolate" placeholder="请输入分类类型" />
-        </el-form-item>
-        <el-form-item label="拼装级别" prop="assemblyLevel">
-          <el-input v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
-        </el-form-item>
-        <el-form-item label="基因组级别" prop="genomeRep">
-          <el-input v-model="form.genomeRep" placeholder="请输入基因组级别" />
-        </el-form-item>
-        <el-form-item label="seq_rel_date" prop="seqRelDate">
-          <el-date-picker clearable
-            v-model="form.seqRelDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择seq_rel_date">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="ASM编号" prop="asmName">
-          <el-input v-model="form.asmName" placeholder="请输入ASM编号" />
-        </el-form-item>
-        <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-          <el-input v-model="form.gbrsPairedAsm" placeholder="请输入gbrs_paired_asm" />
-        </el-form-item>
-        <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-          <el-input v-model="form.pairedAsmComp" placeholder="请输入paired_asm_comp" />
-        </el-form-item>
-        <el-form-item label="来源地址" prop="ftpPath">
-          <el-input v-model="form.ftpPath" placeholder="请输入来源地址" />
-        </el-form-item>
-        <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-          <el-input v-model="form.excludedFromRefseq" placeholder="请输入excluded_from_refseq" />
-        </el-form-item>
-        <el-form-item label="病源类型" prop="group">
-          <el-input v-model="form.group" placeholder="请输入病源类型" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSize">
-          <el-input v-model="form.genomeSize" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-          <el-input v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="GC比例" prop="gcPercent">
-          <el-input v-model="form.gcPercent" placeholder="请输入GC比例" />
-        </el-form-item>
-        <el-form-item label="replicon_count" prop="repliconCount">
-          <el-input v-model="form.repliconCount" placeholder="请输入replicon_count" />
-        </el-form-item>
-        <el-form-item label="scaffold_count" prop="scaffoldCount">
-          <el-input v-model="form.scaffoldCount" placeholder="请输入scaffold_count" />
-        </el-form-item>
-        <el-form-item label="contig_count" prop="contigCount">
-          <el-input v-model="form.contigCount" placeholder="请输入contig_count" />
-        </el-form-item>
-        <el-form-item label="总基因数" prop="totalGeneCount">
-          <el-input v-model="form.totalGeneCount" placeholder="请输入总基因数" />
-        </el-form-item>
-        <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-          <el-input v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
-        </el-form-item>
-        <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-          <el-input v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
-        </el-form-item>
-        <el-form-item label="中文名" prop="nameCn">
-          <el-input v-model="form.nameCn" placeholder="请输入中文名" />
-        </el-form-item>
-        <el-form-item label="定义" prop="defined">
-          <el-input v-model="form.defined" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="序列来源" prop="seqSource">
-          <el-input v-model="form.seqSource" placeholder="请输入序列来源" />
-        </el-form-item>
-        <el-form-item label="解释来源" prop="express">
-          <el-input v-model="form.express" placeholder="请输入解释来源" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因" prop="dtpnyjy">
-          <el-input v-model="form.dtpnyjy" placeholder="请输入点突变耐药基因" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
-          <el-input v-model="form.dtpnyjyExpress" placeholder="请输入点突变耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="耐药基因" prop="nyjy">
-          <el-input v-model="form.nyjy" placeholder="请输入耐药基因" />
-        </el-form-item>
-        <el-form-item label="耐药基因说明" prop="nyjyExpress">
-          <el-input v-model="form.nyjyExpress" placeholder="请输入耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="毒力基因" prop="dljy">
-          <el-input v-model="form.dljy" placeholder="请输入毒力基因" />
-        </el-form-item>
-        <el-form-item label="毒力基因说明" prop="dljyExpress">
-          <el-input v-model="form.dljyExpress" placeholder="请输入毒力基因说明" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="唯一注册号">{{ form.assemblyAccession }}</el-form-item>
+        <el-form-item label="生物名称">{{ form.organismName }}</el-form-item>
+        <el-form-item label="病源类型">{{ form.group }}</el-form-item>
+        <el-form-item label="子类标签">{{ form.group1 }}</el-form-item>
+        <el-form-item label="中文解释">{{ form.defined }}</el-form-item>
+        <el-form-item label="解释的来源">{{ form.definedSource }}</el-form-item>
+        <el-form-item label="参考基因组类型">{{ form.refseqCategory }}</el-form-item>
+        <el-form-item label="分类号">{{ form.taxid }}</el-form-item>
+        <el-form-item label="种分类号">{{ form.speciesTaxid }}</el-form-item>
+        <el-form-item label="亚种名称">{{ form.infraspecificName }}</el-form-item>
+        <el-form-item label="分类类型">{{ form.isolate }}</el-form-item>
+        <el-form-item label="拼装级别">{{ form.assemblyLevel }}</el-form-item>
+        <el-form-item label="基因组级别">{{ form.genomeRep }}</el-form-item>
+        <el-form-item label="seq_rel_date">{{ form.seqRelDate }}</el-form-item>
+        <el-form-item label="ASM编号">{{ form.asmName }}</el-form-item>
+        <el-form-item label="gbrs_paired_asm">{{ form.gbrs_paired_asm }}</el-form-item>
+        <el-form-item label="paired_asm_comp">{{ form.paired_asm_comp }}</el-form-item>
+        <el-form-item label="ftp_path">{{ form.ftp_path }}</el-form-item>
+        <el-form-item label="excluded_from_refseq">{{ form.excluded_from_refseq }}</el-form-item>        
+        <el-form-item label="装配类型">{{ form.assemblyType }}</el-form-item>
+        <el-form-item label="基因组大小">{{ form.genomeSize }}</el-form-item>
+        <el-form-item label="基因组大小(无缺口)">{{ form.genomeSizeUngapped }}</el-form-item>
+        <el-form-item label="GC比例">{{ form.gcPercent }}</el-form-item>
+        <el-form-item label="replicon_count">{{ form.replicon_count }}</el-form-item>
+        <el-form-item label="scaffold_count">{{ form.scaffold_count }}</el-form-item>
+        <el-form-item label="contig_count">{{ form.contig_count }}</el-form-item>
+        <el-form-item label="总基因数">{{ form.totalGeneCount }}</el-form-item>
+        <el-form-item label="翻译蛋白基因数">{{ form.proteinCodingGeneCount }}</el-form-item>
+        <el-form-item label="非编码基因数">{{ form.nonCodingGeneCount }}</el-form-item>
+        <el-form-item label="毒力基因">{{ form.dljy }}</el-form-item>
+        <el-form-item label="毒力基因解释">{{ form.dljyExpress }}</el-form-item>
+        <el-form-item label="毒力基因解释来源">{{ form.dljySource }}</el-form-item>
+        <el-form-item label="耐药基因">{{ form.nyjy }}</el-form-item>
+        <el-form-item label="耐药基因解释">{{ form.nyjyExpress }}</el-form-item>
+        <el-form-item label="耐药基因解释来源">{{ form.nyjySource }}</el-form-item>
+        <el-form-item label="点突变">{{ form.dtpnyjy }}</el-form-item>
+        <el-form-item label="点突变解释">{{ form.dtpnyjyExpress }}</el-form-item>
+        <el-form-item label="点突变解释来源">{{ form.dtpnyjySource }}</el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -536,42 +208,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
         assemblyAccession: null,
-        refseqCategory: null,
-        taxid: null,
-        speciesTaxid: null,
         organismName: null,
-        infraspecificName: null,
-        isolate: null,
-        assemblyLevel: null,
-        genomeRep: null,
-        seqRelDate: null,
-        asmName: null,
-        gbrsPairedAsm: null,
-        pairedAsmComp: null,
-        ftpPath: null,
-        excludedFromRefseq: null,
-        assemblyType: null,
         group: null,
-        genomeSize: null,
-        genomeSizeUngapped: null,
-        gcPercent: null,
-        repliconCount: null,
-        scaffoldCount: null,
-        contigCount: null,
-        totalGeneCount: null,
-        proteinCodingGeneCount: null,
-        nonCodingGeneCount: null,
-        nameCn: null,
-        defined: null,
-        seqSource: null,
-        express: null,
-        filePath: null,
-        dtpnyjy: null,
-        dtpnyjyExpress: null,
-        nyjy: null,
-        nyjyExpress: null,
-        dljy: null,
-        dljyExpress: null,
+        group1: null,
+        defined: null
       },
       // 表单参数
       form: {},
@@ -724,6 +364,12 @@ importDataBase(formData).then(response => {
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
+    handleUpdate(row) {
+      this.reset()
+      this.form = row
+      this.open = true
+      this.title = "查看病原体信息"
+    },
   }
 }
 </script>

+ 127 - 433
src/views/data/dataBase/dljy.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="140px">
       <el-form-item label="唯一注册号" prop="assemblyAccession">
         <el-input
           v-model="queryParams.assemblyAccession"
@@ -9,30 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="参考基因组类型" prop="refseqCategory">
-        <el-input
-          v-model="queryParams.refseqCategory"
-          placeholder="请输入参考基因组类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="分类号" prop="taxid">
-        <el-input
-          v-model="queryParams.taxid"
-          placeholder="请输入分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="种分类号" prop="speciesTaxid">
-        <el-input
-          v-model="queryParams.speciesTaxid"
-          placeholder="请输入种分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="生物名称" prop="organismName">
         <el-input
           v-model="queryParams.organismName"
@@ -41,86 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="亚种名称" prop="infraspecificName">
-        <el-input
-          v-model="queryParams.infraspecificName"
-          placeholder="请输入亚种名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="分类类型" prop="isolate">
-        <el-input
-          v-model="queryParams.isolate"
-          placeholder="请输入分类类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拼装级别" prop="assemblyLevel">
-        <el-input
-          v-model="queryParams.assemblyLevel"
-          placeholder="请输入拼装级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基因组级别" prop="genomeRep">
-        <el-input
-          v-model="queryParams.genomeRep"
-          placeholder="请输入基因组级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="seq_rel_date" prop="seqRelDate">
-        <el-date-picker clearable
-          v-model="queryParams.seqRelDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择seq_rel_date">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="ASM编号" prop="asmName">
-        <el-input
-          v-model="queryParams.asmName"
-          placeholder="请输入ASM编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-        <el-input
-          v-model="queryParams.gbrsPairedAsm"
-          placeholder="请输入gbrs_paired_asm"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-        <el-input
-          v-model="queryParams.pairedAsmComp"
-          placeholder="请输入paired_asm_comp"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="来源地址" prop="ftpPath">
-        <el-input
-          v-model="queryParams.ftpPath"
-          placeholder="请输入来源地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-        <el-input
-          v-model="queryParams.excludedFromRefseq"
-          placeholder="请输入excluded_from_refseq"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="病源类型" prop="group">
         <el-input
           v-model="queryParams.group"
@@ -129,158 +25,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="基因组大小" prop="genomeSize">
-        <el-input
-          v-model="queryParams.genomeSize"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-        <el-input
-          v-model="queryParams.genomeSizeUngapped"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="GC比例" prop="gcPercent">
-        <el-input
-          v-model="queryParams.gcPercent"
-          placeholder="请输入GC比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="replicon_count" prop="repliconCount">
-        <el-input
-          v-model="queryParams.repliconCount"
-          placeholder="请输入replicon_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="scaffold_count" prop="scaffoldCount">
+      <el-form-item label="子类标签" prop="group1">
         <el-input
-          v-model="queryParams.scaffoldCount"
-          placeholder="请输入scaffold_count"
+          v-model="queryParams.group1"
+          placeholder="请输入子类标签"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="contig_count" prop="contigCount">
+      <el-form-item label="中文解释" prop="defined">
         <el-input
-          v-model="queryParams.contigCount"
-          placeholder="请输入contig_count"
+          v-model="queryParams.defined"
+          placeholder="请输入中文解释"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="总基因数" prop="totalGeneCount">
-        <el-input
-          v-model="queryParams.totalGeneCount"
-          placeholder="请输入总基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-        <el-input
-          v-model="queryParams.proteinCodingGeneCount"
-          placeholder="请输入翻译蛋白基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-        <el-input
-          v-model="queryParams.nonCodingGeneCount"
-          placeholder="请输入非编码基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="中文名" prop="nameCn">
-        <el-input
-          v-model="queryParams.nameCn"
-          placeholder="请输入中文名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="序列来源" prop="seqSource">
-        <el-input
-          v-model="queryParams.seqSource"
-          placeholder="请输入序列来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="解释来源" prop="express">
-        <el-input
-          v-model="queryParams.express"
-          placeholder="请输入解释来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="文件路径" prop="filePath">
-        <el-input
-          v-model="queryParams.filePath"
-          placeholder="请输入文件路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="点突变耐药基因" prop="dtpnyjy">
-        <el-input
-          v-model="queryParams.dtpnyjy"
-          placeholder="请输入点突变耐药基因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
+      <el-form-item label="毒力基因" prop="dljy">
         <el-input
-          v-model="queryParams.dtpnyjyExpress"
-          placeholder="请输入点突变耐药基因说明"
+          v-model="queryParams.dljy"
+          placeholder="请输入毒力基因"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="耐药基因" prop="nyjy">
+      <el-form-item label="毒力基因解释" prop="dljyExpress">
         <el-input
-          v-model="queryParams.nyjy"
-          placeholder="请输入耐药基因"
+          v-model="queryParams.dljyExpress"
+          placeholder="请输入毒力基因解释"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="耐药基因说明" prop="nyjyExpress">
+      <el-form-item label="毒力基因解释来源" prop="dljySource">
         <el-input
-          v-model="queryParams.nyjyExpress"
-          placeholder="请输入耐药基因说明"
+          v-model="queryParams.dljySource"
+          placeholder="请输入毒力基因解释来源"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毒力基因" prop="dljy">
-        <el-input
-          v-model="queryParams.dljy"
-          placeholder="请输入毒力基因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="毒力基因说明" prop="dljyExpress">
-        <el-input
-          v-model="queryParams.dljyExpress"
-          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>
@@ -288,16 +72,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -305,61 +79,61 @@
           icon="el-icon-upload"
           size="mini"
           @click="$refs.upload_file.click()"
-        >导入</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+          >导入</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
 
-    <el-table v-loading="loading" :data="dataBaseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一注册号" align="center" prop="assemblyAccession" />
-      <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
+      <el-table v-loading="loading" :data="dataBaseList" >
+        <el-table-column label="唯一注册号" align="center" prop="assemblyAccession" width="100" />
+        <el-table-column label="生物名称" align="center" prop="organismName" width="150"/>
+        <el-table-column label="病源类型" align="center" prop="group" />
+        <el-table-column label="子类标签" align="center" prop="group1" />
+        <el-table-column label="中文解释" align="center" prop="defined"  width="500" />
+        <el-table-column label="解释的来源" align="center" prop="definedSource" width="200" />
+        <el-table-column label="毒力基因" align="center" prop="dljy" />      
+        <el-table-column label="毒力基因解释" align="center" prop="dljyExpress" width="100"  />      
+        <el-table-column label="毒力基因解释来源" align="center" prop="dljySource" width="200"  />
+      <!-- <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
       <el-table-column label="分类号" align="center" prop="taxid" />
       <el-table-column label="种分类号" align="center" prop="speciesTaxid" />
-      <el-table-column label="生物名称" align="center" prop="organismName" />
-      <el-table-column label="亚种名称" align="center" prop="infraspecificName" />
+      <el-table-column label="亚种名称" align="center" prop="infraspecificName"/>
       <el-table-column label="分类类型" align="center" prop="isolate" />
       <el-table-column label="拼装级别" align="center" prop="assemblyLevel" />
       <el-table-column label="基因组级别" align="center" prop="genomeRep" />
-      <!-- <el-table-column label="seq_rel_date" align="center" prop="seqRelDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.seqRelDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="seqRelDate" align="center" prop="seqRelDate" />     
       <el-table-column label="ASM编号" align="center" prop="asmName" />
       <el-table-column label="gbrs_paired_asm" align="center" prop="gbrsPairedAsm" />
-      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" /> -->
-      <el-table-column label="来源地址" align="center" prop="ftpPath" width="200"/>
-      <!-- <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" /> -->
+      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" />
+      <el-table-column label="ftp_path" align="center" prop="ftpPath" />
+      <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" />
       <el-table-column label="装配类型" align="center" prop="assemblyType" />
-      <el-table-column label="病源类型" align="center" prop="group" />
       <el-table-column label="基因组大小" align="center" prop="genomeSize" />
-      <el-table-column label="基因组大小" align="center" prop="genomeSizeUngapped" />
-      <!-- <el-table-column label="GC比例" align="center" prop="gcPercent" />
+      <el-table-column label="基因组大小(无缺口)" align="center" prop="genomeSizeUngapped" />
+      <el-table-column label="GC比例" align="center" prop="gcPercent" />
       <el-table-column label="replicon_count" align="center" prop="repliconCount" />
       <el-table-column label="scaffold_count" align="center" prop="scaffoldCount" />
-      <el-table-column label="contig_count" align="center" prop="contigCount" /> -->
+      <el-table-column label="contig_count" align="center" prop="contigCount" />
       <el-table-column label="总基因数" align="center" prop="totalGeneCount" />
-      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />
-      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />
-      <el-table-column label="中文名" align="center" prop="nameCn" />
-      <!-- <el-table-column label="定义" align="center" prop="defined" /> -->
-      <el-table-column label="序列来源" align="center" prop="seqSource" />
-      <el-table-column label="解释来源" align="center" prop="express" />
-      <el-table-column label="文件路径" align="center" prop="filePath" />
-      <el-table-column label="点突变耐药基因" align="center" prop="dtpnyjy" />
-      <el-table-column label="点突变耐药基因说明" align="center" prop="dtpnyjyExpress" />
-      <el-table-column label="耐药基因" align="center" prop="nyjy" />
-      <el-table-column label="耐药基因说明" align="center" prop="nyjyExpress" />
-      <el-table-column label="毒力基因" align="center" prop="dljy" />
-      <el-table-column label="毒力基因说明" align="center" prop="dljyExpress" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />      
+      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />      
+      <el-table-column label="耐药基因" align="center" prop="nyjy" />      
+      <el-table-column label="耐药基因解释" align="center" prop="nyjyExpress" />      
+      <el-table-column label="耐药基因解释来源" align="center" prop="nyjySource" />
+      <el-table-column label="点突变" align="center" prop="dtpnyjy" />      
+      <el-table-column label="点突变解释" align="center" prop="dtpnyjyExpress" />      
+      <el-table-column label="点突变解释来源" align="center" prop="dtpnyjySource" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['data:dataReportByt:edit']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['data:dataBase:remove']"
           >删除</el-button>
@@ -376,124 +150,40 @@
     />
 
     <!-- 添加或修改病原体管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="唯一注册号" prop="assemblyAccession">
-          <el-input v-model="form.assemblyAccession" placeholder="请输入唯一注册号" />
-        </el-form-item>
-        <el-form-item label="参考基因组类型" prop="refseqCategory">
-          <el-input v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
-        </el-form-item>
-        <el-form-item label="分类号" prop="taxid">
-          <el-input v-model="form.taxid" placeholder="请输入分类号" />
-        </el-form-item>
-        <el-form-item label="种分类号" prop="speciesTaxid">
-          <el-input v-model="form.speciesTaxid" placeholder="请输入种分类号" />
-        </el-form-item>
-        <el-form-item label="生物名称" prop="organismName">
-          <el-input v-model="form.organismName" placeholder="请输入生物名称" />
-        </el-form-item>
-        <el-form-item label="亚种名称" prop="infraspecificName">
-          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
-        </el-form-item>
-        <el-form-item label="分类类型" prop="isolate">
-          <el-input v-model="form.isolate" placeholder="请输入分类类型" />
-        </el-form-item>
-        <el-form-item label="拼装级别" prop="assemblyLevel">
-          <el-input v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
-        </el-form-item>
-        <el-form-item label="基因组级别" prop="genomeRep">
-          <el-input v-model="form.genomeRep" placeholder="请输入基因组级别" />
-        </el-form-item>
-        <el-form-item label="seq_rel_date" prop="seqRelDate">
-          <el-date-picker clearable
-            v-model="form.seqRelDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择seq_rel_date">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="ASM编号" prop="asmName">
-          <el-input v-model="form.asmName" placeholder="请输入ASM编号" />
-        </el-form-item>
-        <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-          <el-input v-model="form.gbrsPairedAsm" placeholder="请输入gbrs_paired_asm" />
-        </el-form-item>
-        <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-          <el-input v-model="form.pairedAsmComp" placeholder="请输入paired_asm_comp" />
-        </el-form-item>
-        <el-form-item label="来源地址" prop="ftpPath">
-          <el-input v-model="form.ftpPath" placeholder="请输入来源地址" />
-        </el-form-item>
-        <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-          <el-input v-model="form.excludedFromRefseq" placeholder="请输入excluded_from_refseq" />
-        </el-form-item>
-        <el-form-item label="病源类型" prop="group">
-          <el-input v-model="form.group" placeholder="请输入病源类型" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSize">
-          <el-input v-model="form.genomeSize" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-          <el-input v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="GC比例" prop="gcPercent">
-          <el-input v-model="form.gcPercent" placeholder="请输入GC比例" />
-        </el-form-item>
-        <el-form-item label="replicon_count" prop="repliconCount">
-          <el-input v-model="form.repliconCount" placeholder="请输入replicon_count" />
-        </el-form-item>
-        <el-form-item label="scaffold_count" prop="scaffoldCount">
-          <el-input v-model="form.scaffoldCount" placeholder="请输入scaffold_count" />
-        </el-form-item>
-        <el-form-item label="contig_count" prop="contigCount">
-          <el-input v-model="form.contigCount" placeholder="请输入contig_count" />
-        </el-form-item>
-        <el-form-item label="总基因数" prop="totalGeneCount">
-          <el-input v-model="form.totalGeneCount" placeholder="请输入总基因数" />
-        </el-form-item>
-        <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-          <el-input v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
-        </el-form-item>
-        <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-          <el-input v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
-        </el-form-item>
-        <el-form-item label="中文名" prop="nameCn">
-          <el-input v-model="form.nameCn" placeholder="请输入中文名" />
-        </el-form-item>
-        <el-form-item label="定义" prop="defined">
-          <el-input v-model="form.defined" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="序列来源" prop="seqSource">
-          <el-input v-model="form.seqSource" placeholder="请输入序列来源" />
-        </el-form-item>
-        <el-form-item label="解释来源" prop="express">
-          <el-input v-model="form.express" placeholder="请输入解释来源" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因" prop="dtpnyjy">
-          <el-input v-model="form.dtpnyjy" placeholder="请输入点突变耐药基因" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
-          <el-input v-model="form.dtpnyjyExpress" placeholder="请输入点突变耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="耐药基因" prop="nyjy">
-          <el-input v-model="form.nyjy" placeholder="请输入耐药基因" />
-        </el-form-item>
-        <el-form-item label="耐药基因说明" prop="nyjyExpress">
-          <el-input v-model="form.nyjyExpress" placeholder="请输入耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="毒力基因" prop="dljy">
-          <el-input v-model="form.dljy" placeholder="请输入毒力基因" />
-        </el-form-item>
-        <el-form-item label="毒力基因说明" prop="dljyExpress">
-          <el-input v-model="form.dljyExpress" placeholder="请输入毒力基因说明" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="唯一注册号">{{ form.assemblyAccession }}</el-form-item>
+        <el-form-item label="生物名称">{{ form.organismName }}</el-form-item>
+        <el-form-item label="病源类型">{{ form.group }}</el-form-item>
+        <el-form-item label="子类标签">{{ form.group1 }}</el-form-item>
+        <el-form-item label="中文解释">{{ form.defined }}</el-form-item>
+        <el-form-item label="解释的来源">{{ form.definedSource }}</el-form-item>
+        <el-form-item label="参考基因组类型">{{ form.refseqCategory }}</el-form-item>
+        <el-form-item label="分类号">{{ form.taxid }}</el-form-item>
+        <el-form-item label="种分类号">{{ form.speciesTaxid }}</el-form-item>
+        <el-form-item label="亚种名称">{{ form.infraspecificName }}</el-form-item>
+        <el-form-item label="分类类型">{{ form.isolate }}</el-form-item>
+        <el-form-item label="拼装级别">{{ form.assemblyLevel }}</el-form-item>
+        <el-form-item label="基因组级别">{{ form.genomeRep }}</el-form-item>
+        <el-form-item label="seq_rel_date">{{ form.seqRelDate }}</el-form-item>
+        <el-form-item label="ASM编号">{{ form.asmName }}</el-form-item>
+        <el-form-item label="gbrs_paired_asm">{{ form.gbrs_paired_asm }}</el-form-item>
+        <el-form-item label="paired_asm_comp">{{ form.paired_asm_comp }}</el-form-item>
+        <el-form-item label="ftp_path">{{ form.ftp_path }}</el-form-item>
+        <el-form-item label="excluded_from_refseq">{{ form.excluded_from_refseq }}</el-form-item>        
+        <el-form-item label="装配类型">{{ form.assemblyType }}</el-form-item>
+        <el-form-item label="基因组大小">{{ form.genomeSize }}</el-form-item>
+        <el-form-item label="基因组大小(无缺口)">{{ form.genomeSizeUngapped }}</el-form-item>
+        <el-form-item label="GC比例">{{ form.gcPercent }}</el-form-item>
+        <el-form-item label="replicon_count">{{ form.replicon_count }}</el-form-item>
+        <el-form-item label="scaffold_count">{{ form.scaffold_count }}</el-form-item>
+        <el-form-item label="contig_count">{{ form.contig_count }}</el-form-item>
+        <el-form-item label="总基因数">{{ form.totalGeneCount }}</el-form-item>
+        <el-form-item label="翻译蛋白基因数">{{ form.proteinCodingGeneCount }}</el-form-item>
+        <el-form-item label="非编码基因数">{{ form.nonCodingGeneCount }}</el-form-item>
+        <el-form-item label="毒力基因">{{ form.dljy }}</el-form-item>
+        <el-form-item label="毒力基因解释">{{ form.dljyExpress }}</el-form-item>
+        <el-form-item label="毒力基因解释来源">{{ form.dljySource }}</el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -501,11 +191,13 @@
     </el-dialog>
     <!-- 上传文件  -->
      <input hidden type="file" ref="upload_file" accept=".xls,.xlsx" class="upload_file" @change="readExcel($event)" />
+
   </div>
 </template>
 
 <script>
 import { listDataBase, getDataBase, delDataBase, addDataBase, updateDataBase,importDataBase } from "@/api/data/dataBase"
+import * as XLSX from "xlsx"
 
 export default {
   name: "DataBase",
@@ -534,58 +226,33 @@ export default {
         pageNum: 1,
         pageSize: 10,
         type:2,
-        assemblyAccession: null,
-        refseqCategory: null,
-        taxid: null,
-        speciesTaxid: null,
         organismName: null,
-        infraspecificName: null,
-        isolate: null,
-        assemblyLevel: null,
-        genomeRep: null,
-        seqRelDate: null,
-        asmName: null,
-        gbrsPairedAsm: null,
-        pairedAsmComp: null,
-        ftpPath: null,
-        excludedFromRefseq: null,
-        assemblyType: null,
         group: null,
-        genomeSize: null,
-        genomeSizeUngapped: null,
-        gcPercent: null,
-        repliconCount: null,
-        scaffoldCount: null,
-        contigCount: null,
-        totalGeneCount: null,
-        proteinCodingGeneCount: null,
-        nonCodingGeneCount: null,
-        nameCn: null,
+        group1: null,
         defined: null,
-        seqSource: null,
-        express: null,
-        filePath: null,
-        dtpnyjy: null,
-        dtpnyjyExpress: null,
-        nyjy: null,
-        nyjyExpress: null,
-        dljy: null,
-        dljyExpress: null,
+        dljy:null,
+        dljyExpress:null,
+        dljySource:null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      upload_file: "",
+      lists: [],
     }
   },
   created() {
     this.getList()
   },
   methods: {
-        // 读取Excel文件
+    // 读取Excel文件
     readExcel(e) {
+      console.log("读取Excel文件", e);
+      console.log("读取Excel文件11", XLSX);
   // 读取表格文件
+  let that = this;
   const files = e.target.files;
   if (files.length <= 0) {
     return false;
@@ -597,7 +264,28 @@ export default {
     return false;
   } else {
     this.uploadFile(files[0]);
+    // 更新获取文件名
+    // that.upload_file = files[0].name;
   }
+  // const fileReader = new FileReader();
+  // fileReader.onload = (ev) => {
+  //   try {
+  //     const data = ev.target.result;
+  //     const workbook = XLSX.read(data, {
+  //       type: "binary",
+  //     });
+  //     const wsname = workbook.SheetNames[0]; //取第一张表
+  //     console.log(XLSX);
+  //     console.log(wsname);
+  //     console.log(workbook);
+  //     const ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname]); //生成json表格内容
+  //     that.lists = [];
+  //     console.log(ws);
+  //   } catch (e) {
+  //     return false;
+  //   }
+  // };
+  // fileReader.readAsBinaryString(files[0]);
 },
 uploadFile(file) {
   console.log("上传文件", file);
@@ -697,6 +385,12 @@ importDataBase(formData).then(response => {
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
+    handleUpdate(row) {
+      this.reset()
+      this.form = row
+      this.open = true
+      this.title = "查看毒力基因信息"
+    },
   }
 }
 </script>

+ 120 - 428
src/views/data/dataBase/dtbnyjy.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="140px">
       <el-form-item label="唯一注册号" prop="assemblyAccession">
         <el-input
           v-model="queryParams.assemblyAccession"
@@ -9,30 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="参考基因组类型" prop="refseqCategory">
-        <el-input
-          v-model="queryParams.refseqCategory"
-          placeholder="请输入参考基因组类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="分类号" prop="taxid">
-        <el-input
-          v-model="queryParams.taxid"
-          placeholder="请输入分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="种分类号" prop="speciesTaxid">
-        <el-input
-          v-model="queryParams.speciesTaxid"
-          placeholder="请输入种分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item label="生物名称" prop="organismName">
         <el-input
           v-model="queryParams.organismName"
@@ -41,86 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="亚种名称" prop="infraspecificName">
-        <el-input
-          v-model="queryParams.infraspecificName"
-          placeholder="请输入亚种名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="分类类型" prop="isolate">
-        <el-input
-          v-model="queryParams.isolate"
-          placeholder="请输入分类类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拼装级别" prop="assemblyLevel">
-        <el-input
-          v-model="queryParams.assemblyLevel"
-          placeholder="请输入拼装级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基因组级别" prop="genomeRep">
-        <el-input
-          v-model="queryParams.genomeRep"
-          placeholder="请输入基因组级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="seq_rel_date" prop="seqRelDate">
-        <el-date-picker clearable
-          v-model="queryParams.seqRelDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择seq_rel_date">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="ASM编号" prop="asmName">
-        <el-input
-          v-model="queryParams.asmName"
-          placeholder="请输入ASM编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-        <el-input
-          v-model="queryParams.gbrsPairedAsm"
-          placeholder="请输入gbrs_paired_asm"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-        <el-input
-          v-model="queryParams.pairedAsmComp"
-          placeholder="请输入paired_asm_comp"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="来源地址" prop="ftpPath">
-        <el-input
-          v-model="queryParams.ftpPath"
-          placeholder="请输入来源地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-        <el-input
-          v-model="queryParams.excludedFromRefseq"
-          placeholder="请输入excluded_from_refseq"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="病源类型" prop="group">
         <el-input
           v-model="queryParams.group"
@@ -129,158 +25,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="基因组大小" prop="genomeSize">
-        <el-input
-          v-model="queryParams.genomeSize"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-        <el-input
-          v-model="queryParams.genomeSizeUngapped"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="GC比例" prop="gcPercent">
-        <el-input
-          v-model="queryParams.gcPercent"
-          placeholder="请输入GC比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="replicon_count" prop="repliconCount">
-        <el-input
-          v-model="queryParams.repliconCount"
-          placeholder="请输入replicon_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="scaffold_count" prop="scaffoldCount">
-        <el-input
-          v-model="queryParams.scaffoldCount"
-          placeholder="请输入scaffold_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="contig_count" prop="contigCount">
-        <el-input
-          v-model="queryParams.contigCount"
-          placeholder="请输入contig_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总基因数" prop="totalGeneCount">
-        <el-input
-          v-model="queryParams.totalGeneCount"
-          placeholder="请输入总基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-        <el-input
-          v-model="queryParams.proteinCodingGeneCount"
-          placeholder="请输入翻译蛋白基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-        <el-input
-          v-model="queryParams.nonCodingGeneCount"
-          placeholder="请输入非编码基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="中文名" prop="nameCn">
-        <el-input
-          v-model="queryParams.nameCn"
-          placeholder="请输入中文名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="序列来源" prop="seqSource">
-        <el-input
-          v-model="queryParams.seqSource"
-          placeholder="请输入序列来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="解释来源" prop="express">
+      <el-form-item label="子类标签" prop="group1">
         <el-input
-          v-model="queryParams.express"
-          placeholder="请输入解释来源"
+          v-model="queryParams.group1"
+          placeholder="请输入子类标签"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="文件路径" prop="filePath">
+      <el-form-item label="中文解释" prop="defined">
         <el-input
-          v-model="queryParams.filePath"
-          placeholder="请输入文件路径"
+          v-model="queryParams.defined"
+          placeholder="请输入中文解释"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点突变耐药基因" prop="dtpnyjy">
+      <el-form-item label="点突变" prop="dtpnyjy">
         <el-input
           v-model="queryParams.dtpnyjy"
-          placeholder="请输入点突变耐药基因"
+          placeholder="请输入点突变"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
+      <el-form-item label="点突变解释" prop="dtpnyjyExpress">
         <el-input
           v-model="queryParams.dtpnyjyExpress"
-          placeholder="请输入点突变耐药基因说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="耐药基因" prop="nyjy">
-        <el-input
-          v-model="queryParams.nyjy"
-          placeholder="请输入耐药基因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="耐药基因说明" prop="nyjyExpress">
-        <el-input
-          v-model="queryParams.nyjyExpress"
-          placeholder="请输入耐药基因说明"
+          placeholder="请输入点突变解释"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毒力基因" prop="dljy">
+      <el-form-item label="点突变解释来源" prop="dtpnyjySource">
         <el-input
-          v-model="queryParams.dljy"
-          placeholder="请输入毒力基因"
+          v-model="queryParams.dtpnyjySource"
+          placeholder="请输入点突变解释来源"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毒力基因说明" prop="dljyExpress">
-        <el-input
-          v-model="queryParams.dljyExpress"
-          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>
@@ -288,16 +72,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -310,56 +84,56 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataBaseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一注册号" align="center" prop="assemblyAccession" />
-      <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
+    <el-table v-loading="loading" :data="dataBaseList" >
+      <el-table-column label="唯一注册号" align="center" prop="assemblyAccession" width="100" />
+      <el-table-column label="生物名称" align="center" prop="organismName" width="150" />
+      <el-table-column label="病源类型" align="center" prop="group" />
+      <el-table-column label="子类标签" align="center" prop="group1" />
+      <el-table-column label="中文解释" align="center" prop="defined"  width="500" />
+      <el-table-column label="解释的来源" align="center" prop="definedSource" width="200" />
+      <el-table-column label="点突变" align="center" prop="dtpnyjy" />      
+      <el-table-column label="点突变解释" align="center" prop="dtpnyjyExpress" width="100" />      
+      <el-table-column label="点突变解释来源" align="center" prop="dtpnyjySource" width="200" /> 
+      <!-- <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
       <el-table-column label="分类号" align="center" prop="taxid" />
       <el-table-column label="种分类号" align="center" prop="speciesTaxid" />
-      <el-table-column label="生物名称" align="center" prop="organismName" />
-      <el-table-column label="亚种名称" align="center" prop="infraspecificName" />
+      <el-table-column label="亚种名称" align="center" prop="infraspecificName"/>
       <el-table-column label="分类类型" align="center" prop="isolate" />
       <el-table-column label="拼装级别" align="center" prop="assemblyLevel" />
       <el-table-column label="基因组级别" align="center" prop="genomeRep" />
-      <!-- <el-table-column label="seq_rel_date" align="center" prop="seqRelDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.seqRelDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="seqRelDate" align="center" prop="seqRelDate" />     
       <el-table-column label="ASM编号" align="center" prop="asmName" />
       <el-table-column label="gbrs_paired_asm" align="center" prop="gbrsPairedAsm" />
-      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" /> -->
-      <el-table-column label="来源地址" align="center" prop="ftpPath" width="200"/>
-      <!-- <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" /> -->
+      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" />
+      <el-table-column label="ftp_path" align="center" prop="ftpPath" />
+      <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" />
       <el-table-column label="装配类型" align="center" prop="assemblyType" />
-      <el-table-column label="病源类型" align="center" prop="group" />
       <el-table-column label="基因组大小" align="center" prop="genomeSize" />
-      <el-table-column label="基因组大小" align="center" prop="genomeSizeUngapped" />
-      <!-- <el-table-column label="GC比例" align="center" prop="gcPercent" />
+      <el-table-column label="基因组大小(无缺口)" align="center" prop="genomeSizeUngapped" />
+      <el-table-column label="GC比例" align="center" prop="gcPercent" />
       <el-table-column label="replicon_count" align="center" prop="repliconCount" />
       <el-table-column label="scaffold_count" align="center" prop="scaffoldCount" />
-      <el-table-column label="contig_count" align="center" prop="contigCount" /> -->
+      <el-table-column label="contig_count" align="center" prop="contigCount" />
       <el-table-column label="总基因数" align="center" prop="totalGeneCount" />
-      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />
-      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />
-      <el-table-column label="中文名" align="center" prop="nameCn" />
-      <!-- <el-table-column label="定义" align="center" prop="defined" /> -->
-      <el-table-column label="序列来源" align="center" prop="seqSource" />
-      <el-table-column label="解释来源" align="center" prop="express" />
-      <el-table-column label="文件路径" align="center" prop="filePath" />
-      <el-table-column label="点突变耐药基因" align="center" prop="dtpnyjy" />
-      <el-table-column label="点突变耐药基因说明" align="center" prop="dtpnyjyExpress" />
-      <el-table-column label="耐药基因" align="center" prop="nyjy" />
-      <el-table-column label="耐药基因说明" align="center" prop="nyjyExpress" />
-      <el-table-column label="毒力基因" align="center" prop="dljy" />
-      <el-table-column label="毒力基因说明" align="center" prop="dljyExpress" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />      
+      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />      
+      <el-table-column label="毒力基因" align="center" prop="dljy" />      
+      <el-table-column label="毒力基因解释" align="center" prop="dljyExpress" />      
+      <el-table-column label="毒力基因解释来源" align="center" prop="dljySource" />
+      <el-table-column label="耐药基因" align="center" prop="nyjy" />      
+      <el-table-column label="耐药基因解释" align="center" prop="nyjyExpress" />      
+      <el-table-column label="耐药基因解释来源" align="center" prop="nyjySource" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['data:dataReportByt:edit']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['data:dataBase:remove']"
           >删除</el-button>
@@ -376,124 +150,40 @@
     />
 
     <!-- 添加或修改病原体管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="唯一注册号" prop="assemblyAccession">
-          <el-input v-model="form.assemblyAccession" placeholder="请输入唯一注册号" />
-        </el-form-item>
-        <el-form-item label="参考基因组类型" prop="refseqCategory">
-          <el-input v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
-        </el-form-item>
-        <el-form-item label="分类号" prop="taxid">
-          <el-input v-model="form.taxid" placeholder="请输入分类号" />
-        </el-form-item>
-        <el-form-item label="种分类号" prop="speciesTaxid">
-          <el-input v-model="form.speciesTaxid" placeholder="请输入种分类号" />
-        </el-form-item>
-        <el-form-item label="生物名称" prop="organismName">
-          <el-input v-model="form.organismName" placeholder="请输入生物名称" />
-        </el-form-item>
-        <el-form-item label="亚种名称" prop="infraspecificName">
-          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
-        </el-form-item>
-        <el-form-item label="分类类型" prop="isolate">
-          <el-input v-model="form.isolate" placeholder="请输入分类类型" />
-        </el-form-item>
-        <el-form-item label="拼装级别" prop="assemblyLevel">
-          <el-input v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
-        </el-form-item>
-        <el-form-item label="基因组级别" prop="genomeRep">
-          <el-input v-model="form.genomeRep" placeholder="请输入基因组级别" />
-        </el-form-item>
-        <el-form-item label="seq_rel_date" prop="seqRelDate">
-          <el-date-picker clearable
-            v-model="form.seqRelDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择seq_rel_date">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="ASM编号" prop="asmName">
-          <el-input v-model="form.asmName" placeholder="请输入ASM编号" />
-        </el-form-item>
-        <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-          <el-input v-model="form.gbrsPairedAsm" placeholder="请输入gbrs_paired_asm" />
-        </el-form-item>
-        <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-          <el-input v-model="form.pairedAsmComp" placeholder="请输入paired_asm_comp" />
-        </el-form-item>
-        <el-form-item label="来源地址" prop="ftpPath">
-          <el-input v-model="form.ftpPath" placeholder="请输入来源地址" />
-        </el-form-item>
-        <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-          <el-input v-model="form.excludedFromRefseq" placeholder="请输入excluded_from_refseq" />
-        </el-form-item>
-        <el-form-item label="病源类型" prop="group">
-          <el-input v-model="form.group" placeholder="请输入病源类型" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSize">
-          <el-input v-model="form.genomeSize" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-          <el-input v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="GC比例" prop="gcPercent">
-          <el-input v-model="form.gcPercent" placeholder="请输入GC比例" />
-        </el-form-item>
-        <el-form-item label="replicon_count" prop="repliconCount">
-          <el-input v-model="form.repliconCount" placeholder="请输入replicon_count" />
-        </el-form-item>
-        <el-form-item label="scaffold_count" prop="scaffoldCount">
-          <el-input v-model="form.scaffoldCount" placeholder="请输入scaffold_count" />
-        </el-form-item>
-        <el-form-item label="contig_count" prop="contigCount">
-          <el-input v-model="form.contigCount" placeholder="请输入contig_count" />
-        </el-form-item>
-        <el-form-item label="总基因数" prop="totalGeneCount">
-          <el-input v-model="form.totalGeneCount" placeholder="请输入总基因数" />
-        </el-form-item>
-        <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-          <el-input v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
-        </el-form-item>
-        <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-          <el-input v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
-        </el-form-item>
-        <el-form-item label="中文名" prop="nameCn">
-          <el-input v-model="form.nameCn" placeholder="请输入中文名" />
-        </el-form-item>
-        <el-form-item label="定义" prop="defined">
-          <el-input v-model="form.defined" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="序列来源" prop="seqSource">
-          <el-input v-model="form.seqSource" placeholder="请输入序列来源" />
-        </el-form-item>
-        <el-form-item label="解释来源" prop="express">
-          <el-input v-model="form.express" placeholder="请输入解释来源" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因" prop="dtpnyjy">
-          <el-input v-model="form.dtpnyjy" placeholder="请输入点突变耐药基因" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
-          <el-input v-model="form.dtpnyjyExpress" placeholder="请输入点突变耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="耐药基因" prop="nyjy">
-          <el-input v-model="form.nyjy" placeholder="请输入耐药基因" />
-        </el-form-item>
-        <el-form-item label="耐药基因说明" prop="nyjyExpress">
-          <el-input v-model="form.nyjyExpress" placeholder="请输入耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="毒力基因" prop="dljy">
-          <el-input v-model="form.dljy" placeholder="请输入毒力基因" />
-        </el-form-item>
-        <el-form-item label="毒力基因说明" prop="dljyExpress">
-          <el-input v-model="form.dljyExpress" placeholder="请输入毒力基因说明" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="唯一注册号">{{ form.assemblyAccession }}</el-form-item>
+        <el-form-item label="生物名称">{{ form.organismName }}</el-form-item>
+        <el-form-item label="病源类型">{{ form.group }}</el-form-item>
+        <el-form-item label="子类标签">{{ form.group1 }}</el-form-item>
+        <el-form-item label="中文解释">{{ form.defined }}</el-form-item>
+        <el-form-item label="解释的来源">{{ form.definedSource }}</el-form-item>
+        <el-form-item label="参考基因组类型">{{ form.refseqCategory }}</el-form-item>
+        <el-form-item label="分类号">{{ form.taxid }}</el-form-item>
+        <el-form-item label="种分类号">{{ form.speciesTaxid }}</el-form-item>
+        <el-form-item label="亚种名称">{{ form.infraspecificName }}</el-form-item>
+        <el-form-item label="分类类型">{{ form.isolate }}</el-form-item>
+        <el-form-item label="拼装级别">{{ form.assemblyLevel }}</el-form-item>
+        <el-form-item label="基因组级别">{{ form.genomeRep }}</el-form-item>
+        <el-form-item label="seq_rel_date">{{ form.seqRelDate }}</el-form-item>
+        <el-form-item label="ASM编号">{{ form.asmName }}</el-form-item>
+        <el-form-item label="gbrs_paired_asm">{{ form.gbrs_paired_asm }}</el-form-item>
+        <el-form-item label="paired_asm_comp">{{ form.paired_asm_comp }}</el-form-item>
+        <el-form-item label="ftp_path">{{ form.ftp_path }}</el-form-item>
+        <el-form-item label="excluded_from_refseq">{{ form.excluded_from_refseq }}</el-form-item>        
+        <el-form-item label="装配类型">{{ form.assemblyType }}</el-form-item>
+        <el-form-item label="基因组大小">{{ form.genomeSize }}</el-form-item>
+        <el-form-item label="基因组大小(无缺口)">{{ form.genomeSizeUngapped }}</el-form-item>
+        <el-form-item label="GC比例">{{ form.gcPercent }}</el-form-item>
+        <el-form-item label="replicon_count">{{ form.replicon_count }}</el-form-item>
+        <el-form-item label="scaffold_count">{{ form.scaffold_count }}</el-form-item>
+        <el-form-item label="contig_count">{{ form.contig_count }}</el-form-item>
+        <el-form-item label="总基因数">{{ form.totalGeneCount }}</el-form-item>
+        <el-form-item label="翻译蛋白基因数">{{ form.proteinCodingGeneCount }}</el-form-item>
+        <el-form-item label="非编码基因数">{{ form.nonCodingGeneCount }}</el-form-item>
+        <el-form-item label="点突变">{{ form.dtpnyjy }}</el-form-item>
+        <el-form-item label="点突变解释">{{ form.dtpnyjyExpress }}</el-form-item>
+        <el-form-item label="点突变解释来源">{{ form.dtpnyjySource }}</el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -501,11 +191,13 @@
     </el-dialog>
     <!-- 上传文件  -->
      <input hidden type="file" ref="upload_file" accept=".xls,.xlsx" class="upload_file" @change="readExcel($event)" />
+
   </div>
 </template>
 
 <script>
-import { listDataBase, getDataBase, delDataBase, addDataBase, updateDataBase } from "@/api/data/dataBase"
+import { listDataBase, getDataBase, delDataBase, addDataBase, updateDataBase,importDataBase } from "@/api/data/dataBase"
+import * as XLSX from "xlsx"
 
 export default {
   name: "DataBase",
@@ -533,57 +225,30 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type:3,
+        type:4,
         assemblyAccession: null,
-        refseqCategory: null,
-        taxid: null,
-        speciesTaxid: null,
         organismName: null,
-        infraspecificName: null,
-        isolate: null,
-        assemblyLevel: null,
-        genomeRep: null,
-        seqRelDate: null,
-        asmName: null,
-        gbrsPairedAsm: null,
-        pairedAsmComp: null,
-        ftpPath: null,
-        excludedFromRefseq: null,
-        assemblyType: null,
         group: null,
-        genomeSize: null,
-        genomeSizeUngapped: null,
-        gcPercent: null,
-        repliconCount: null,
-        scaffoldCount: null,
-        contigCount: null,
-        totalGeneCount: null,
-        proteinCodingGeneCount: null,
-        nonCodingGeneCount: null,
-        nameCn: null,
+        group1: null,
         defined: null,
-        seqSource: null,
-        express: null,
-        filePath: null,
-        dtpnyjy: null,
-        dtpnyjyExpress: null,
-        nyjy: null,
-        nyjyExpress: null,
-        dljy: null,
-        dljyExpress: null,
+        dtpnyjy:null,
+        dtpnyjyExpress:null,
+        dtpnyjySource:null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      upload_file: "",
+      lists: [],
     }
   },
   created() {
     this.getList()
   },
   methods: {
-        // 读取Excel文件
+    // 读取Excel文件
     readExcel(e) {
       console.log("读取Excel文件", e);
       console.log("读取Excel文件11", XLSX);
@@ -600,7 +265,28 @@ export default {
     return false;
   } else {
     this.uploadFile(files[0]);
+    // 更新获取文件名
+    // that.upload_file = files[0].name;
   }
+  // const fileReader = new FileReader();
+  // fileReader.onload = (ev) => {
+  //   try {
+  //     const data = ev.target.result;
+  //     const workbook = XLSX.read(data, {
+  //       type: "binary",
+  //     });
+  //     const wsname = workbook.SheetNames[0]; //取第一张表
+  //     console.log(XLSX);
+  //     console.log(wsname);
+  //     console.log(workbook);
+  //     const ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname]); //生成json表格内容
+  //     that.lists = [];
+  //     console.log(ws);
+  //   } catch (e) {
+  //     return false;
+  //   }
+  // };
+  // fileReader.readAsBinaryString(files[0]);
 },
 uploadFile(file) {
   console.log("上传文件", file);
@@ -700,6 +386,12 @@ importDataBase(formData).then(response => {
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
+    handleUpdate(row) {
+      this.reset()
+      this.form = row
+      this.open = true
+      this.title = "查看病原体信息"
+    },
   }
 }
 </script>

+ 118 - 426
src/views/data/dataBase/nyjy.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="140px">
       <el-form-item label="唯一注册号" prop="assemblyAccession">
         <el-input
           v-model="queryParams.assemblyAccession"
@@ -9,30 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="参考基因组类型" prop="refseqCategory">
-        <el-input
-          v-model="queryParams.refseqCategory"
-          placeholder="请输入参考基因组类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="分类号" prop="taxid">
-        <el-input
-          v-model="queryParams.taxid"
-          placeholder="请输入分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="种分类号" prop="speciesTaxid">
-        <el-input
-          v-model="queryParams.speciesTaxid"
-          placeholder="请输入种分类号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item label="生物名称" prop="organismName">
         <el-input
           v-model="queryParams.organismName"
@@ -41,87 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="亚种名称" prop="infraspecificName">
-        <el-input
-          v-model="queryParams.infraspecificName"
-          placeholder="请输入亚种名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分类类型" prop="isolate">
-        <el-input
-          v-model="queryParams.isolate"
-          placeholder="请输入分类类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拼装级别" prop="assemblyLevel">
-        <el-input
-          v-model="queryParams.assemblyLevel"
-          placeholder="请输入拼装级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基因组级别" prop="genomeRep">
-        <el-input
-          v-model="queryParams.genomeRep"
-          placeholder="请输入基因组级别"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="seq_rel_date" prop="seqRelDate">
-        <el-date-picker clearable
-          v-model="queryParams.seqRelDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择seq_rel_date">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="ASM编号" prop="asmName">
-        <el-input
-          v-model="queryParams.asmName"
-          placeholder="请输入ASM编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-        <el-input
-          v-model="queryParams.gbrsPairedAsm"
-          placeholder="请输入gbrs_paired_asm"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-        <el-input
-          v-model="queryParams.pairedAsmComp"
-          placeholder="请输入paired_asm_comp"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="来源地址" prop="ftpPath">
-        <el-input
-          v-model="queryParams.ftpPath"
-          placeholder="请输入来源地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-        <el-input
-          v-model="queryParams.excludedFromRefseq"
-          placeholder="请输入excluded_from_refseq"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="病源类型" prop="group">
+      <el-form-item label="病源类型" prop="group">
         <el-input
           v-model="queryParams.group"
           placeholder="请输入病源类型"
@@ -129,122 +25,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="基因组大小" prop="genomeSize">
-        <el-input
-          v-model="queryParams.genomeSize"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-        <el-input
-          v-model="queryParams.genomeSizeUngapped"
-          placeholder="请输入基因组大小"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="GC比例" prop="gcPercent">
-        <el-input
-          v-model="queryParams.gcPercent"
-          placeholder="请输入GC比例"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="replicon_count" prop="repliconCount">
-        <el-input
-          v-model="queryParams.repliconCount"
-          placeholder="请输入replicon_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="scaffold_count" prop="scaffoldCount">
-        <el-input
-          v-model="queryParams.scaffoldCount"
-          placeholder="请输入scaffold_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="contig_count" prop="contigCount">
-        <el-input
-          v-model="queryParams.contigCount"
-          placeholder="请输入contig_count"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总基因数" prop="totalGeneCount">
-        <el-input
-          v-model="queryParams.totalGeneCount"
-          placeholder="请输入总基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-        <el-input
-          v-model="queryParams.proteinCodingGeneCount"
-          placeholder="请输入翻译蛋白基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-        <el-input
-          v-model="queryParams.nonCodingGeneCount"
-          placeholder="请输入非编码基因数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="中文名" prop="nameCn">
-        <el-input
-          v-model="queryParams.nameCn"
-          placeholder="请输入中文名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="序列来源" prop="seqSource">
-        <el-input
-          v-model="queryParams.seqSource"
-          placeholder="请输入序列来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="解释来源" prop="express">
-        <el-input
-          v-model="queryParams.express"
-          placeholder="请输入解释来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="文件路径" prop="filePath">
-        <el-input
-          v-model="queryParams.filePath"
-          placeholder="请输入文件路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="点突变耐药基因" prop="dtpnyjy">
+      <el-form-item label="子类标签" prop="group1">
         <el-input
-          v-model="queryParams.dtpnyjy"
-          placeholder="请输入点突变耐药基因"
+          v-model="queryParams.group1"
+          placeholder="请输入子类标签"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
+      <el-form-item label="中文解释" prop="defined">
         <el-input
-          v-model="queryParams.dtpnyjyExpress"
-          placeholder="请输入点突变耐药基因说明"
+          v-model="queryParams.defined"
+          placeholder="请输入中文解释"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -257,30 +49,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="耐药基因说明" prop="nyjyExpress">
+      <el-form-item label="耐药基因解释" prop="nyjyExpress">
         <el-input
           v-model="queryParams.nyjyExpress"
-          placeholder="请输入耐药基因说明"
+          placeholder="请输入耐药基因解释"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毒力基因" prop="dljy">
+      <el-form-item label="耐药基因解释来源" prop="nyjySource">
         <el-input
-          v-model="queryParams.dljy"
-          placeholder="请输入毒力基因"
+          v-model="queryParams.nyjySource"
+          placeholder="请输入耐药基因解释来源"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="毒力基因说明" prop="dljyExpress">
-        <el-input
-          v-model="queryParams.dljyExpress"
-          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>
@@ -288,16 +72,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -310,56 +84,56 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dataBaseList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一注册号" align="center" prop="assemblyAccession" />
-      <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
+    <el-table v-loading="loading" :data="dataBaseList" >
+      <el-table-column label="唯一注册号" align="center" prop="assemblyAccession" width="100"/>
+      <el-table-column label="生物名称" align="center" prop="organismName" width="150"/>
+      <el-table-column label="病源类型" align="center" prop="group" />
+      <el-table-column label="子类标签" align="center" prop="group1" />
+      <el-table-column label="中文解释" align="center" prop="defined"  width="500" />
+      <el-table-column label="解释的来源" align="center" prop="definedSource" width="200" />
+      <el-table-column label="耐药基因" align="center" prop="nyjy" />      
+      <el-table-column label="耐药基因解释" align="center" prop="nyjyExpress" width="100" />      
+      <el-table-column label="耐药基因解释来源" align="center" prop="nyjySource" width="200" />
+      <!-- <el-table-column label="参考基因组类型" align="center" prop="refseqCategory" />
       <el-table-column label="分类号" align="center" prop="taxid" />
       <el-table-column label="种分类号" align="center" prop="speciesTaxid" />
-      <el-table-column label="生物名称" align="center" prop="organismName" />
-      <el-table-column label="亚种名称" align="center" prop="infraspecificName" />
+      <el-table-column label="亚种名称" align="center" prop="infraspecificName"/>
       <el-table-column label="分类类型" align="center" prop="isolate" />
       <el-table-column label="拼装级别" align="center" prop="assemblyLevel" />
       <el-table-column label="基因组级别" align="center" prop="genomeRep" />
-      <!-- <el-table-column label="seq_rel_date" align="center" prop="seqRelDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.seqRelDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="seqRelDate" align="center" prop="seqRelDate" />     
       <el-table-column label="ASM编号" align="center" prop="asmName" />
       <el-table-column label="gbrs_paired_asm" align="center" prop="gbrsPairedAsm" />
-      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" /> -->
-      <el-table-column label="来源地址" align="center" prop="ftpPath" width="200"/>
-      <!-- <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" /> -->
+      <el-table-column label="paired_asm_comp" align="center" prop="pairedAsmComp" />
+      <el-table-column label="ftp_path" align="center" prop="ftpPath" />
+      <el-table-column label="excluded_from_refseq" align="center" prop="excludedFromRefseq" />
       <el-table-column label="装配类型" align="center" prop="assemblyType" />
-      <el-table-column label="病源类型" align="center" prop="group" />
       <el-table-column label="基因组大小" align="center" prop="genomeSize" />
-      <el-table-column label="基因组大小" align="center" prop="genomeSizeUngapped" />
-      <!-- <el-table-column label="GC比例" align="center" prop="gcPercent" />
+      <el-table-column label="基因组大小(无缺口)" align="center" prop="genomeSizeUngapped" />
+      <el-table-column label="GC比例" align="center" prop="gcPercent" />
       <el-table-column label="replicon_count" align="center" prop="repliconCount" />
       <el-table-column label="scaffold_count" align="center" prop="scaffoldCount" />
-      <el-table-column label="contig_count" align="center" prop="contigCount" /> -->
+      <el-table-column label="contig_count" align="center" prop="contigCount" />
       <el-table-column label="总基因数" align="center" prop="totalGeneCount" />
-      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />
-      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />
-      <el-table-column label="中文名" align="center" prop="nameCn" />
-      <!-- <el-table-column label="定义" align="center" prop="defined" /> -->
-      <el-table-column label="序列来源" align="center" prop="seqSource" />
-      <el-table-column label="解释来源" align="center" prop="express" />
-      <el-table-column label="文件路径" align="center" prop="filePath" />
-      <el-table-column label="点突变耐药基因" align="center" prop="dtpnyjy" />
-      <el-table-column label="点突变耐药基因说明" align="center" prop="dtpnyjyExpress" />
-      <el-table-column label="耐药基因" align="center" prop="nyjy" />
-      <el-table-column label="耐药基因说明" align="center" prop="nyjyExpress" />
-      <el-table-column label="毒力基因" align="center" prop="dljy" />
-      <el-table-column label="毒力基因说明" align="center" prop="dljyExpress" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="翻译蛋白基因数" align="center" prop="proteinCodingGeneCount" />      
+      <el-table-column label="非编码基因数" align="center" prop="nonCodingGeneCount" />      
+      <el-table-column label="毒力基因" align="center" prop="dljy" />      
+      <el-table-column label="毒力基因解释" align="center" prop="dljyExpress" />      
+      <el-table-column label="毒力基因解释来源" align="center" prop="dljySource" />
+      <el-table-column label="点突变" align="center" prop="dtpnyjy" />      
+      <el-table-column label="点突变解释" align="center" prop="dtpnyjyExpress" />      
+      <el-table-column label="点突变解释来源" align="center" prop="dtpnyjySource" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['data:dataReportByt:edit']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['data:dataBase:remove']"
           >删除</el-button>
@@ -376,124 +150,40 @@
     />
 
     <!-- 添加或修改病原体管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="唯一注册号" prop="assemblyAccession">
-          <el-input v-model="form.assemblyAccession" placeholder="请输入唯一注册号" />
-        </el-form-item>
-        <el-form-item label="参考基因组类型" prop="refseqCategory">
-          <el-input v-model="form.refseqCategory" placeholder="请输入参考基因组类型" />
-        </el-form-item>
-        <el-form-item label="分类号" prop="taxid">
-          <el-input v-model="form.taxid" placeholder="请输入分类号" />
-        </el-form-item>
-        <el-form-item label="种分类号" prop="speciesTaxid">
-          <el-input v-model="form.speciesTaxid" placeholder="请输入种分类号" />
-        </el-form-item>
-        <el-form-item label="生物名称" prop="organismName">
-          <el-input v-model="form.organismName" placeholder="请输入生物名称" />
-        </el-form-item>
-        <el-form-item label="亚种名称" prop="infraspecificName">
-          <el-input v-model="form.infraspecificName" placeholder="请输入亚种名称" />
-        </el-form-item>
-        <el-form-item label="分类类型" prop="isolate">
-          <el-input v-model="form.isolate" placeholder="请输入分类类型" />
-        </el-form-item>
-        <el-form-item label="拼装级别" prop="assemblyLevel">
-          <el-input v-model="form.assemblyLevel" placeholder="请输入拼装级别" />
-        </el-form-item>
-        <el-form-item label="基因组级别" prop="genomeRep">
-          <el-input v-model="form.genomeRep" placeholder="请输入基因组级别" />
-        </el-form-item>
-        <el-form-item label="seq_rel_date" prop="seqRelDate">
-          <el-date-picker clearable
-            v-model="form.seqRelDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择seq_rel_date">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="ASM编号" prop="asmName">
-          <el-input v-model="form.asmName" placeholder="请输入ASM编号" />
-        </el-form-item>
-        <el-form-item label="gbrs_paired_asm" prop="gbrsPairedAsm">
-          <el-input v-model="form.gbrsPairedAsm" placeholder="请输入gbrs_paired_asm" />
-        </el-form-item>
-        <el-form-item label="paired_asm_comp" prop="pairedAsmComp">
-          <el-input v-model="form.pairedAsmComp" placeholder="请输入paired_asm_comp" />
-        </el-form-item>
-        <el-form-item label="来源地址" prop="ftpPath">
-          <el-input v-model="form.ftpPath" placeholder="请输入来源地址" />
-        </el-form-item>
-        <el-form-item label="excluded_from_refseq" prop="excludedFromRefseq">
-          <el-input v-model="form.excludedFromRefseq" placeholder="请输入excluded_from_refseq" />
-        </el-form-item>
-        <el-form-item label="病源类型" prop="group">
-          <el-input v-model="form.group" placeholder="请输入病源类型" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSize">
-          <el-input v-model="form.genomeSize" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="基因组大小" prop="genomeSizeUngapped">
-          <el-input v-model="form.genomeSizeUngapped" placeholder="请输入基因组大小" />
-        </el-form-item>
-        <el-form-item label="GC比例" prop="gcPercent">
-          <el-input v-model="form.gcPercent" placeholder="请输入GC比例" />
-        </el-form-item>
-        <el-form-item label="replicon_count" prop="repliconCount">
-          <el-input v-model="form.repliconCount" placeholder="请输入replicon_count" />
-        </el-form-item>
-        <el-form-item label="scaffold_count" prop="scaffoldCount">
-          <el-input v-model="form.scaffoldCount" placeholder="请输入scaffold_count" />
-        </el-form-item>
-        <el-form-item label="contig_count" prop="contigCount">
-          <el-input v-model="form.contigCount" placeholder="请输入contig_count" />
-        </el-form-item>
-        <el-form-item label="总基因数" prop="totalGeneCount">
-          <el-input v-model="form.totalGeneCount" placeholder="请输入总基因数" />
-        </el-form-item>
-        <el-form-item label="翻译蛋白基因数" prop="proteinCodingGeneCount">
-          <el-input v-model="form.proteinCodingGeneCount" placeholder="请输入翻译蛋白基因数" />
-        </el-form-item>
-        <el-form-item label="非编码基因数" prop="nonCodingGeneCount">
-          <el-input v-model="form.nonCodingGeneCount" placeholder="请输入非编码基因数" />
-        </el-form-item>
-        <el-form-item label="中文名" prop="nameCn">
-          <el-input v-model="form.nameCn" placeholder="请输入中文名" />
-        </el-form-item>
-        <el-form-item label="定义" prop="defined">
-          <el-input v-model="form.defined" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="序列来源" prop="seqSource">
-          <el-input v-model="form.seqSource" placeholder="请输入序列来源" />
-        </el-form-item>
-        <el-form-item label="解释来源" prop="express">
-          <el-input v-model="form.express" placeholder="请输入解释来源" />
-        </el-form-item>
-        <el-form-item label="文件路径" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入文件路径" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因" prop="dtpnyjy">
-          <el-input v-model="form.dtpnyjy" placeholder="请输入点突变耐药基因" />
-        </el-form-item>
-        <el-form-item label="点突变耐药基因说明" prop="dtpnyjyExpress">
-          <el-input v-model="form.dtpnyjyExpress" placeholder="请输入点突变耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="耐药基因" prop="nyjy">
-          <el-input v-model="form.nyjy" placeholder="请输入耐药基因" />
-        </el-form-item>
-        <el-form-item label="耐药基因说明" prop="nyjyExpress">
-          <el-input v-model="form.nyjyExpress" placeholder="请输入耐药基因说明" />
-        </el-form-item>
-        <el-form-item label="毒力基因" prop="dljy">
-          <el-input v-model="form.dljy" placeholder="请输入毒力基因" />
-        </el-form-item>
-        <el-form-item label="毒力基因说明" prop="dljyExpress">
-          <el-input v-model="form.dljyExpress" placeholder="请输入毒力基因说明" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="唯一注册号">{{ form.assemblyAccession }}</el-form-item>
+        <el-form-item label="生物名称">{{ form.organismName }}</el-form-item>
+        <el-form-item label="病源类型">{{ form.group }}</el-form-item>
+        <el-form-item label="子类标签">{{ form.group1 }}</el-form-item>
+        <el-form-item label="中文解释">{{ form.defined }}</el-form-item>
+        <el-form-item label="解释的来源">{{ form.definedSource }}</el-form-item>
+        <el-form-item label="参考基因组类型">{{ form.refseqCategory }}</el-form-item>
+        <el-form-item label="分类号">{{ form.taxid }}</el-form-item>
+        <el-form-item label="种分类号">{{ form.speciesTaxid }}</el-form-item>
+        <el-form-item label="亚种名称">{{ form.infraspecificName }}</el-form-item>
+        <el-form-item label="分类类型">{{ form.isolate }}</el-form-item>
+        <el-form-item label="拼装级别">{{ form.assemblyLevel }}</el-form-item>
+        <el-form-item label="基因组级别">{{ form.genomeRep }}</el-form-item>
+        <el-form-item label="seq_rel_date">{{ form.seqRelDate }}</el-form-item>
+        <el-form-item label="ASM编号">{{ form.asmName }}</el-form-item>
+        <el-form-item label="gbrs_paired_asm">{{ form.gbrs_paired_asm }}</el-form-item>
+        <el-form-item label="paired_asm_comp">{{ form.paired_asm_comp }}</el-form-item>
+        <el-form-item label="ftp_path">{{ form.ftp_path }}</el-form-item>
+        <el-form-item label="excluded_from_refseq">{{ form.excluded_from_refseq }}</el-form-item>        
+        <el-form-item label="装配类型">{{ form.assemblyType }}</el-form-item>
+        <el-form-item label="基因组大小">{{ form.genomeSize }}</el-form-item>
+        <el-form-item label="基因组大小(无缺口)">{{ form.genomeSizeUngapped }}</el-form-item>
+        <el-form-item label="GC比例">{{ form.gcPercent }}</el-form-item>
+        <el-form-item label="replicon_count">{{ form.replicon_count }}</el-form-item>
+        <el-form-item label="scaffold_count">{{ form.scaffold_count }}</el-form-item>
+        <el-form-item label="contig_count">{{ form.contig_count }}</el-form-item>
+        <el-form-item label="总基因数">{{ form.totalGeneCount }}</el-form-item>
+        <el-form-item label="翻译蛋白基因数">{{ form.proteinCodingGeneCount }}</el-form-item>
+        <el-form-item label="非编码基因数">{{ form.nonCodingGeneCount }}</el-form-item>
+        <el-form-item label="耐药基因">{{ form.nyjy }}</el-form-item>
+        <el-form-item label="耐药基因解释">{{ form.nyjyExpress }}</el-form-item>
+        <el-form-item label="耐药基因解释来源">{{ form.nyjySource }}</el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
@@ -501,11 +191,13 @@
     </el-dialog>
     <!-- 上传文件  -->
      <input hidden type="file" ref="upload_file" accept=".xls,.xlsx" class="upload_file" @change="readExcel($event)" />
+
   </div>
 </template>
 
 <script>
-import { listDataBase, getDataBase, delDataBase, addDataBase, updateDataBase } from "@/api/data/dataBase"
+import { listDataBase, getDataBase, delDataBase, addDataBase, updateDataBase,importDataBase } from "@/api/data/dataBase"
+import * as XLSX from "xlsx"
 
 export default {
   name: "DataBase",
@@ -535,55 +227,28 @@ export default {
         pageSize: 10,
         type:3,
         assemblyAccession: null,
-        refseqCategory: null,
-        taxid: null,
-        speciesTaxid: null,
         organismName: null,
-        infraspecificName: null,
-        isolate: null,
-        assemblyLevel: null,
-        genomeRep: null,
-        seqRelDate: null,
-        asmName: null,
-        gbrsPairedAsm: null,
-        pairedAsmComp: null,
-        ftpPath: null,
-        excludedFromRefseq: null,
-        assemblyType: null,
         group: null,
-        genomeSize: null,
-        genomeSizeUngapped: null,
-        gcPercent: null,
-        repliconCount: null,
-        scaffoldCount: null,
-        contigCount: null,
-        totalGeneCount: null,
-        proteinCodingGeneCount: null,
-        nonCodingGeneCount: null,
-        nameCn: null,
+        group1: null,
         defined: null,
-        seqSource: null,
-        express: null,
-        filePath: null,
-        dtpnyjy: null,
-        dtpnyjyExpress: null,
-        nyjy: null,
-        nyjyExpress: null,
-        dljy: null,
-        dljyExpress: null,
+        nyjy:null,
+        nyjyExpress:null,
+        nyjySource:null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      upload_file: "",
+      lists: [],
     }
   },
   created() {
     this.getList()
   },
   methods: {
-        // 读取Excel文件
+    // 读取Excel文件
     readExcel(e) {
       console.log("读取Excel文件", e);
       console.log("读取Excel文件11", XLSX);
@@ -600,7 +265,28 @@ export default {
     return false;
   } else {
     this.uploadFile(files[0]);
+    // 更新获取文件名
+    // that.upload_file = files[0].name;
   }
+  // const fileReader = new FileReader();
+  // fileReader.onload = (ev) => {
+  //   try {
+  //     const data = ev.target.result;
+  //     const workbook = XLSX.read(data, {
+  //       type: "binary",
+  //     });
+  //     const wsname = workbook.SheetNames[0]; //取第一张表
+  //     console.log(XLSX);
+  //     console.log(wsname);
+  //     console.log(workbook);
+  //     const ws = XLSX.utils.sheet_to_json(workbook.Sheets[wsname]); //生成json表格内容
+  //     that.lists = [];
+  //     console.log(ws);
+  //   } catch (e) {
+  //     return false;
+  //   }
+  // };
+  // fileReader.readAsBinaryString(files[0]);
 },
 uploadFile(file) {
   console.log("上传文件", file);
@@ -700,6 +386,12 @@ importDataBase(formData).then(response => {
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
+    handleUpdate(row) {
+      this.reset()
+      this.form = row
+      this.open = true
+      this.title = "查看耐药基因病原体信息"
+    },
   }
 }
 </script>

+ 0 - 4
src/views/sample/sampleInfo/index.vue

@@ -195,10 +195,6 @@
         <el-form-item label="样本编码" prop="sampleCode">
           <el-input v-model="form.sampleCode" placeholder="请输入样本编码" />
         </el-form-item>
-
-        <el-form-item label="患者电话" prop="patientPhone">
-          <el-input v-model="form.patientPhone" placeholder="请输入患者电话" />
-        </el-form-item>
         <el-form-item label="样本类型" prop="sampleTypeId">
           <el-select
             v-model="form.sampleTypeId"

Разница между файлами не показана из-за своего большого размера
+ 228 - 873
src/views/sample/samplePatient/index.vue


+ 2 - 2
vue.config.js

@@ -10,8 +10,8 @@ const CompressionPlugin = require('compression-webpack-plugin')
 const name = process.env.VUE_APP_TITLE || '传染病溯源预测系统' // 网页标题
 
 // const baseUrl = '/' // 后端接口
-// const baseUrl = 'http://127.0.0.1:8081/' // 后端接口
-const baseUrl = 'http://173.18.12.205:8081/' // 后端接口
+const baseUrl = 'http://127.0.0.1:8081/' // 后端接口
+// const baseUrl = 'http://173.18.12.205:8081/' // 后端接口
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口