初步完成代碼生成的版本

src/api/sample/sampleExperiment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询解读管理列表
+export function listSampleExperiment(query) {
+  return request({
+    url: '/sample/sampleExperiment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询解读管理详细
+export function getSampleExperiment(id) {
+  return request({
+    url: '/sample/sampleExperiment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增解读管理
+export function addSampleExperiment(data) {
+  return request({
+    url: '/sample/sampleExperiment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改解读管理
+export function updateSampleExperiment(data) {
+  return request({
+    url: '/sample/sampleExperiment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除解读管理
+export function delSampleExperiment(id) {
+  return request({
+    url: '/sample/sampleExperiment/' + id,
+    method: 'delete'
+  })
+}

src/api/system/area.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询世界国家区域列表
+// 查询全球地区库列表
 export function listArea(query) {
   return request({
     url: '/system/area/list',
@@ -9,7 +9,7 @@ export function listArea(query) {
   })
 }
 
-// 查询世界国家区域详细
+// 查询全球地区库详细
 export function getArea(areaId) {
   return request({
     url: '/system/area/' + areaId,
@@ -17,7 +17,7 @@ export function getArea(areaId) {
   })
 }
 
-// 新增世界国家区域
+// 新增全球地区库
 export function addArea(data) {
   return request({
     url: '/system/area',
@@ -26,7 +26,7 @@ export function addArea(data) {
   })
 }
 
-// 修改世界国家区域
+// 修改全球地区库
 export function updateArea(data) {
   return request({
     url: '/system/area',
@@ -35,7 +35,7 @@ export function updateArea(data) {
   })
 }
 
-// 删除世界国家区域
+// 删除全球地区库
 export function delArea(areaId) {
   return request({
     url: '/system/area/' + areaId,

src/views/sample/sampleExperiment/index.vue

@@ -0,0 +1,308 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="样品编号" prop="sampleInfoId">
+        <el-input
+          v-model="queryParams.sampleInfoId"
+          placeholder="请输入样品编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in dict.type.buss_read_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="解读&作废时间" prop="dealTime">
+        <el-date-picker clearable
+          v-model="queryParams.dealTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择解读&作废时间">
+        </el-date-picker>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['sample:sampleExperiment:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['sample:sampleExperiment:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['sample:sampleExperiment:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['sample:sampleExperiment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="sampleExperimentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="实验编号" align="center" prop="id" />
+      <el-table-column label="样品编号" align="center" prop="sampleInfoId" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.buss_read_type" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="解读&作废时间" align="center" prop="dealTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.dealTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['sample:sampleExperiment:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['sample:sampleExperiment:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改解读管理对话框 -->
+    <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="sampleInfoId">
+          <el-input v-model="form.sampleInfoId" placeholder="请输入样品编号" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option
+              v-for="dict in dict.type.buss_read_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="解读&作废时间" prop="dealTime">
+          <el-date-picker clearable
+            v-model="form.dealTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择解读&作废时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSampleExperiment, getSampleExperiment, delSampleExperiment, addSampleExperiment, updateSampleExperiment } from "@/api/sample/sampleExperiment"
+
+export default {
+  name: "SampleExperiment",
+  dicts: ['buss_read_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 解读管理表格数据
+      sampleExperimentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sampleInfoId: null,
+        status: null,
+        dealTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        sampleInfoId: [
+          { required: true, message: "样品编号不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询解读管理列表 */
+    getList() {
+      this.loading = true
+      listSampleExperiment(this.queryParams).then(response => {
+        this.sampleExperimentList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        sampleInfoId: null,
+        status: null,
+        dealTime: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加解读管理"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getSampleExperiment(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改解读管理"
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSampleExperiment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addSampleExperiment(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除解读管理编号为"' + ids + '"的数据项？').then(function() {
+        return delSampleExperiment(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('sample/sampleExperiment/export', {
+        ...this.queryParams
+      }, `sampleExperiment_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>

src/views/sample/sampleInfo/index.vue

@@ -1,14 +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-item label="实验编号" prop="experimentId">
-        <el-input
-          v-model="queryParams.experimentId"
-          placeholder="请输入实验编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="患者编号" prop="patientId">
         <el-input
           v-model="queryParams.patientId"
@@ -33,18 +25,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="送检医院" prop="sampleHospitalId">
+      <el-form-item label="送检医院编号" prop="sampleHospitalId">
         <el-input
           v-model="queryParams.sampleHospitalId"
-          placeholder="请输入送检医院"
+          placeholder="请输入送检医院编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="送检科室" prop="sampleDeptId">
+      <el-form-item label="送检科室编号" prop="sampleDeptId">
         <el-input
           v-model="queryParams.sampleDeptId"
-          placeholder="请输入送检科室"
+          placeholder="请输入送检科室编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -112,12 +104,11 @@
     <el-table v-loading="loading" :data="sampleInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="实验编号" align="center" prop="experimentId" />
       <el-table-column label="患者编号" align="center" prop="patientId" />
       <el-table-column label="患者电话" align="center" prop="patientPhone" />
       <el-table-column label="样本类型" align="center" prop="sampleTypeId" />
-      <el-table-column label="送检医院" align="center" prop="sampleHospitalId" />
-      <el-table-column label="送检科室" align="center" prop="sampleDeptId" />
+      <el-table-column label="送检医院编号" align="center" prop="sampleHospitalId" />
+      <el-table-column label="送检科室编号" align="center" prop="sampleDeptId" />
       <el-table-column label="医生名字" align="center" prop="doctorName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -151,9 +142,6 @@
     <!-- 添加或修改样品管理对话框 -->
     <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="experimentId">
-          <el-input v-model="form.experimentId" placeholder="请输入实验编号" />
-        </el-form-item>
         <el-form-item label="患者编号" prop="patientId">
           <el-input v-model="form.patientId" placeholder="请输入患者编号" />
         </el-form-item>
@@ -163,11 +151,11 @@
         <el-form-item label="样本类型" prop="sampleTypeId">
           <el-input v-model="form.sampleTypeId" placeholder="请输入样本类型" />
         </el-form-item>
-        <el-form-item label="送检医院" prop="sampleHospitalId">
-          <el-input v-model="form.sampleHospitalId" placeholder="请输入送检医院" />
+        <el-form-item label="送检医院编号" prop="sampleHospitalId">
+          <el-input v-model="form.sampleHospitalId" placeholder="请输入送检医院编号" />
         </el-form-item>
-        <el-form-item label="送检科室" prop="sampleDeptId">
-          <el-input v-model="form.sampleDeptId" placeholder="请输入送检科室" />
+        <el-form-item label="送检科室编号" prop="sampleDeptId">
+          <el-input v-model="form.sampleDeptId" placeholder="请输入送检科室编号" />
         </el-form-item>
         <el-form-item label="医生名字" prop="doctorName">
           <el-input v-model="form.doctorName" placeholder="请输入医生名字" />
@@ -213,7 +201,6 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        experimentId: null,
         patientId: null,
         patientPhone: null,
         sampleTypeId: null,
@@ -250,7 +237,6 @@ export default {
     reset() {
       this.form = {
         id: null,
-        experimentId: null,
         patientId: null,
         patientPhone: null,
         sampleTypeId: null,

src/views/sample/samplePatient/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="样品编号" prop="sampleInfoId">
+      <el-form-item label="病案号" prop="bahCode">
         <el-input
-          v-model="queryParams.sampleInfoId"
-          placeholder="请输入样品编号"
+          v-model="queryParams.bahCode"
+          placeholder="请输入病案号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,13 +17,23 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="出生年份" prop="birth">
-        <el-date-picker clearable
+      <el-form-item label="出生年份(换算年龄)" prop="birth">
+        <el-input
           v-model="queryParams.birth"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择出生年份">
-        </el-date-picker>
+          placeholder="请输入出生年份(换算年龄)"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_user_sex"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="地址" prop="address">
         <el-input
@@ -568,14 +578,14 @@
     <el-table v-loading="loading" :data="samplePatientList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="样品编号" align="center" prop="sampleInfoId" />
+      <el-table-column label="病案号" align="center" prop="bahCode" />
       <el-table-column label="姓名" align="center" prop="name" />
-      <el-table-column label="出生年份" align="center" prop="birth" width="180">
+      <el-table-column label="出生年份(换算年龄)" align="center" prop="birth" />
+      <el-table-column label="性别" align="center" prop="sex">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birth, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
         </template>
       </el-table-column>
-      <el-table-column label="性别" align="center" prop="sex" />
       <el-table-column label="地址" align="center" prop="address" />
       <el-table-column label="既往健康" align="center" prop="baseJwjk" />
       <el-table-column label="心血管病变" align="center" prop="baseXxgbb" />
@@ -669,19 +679,24 @@
     <!-- 添加或修改样品患者信息对话框 -->
     <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="sampleInfoId">
-          <el-input v-model="form.sampleInfoId" placeholder="请输入样品编号" />
+        <el-form-item label="病案号" prop="bahCode">
+          <el-input v-model="form.bahCode" placeholder="请输入病案号" />
         </el-form-item>
         <el-form-item label="姓名" prop="name">
           <el-input v-model="form.name" placeholder="请输入姓名" />
         </el-form-item>
-        <el-form-item label="出生年份" prop="birth">
-          <el-date-picker clearable
-            v-model="form.birth"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择出生年份">
-          </el-date-picker>
+        <el-form-item label="出生年份(换算年龄)" prop="birth">
+          <el-input v-model="form.birth" placeholder="请输入出生年份(换算年龄)" />
+        </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-select v-model="form.sex" placeholder="请选择性别">
+            <el-option
+              v-for="dict in dict.type.sys_user_sex"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="地址" prop="address">
           <el-input v-model="form.address" placeholder="请输入地址" />
@@ -883,6 +898,7 @@ import { listSamplePatient, getSamplePatient, delSamplePatient, addSamplePatient
 
 export default {
   name: "SamplePatient",
+  dicts: ['sys_user_sex'],
   data() {
     return {
       // 遮罩层
@@ -907,7 +923,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        sampleInfoId: null,
+        bahCode: null,
         name: null,
         birth: null,
         sex: null,
@@ -1002,7 +1018,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        sampleInfoId: null,
+        bahCode: null,
         name: null,
         birth: null,
         sex: null,

src/views/system/area/index.vue

@@ -1,14 +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-item label="路径" prop="path">
-        <el-input
-          v-model="queryParams.path"
-          placeholder="请输入路径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="中文名称" prop="areaName">
         <el-input
           v-model="queryParams.areaName"
@@ -17,26 +9,18 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="英文名称" prop="nameEn">
-        <el-input
-          v-model="queryParams.nameEn"
-          placeholder="请输入英文名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="中文拼音" prop="namePinyin">
+      <el-form-item label="维度" prop="lat">
         <el-input
-          v-model="queryParams.namePinyin"
-          placeholder="请输入中文拼音"
+          v-model="queryParams.lat"
+          placeholder="请输入维度"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="代码" prop="code">
+      <el-form-item label="经度" prop="lng">
         <el-input
-          v-model="queryParams.code"
-          placeholder="请输入代码"
+          v-model="queryParams.lng"
+          placeholder="请输入经度"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -95,14 +79,12 @@
 
     <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="areaId" />
-      <el-table-column label="父编号" align="center" prop="areaParentId" />
-      <el-table-column label="路径" align="center" prop="path" />
+      <el-table-column label="主键" align="center" prop="areaId" />
+      <el-table-column label="父ID" align="center" prop="areaParentId" />
       <el-table-column label="层级" align="center" prop="areaDeep" />
       <el-table-column label="中文名称" align="center" prop="areaName" />
-      <el-table-column label="英文名称" align="center" prop="nameEn" />
-      <el-table-column label="中文拼音" align="center" prop="namePinyin" />
-      <el-table-column label="代码" align="center" prop="code" />
+      <el-table-column label="维度" align="center" prop="lat" />
+      <el-table-column label="经度" align="center" prop="lng" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -131,23 +113,17 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改世界国家区域对话框 -->
+    <!-- 添加或修改全球地区库对话框 -->
     <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="path">
-          <el-input v-model="form.path" placeholder="请输入路径" />
-        </el-form-item>
         <el-form-item label="中文名称" prop="areaName">
           <el-input v-model="form.areaName" placeholder="请输入中文名称" />
         </el-form-item>
-        <el-form-item label="英文名称" prop="nameEn">
-          <el-input v-model="form.nameEn" placeholder="请输入英文名称" />
-        </el-form-item>
-        <el-form-item label="中文拼音" prop="namePinyin">
-          <el-input v-model="form.namePinyin" placeholder="请输入中文拼音" />
+        <el-form-item label="维度" prop="lat">
+          <el-input v-model="form.lat" placeholder="请输入维度" />
         </el-form-item>
-        <el-form-item label="代码" prop="code">
-          <el-input v-model="form.code" placeholder="请输入代码" />
+        <el-form-item label="经度" prop="lng">
+          <el-input v-model="form.lng" placeholder="请输入经度" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -177,7 +153,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 世界国家区域表格数据
+      // 全球地区库表格数据
       areaList: [],
       // 弹出层标题
       title: "",
@@ -188,12 +164,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
         areaParentId: null,
-        path: null,
         areaDeep: null,
         areaName: null,
-        nameEn: null,
-        namePinyin: null,
-        code: null
+        lat: null,
+        lng: null
       },
       // 表单参数
       form: {},
@@ -206,7 +180,7 @@ export default {
     this.getList()
   },
   methods: {
-    /** 查询世界国家区域列表 */
+    /** 查询全球地区库列表 */
     getList() {
       this.loading = true
       listArea(this.queryParams).then(response => {
@@ -225,12 +199,10 @@ export default {
       this.form = {
         areaId: null,
         areaParentId: null,
-        path: null,
         areaDeep: null,
         areaName: null,
-        nameEn: null,
-        namePinyin: null,
-        code: null
+        lat: null,
+        lng: null
       }
       this.resetForm("form")
     },
@@ -254,7 +226,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加世界国家区域"
+      this.title = "添加全球地区库"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -263,7 +235,7 @@ export default {
       getArea(areaId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改世界国家区域"
+        this.title = "修改全球地区库"
       })
     },
     /** 提交按钮 */
@@ -289,7 +261,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const areaIds = row.areaId || this.ids
-      this.$modal.confirm('是否确认删除世界国家区域编号为"' + areaIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除全球地区库编号为"' + areaIds + '"的数据项？').then(function() {
         return delArea(areaIds)
       }).then(() => {
         this.getList()

src/views/system/role/index.vue

@@ -10,15 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入权限字符"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -101,7 +93,6 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
       <el-table-column label="状态" align="center" width="100">
         <template slot-scope="scope">
@@ -161,15 +152,6 @@
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
-        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
         </el-form-item>
@@ -213,9 +195,7 @@
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
         </el-form-item>
-        <el-form-item label="权限字符">
-          <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
+        
         <el-form-item label="权限范围">
           <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
             <el-option
@@ -332,9 +312,6 @@ export default {
         roleName: [
           { required: true, message: "角色名称不能为空", trigger: "blur" }
         ],
-        roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
-        ],
         roleSort: [
           { required: true, message: "角色顺序不能为空", trigger: "blur" }
         ]

src/views/system/user/authRole.vue

@@ -26,7 +26,6 @@
       <el-table-column type="selection" :reserve-selection="true" :selectable="checkSelectable" width="55" />
       <el-table-column label="角色编号" align="center" prop="roleId" />
       <el-table-column label="角色名称" align="center" prop="roleName" />
-      <el-table-column label="权限字符" align="center" prop="roleKey" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/system/user/index.vue

@@ -217,8 +217,6 @@ export default {
       open: false,
       // 机构&科室
       deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
       // 日期范围
       dateRange: [],
       // 角色选项
@@ -296,9 +294,6 @@ export default {
   created() {
     this.getList()
     this.getDeptTree()
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg
-    })
   },
   methods: {
     /** 查询用户列表 */
@@ -410,7 +405,6 @@ export default {
         this.roleOptions = response.roles
         this.open = true
         this.title = "添加用户"
-        this.form.password = this.initPassword
       })
     },
     /** 修改按钮操作 */

vue.config.js

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