wangmengwei 2 년 전
부모
커밋
6d7a0ec404

+ 2 - 2
ruoyi-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 重点人群核酸比对检测系统
+VUE_APP_TITLE = 潜山市重点人群周期性核酸检测平台
 
 # 开发环境配置
 ENV = 'development'
 
-# 重点人群核酸比对检测系统/开发环境
+# 潜山市重点人群周期性核酸检测平台/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

+ 2 - 2
ruoyi-ui/.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 重点人群核酸比对检测系统
+VUE_APP_TITLE = 潜山市重点人群周期性核酸检测平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 重点人群核酸比对检测系统/生产环境
+# 潜山市重点人群周期性核酸检测平台/生产环境
 VUE_APP_BASE_API = '/prod-api'

+ 2 - 2
ruoyi-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 重点人群核酸比对检测系统
+VUE_APP_TITLE = 潜山市重点人群周期性核酸检测平台
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 重点人群核酸比对检测系统/测试环境
+# 潜山市重点人群周期性核酸检测平台/测试环境
 VUE_APP_BASE_API = '/stage-api'

+ 1 - 1
ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.3",
-  "description": "重点人群核酸比对检测系统",
+  "description": "潜山市重点人群周期性核酸检测平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {

BIN
ruoyi-ui/public/favicon.ico


+ 2 - 1
ruoyi-ui/public/index.html

@@ -118,7 +118,8 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #7171C6;
+      /* background: #7171C6; */
+	  background-image: linear-gradient(#1de4ae,#01b6fc);
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);

+ 1 - 1
ruoyi-ui/src/api/system/batch.js

@@ -47,7 +47,7 @@ export function updateInfo(data) {
 // 删除导入人员信息
 export function delInfo(id) {
   return request({
-    url: '/system/info/' + id,
+    url: '/system/info/one/' + id,
     method: 'delete'
   })
 }

+ 44 - 0
ruoyi-ui/src/api/system/ryxx.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询重点人群信息列表
+export function listInfo(query) {
+  return request({
+    url: '/keyPeople/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询重点人群信息详细
+export function getInfo(id) {
+  return request({
+    url: '/keyPeople/info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增重点人群信息
+export function addInfo(data) {
+  return request({
+    url: '/keyPeople/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改重点人群信息
+export function updateInfo(data) {
+  return request({
+    url: '/keyPeople/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除重点人群信息
+export function delInfo(id) {
+  return request({
+    url: '/keyPeople/info/' + id,
+    method: 'delete'
+  })
+}

+ 3 - 7
ruoyi-ui/src/views/key/batch/index.vue

@@ -90,11 +90,6 @@
           </el-col>
         </el-col>
 
-
-
-
-
-
       </el-row>
 
 
@@ -378,6 +373,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      console.log(this.ids)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -420,10 +416,10 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除导入人员信息编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除信息').then(function() {
         return delInfo(ids);
       }).then(() => {
-        this.getList();
+        this.getLisths();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },

+ 31 - 1
ruoyi-ui/src/views/key/groups/index.vue

@@ -124,9 +124,24 @@
             </el-select>
             </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item :label="'次' + '\u3000\u3000' + '数'" prop="detectionNumber">
+           <el-input
+             v-model="queryParams.detectionNumber"
+             placeholder="请输入次数"
+            style="width: 108%;"
+               min="0"
+              type="number"
+              @blur="nhkse"
+              @keyup.enter.native="handleQuery"
+           />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
            <el-form-item class="nkseydf">
-             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+             <!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> -->
+             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys">搜索</el-button>
+             <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-col>
@@ -170,6 +185,17 @@
           v-hasPermi="['system:info:export']"
         >导出</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="['system:config:remove']"
+        >删除</el-button>
+      </el-col> -->
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
@@ -512,6 +538,10 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    handleQuerys() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");

+ 210 - 271
ruoyi-ui/src/views/key/ryxx/index.vue

@@ -1,128 +1,69 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :rules="rules" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-row>
-        <el-col :span="8">  
-          <el-form-item label="身份证号" prop="idCard">
-            <el-input
-              v-model="queryParams.idCard"
-              placeholder="请输入身份证号码"
-              style="width: 108%;"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="开始时间" prop="startTime">
-            <el-date-picker clearable
-              v-model="queryParams.startTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss"
-              style="width: 100%;"
-              placeholder="请选择比对开始时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="结束时间" prop="endTime">
-            <el-date-picker clearable
-              v-model="queryParams.endTime"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss"
-              style="width: 100%;"
-              placeholder="请选择比对结束时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-
-
-        <!-- <el-col :span="8">
-          <el-form-item label="采集时间" prop="nucleicCollectTime">
-                      <el-date-picker clearable
-                        v-model="queryParams.nucleicCollectTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        format="yyyy-MM-dd HH:mm:ss"
-                        style="width: 100%;"
-                        placeholder="请选择核酸采集时间">
-                      </el-date-picker>
-                    </el-form-item>
-
-        </el-col> -->
-        <!-- <el-col :span="8">
-          <el-form-item :label="'天' + '\u3000\u3000' + '数'" prop="detectionScope">
-            <el-input
-              v-model="queryParams.detectionScope"
-              placeholder="请输入天数"
-                min="0"
-               type="number"
-               @blur="nhksets"
-               style="width: 108%;"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-        </el-col> -->
-
-        <el-col :span="24">
-          <el-col :span="8">
-            <el-form-item :label="'次' + '\u3000\u3000' + '数'" prop="detectionNumber">
-             <el-input
-               v-model="queryParams.detectionNumber"
-               placeholder="请输入次数"
-               style="width: 114%;"
-                 min="0"
-                type="number"
-                @blur="nhkse"
-                @keyup.enter.native="handleQuery"
-             />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-             <el-form-item class="nkseydf">
-               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys">搜索</el-button>
-               <!-- <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-col>
-        </el-col>
-
-
-
-
-
-
-      </el-row>
-
-
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="idCard">
+        <el-input
+          v-model="queryParams.idCard"
+          placeholder="请输入身份证号码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系号码" prop="phoneNum">
+        <el-input
+          v-model="queryParams.phoneNum"
+          placeholder="请输入联系号码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item class="nkseydf">
+         <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="18">
-        <div style="color: #343434; font-size: 20px;">截至 <span style="color: #00b385;">{{gettime}}</span> 止   共计 <span style="color: #00b385;">{{nskeia}}</span> 次核酸</div>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="primary"
           plain
-          icon="el-icon-download"
+          icon="el-icon-plus"
           size="mini"
-          @click="importTemplate"
-        >下载模板</el-button>
+          @click="handleAdd"
+          v-hasPermi="['keyPeople:info: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="['keyPeople:info: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="['keyPeople:info:remove']"
+        >删除</el-button>
       </el-col>
-     <el-col :span="1.5">
-       <el-button
-         type="info"
-         plain
-         icon="el-icon-upload2"
-         size="mini"
-         @click="handleImport"
-         v-hasPermi="['system:info:import']"
-       >导入</el-button>
-     </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -130,68 +71,118 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:info:export']"
+          v-hasPermi="['keyPeople:info:export']"
         >导出</el-button>
       </el-col>
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['keyPeople:info:import']"
+        >导入</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" v-if="mjue" :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column :fixed="rigs" label="姓名" align="center" prop="name"  width="110"/>
-      <el-table-column :fixed="rigs" label="身份证号码" align="center" prop="idCard" width="180"/>
-      <el-table-column label="联系号码" align="center" prop="phoneNum" width="110"/>
-      <el-table-column label="核酸采集时间" align="center" prop="nucleicCollectTime" width="157">
-        <template slot-scope="scope">
-          <span v-html="scope.row.nucleicCollectTime"></span>
-        </template>
-      </el-table-column>
-      <el-table-column label="核酸结果时间" align="center" prop="nucleicResultsTime" width="157">
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" :height="tableMaxHeight">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="身份证号码" align="center" prop="idCard" />
+      <el-table-column label="联系号码" align="center" prop="phoneNum" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <span v-html="scope.row.nucleicResultsTime"></span>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:info:remove']"
+          >删除</el-button>
         </template>
       </el-table-column>
-      <el-table-column  label="采集地点"  align="center" width="117">
-        <template slot-scope="scope">
-            <span v-html="scope.row.collectPlace"></span>
-          </template>
-      </el-table-column>
-      <el-table-column  label="采集结果"  align="center" width="117">
-        <template slot-scope="scope">
-            <span v-html="scope.row.nucleicResults"></span>
-          </template>
-      </el-table-column>
-      <!-- <el-table-column label="职业类别" align="center" prop="jobStyle" width="137"/> -->
-      <!-- <el-table-column label="重点人群分类" align="center" prop="focusCrowdStyle" width="130"/> -->
-      <el-table-column label="检测频次(次/天)" align="center" prop="detectionFrequency" width="115"/>
-      <el-table-column label="比对开始时间" align="center" prop="startTime" width="157">
-        <template slot-scope="scope">
-          <span>{{ scope.row.startTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="比对结束时间" align="center" prop="endTime" width="157">
-        <template slot-scope="scope">
-          <span>{{ scope.row.endTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :fixed="rig" label="进度(已做核酸次数/频次)" align="center" prop="detectionProgress" width="165"/>
-      <el-table-column  :fixed="rig" label="是否异常" align="center" prop="detectionResult" >
-        <template slot-scope="scope">
-            <span :class="[scope.row.detectionResult == '正常' ? 'heade_codfr' : 'lndw']">{{ scope.row.detectionResult}}</span>
-          </template>
-        </el-table-column>
     </el-table>
-    <div v-if="!mjue" style="text-align: center;">正在加载数据......</div>
 
+    <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="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="身份证号" prop="idCard">
+          <el-input v-model="form.idCard" placeholder="请输入身份证号码" />
+        </el-form-item>
+        <el-form-item label="联系号码" prop="phoneNum">
+          <el-input v-model="form.phoneNum" placeholder="请输入联系号码" />
+        </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>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="600px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        :data="{focusCrowdStyle:upload.focusCrowdStyle,jobStyle:upload.jobStyle,startTime:upload.startTime,endTime:upload.endTime,detectionNumber:upload.detectionNumber,detectionScope:upload.detectionScope}"
+        drag
+        class="nhkiu"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处,或<em style="color: #00b385;">点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+           <!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 -->
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline; color: #00b385;" @click="importTemplate">下载模板</el-link>
+          <div v-if="nlsmeh" style="font-size:16px;vertical-align: baseline; color: red;margin-top: 10px;">正在导入中,请稍后,请勿进行操作......</div>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="nlmse">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo,listInfohs } from "@/api/system/batch";
+import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/system/ryxx";
 import { getToken } from "@/utils/auth";
 export default {
-  dicts: ['occupational_category', 'classification_population','whether_abnormal'],
   name: "Info",
+  dicts: ['occupational_category', 'classification_population','whether_abnormal'],
   data() {
     return {
       // 遮罩层
@@ -206,7 +197,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 导入人员信息表格数据
+      // 重点人群信息表格数据
       infoList: [],
       // 弹出层标题
       title: "",
@@ -219,33 +210,27 @@ export default {
         name: null,
         idCard: null,
         phoneNum: null,
-        nucleicCollectTime: null,
-        nucleicResultsTime: null,
-        jobStyle: null,
-        focusCrowdStyle: null,
-        detectionFrequency: null,
-        startTime: null,
-        endTime: null,
       },
       // 表单参数
       form: {},
+      tableMaxHeight:300,
       // 表单校验
       rules: {
-        // startTime: [
-        //   { required: true, message: "开始时间不能为空", trigger: "blur" }
-        // ],
-        // endTime:[
-        //   { required: true, message: "结束时间不能为空", trigger: "blur" }
-        // ],
-        // detectionNumber:[
-        //   { required: true, message: "次数不能为空", trigger: "blur" }
-        // ],
-        // detectionScope:[
-        //   { required: true, message: "天数不能为空", trigger: "blur" }
-        // ],
-        // idCard:[
-        //   { required: true, message: "身份证不能为空", trigger: "blur" }
-        // ]
+        name: [
+          { required: true, message: "姓名不能为空", trigger: "blur" }
+        ],
+        idCard:[
+          { pattern: /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+          message: "请输入正确的身份证号",
+          trigger: "blur" }
+        ],
+        phoneNum:[
+          {pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+          message: "请输入正确的手机号码",
+          trigger: "blur"}
+
+        ],
+
       },
       // 用户导入参数
       upload: {
@@ -266,22 +251,13 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/info/importData"
+        url: process.env.VUE_APP_BASE_API + "/keyPeople/info//importData"
       },
-      postOptions:[],
-      gettime:'',
-      nskeia:'',
-      mjue:true,
-      rig:'right',
-      rigs:'left',
-      tableMaxHeight:300,
+      nlsmeh:false
     };
   },
   created() {
-    // this.getList();
-    // this.getCurrentTime()
-    this.getLisths()
-    this.loading = false;
+    this.getList();
     window.onresize = () => {
                     this.changeTableMaxHeight()
                   }
@@ -294,26 +270,12 @@ export default {
                   this.changeTableMaxHeight()
   },
   methods: {
-    /** 查询导入人员信息列表 */
+    /** 查询重点人群信息列表 */
     getList() {
       this.loading = true;
-      this.mjue = false
       listInfo(this.queryParams).then(response => {
-        this.infoList = response.data;
-        this.mjue = true
-        // this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /** 查询总核酸次数 */
-    getLisths() {
-      // this.loading = true;
-      this.loading = true;
-      this.mjue = false
-      listInfohs(this.queryParams).then(response => {
         this.infoList = response.rows;
-        this.mjue = true
-        // this.total = response.total;
+        this.total = response.total;
         this.loading = false;
       });
     },
@@ -327,20 +289,9 @@ export default {
       this.form = {
         id: null,
         name: null,
-        gender: null,
-        age: null,
         idCard: null,
         phoneNum: null,
-        nucleicCollectTime: null,
-        nucleicResultsTime: null,
-        jobStyle: null,
-        focusCrowdStyle: null,
-        detectionFrequency: null,
-        detectionNumber: null,
-        detectionScope: null,
-        deptName: null,
-        startTime: null,
-        endTime: null,
+        deptId: null,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -349,20 +300,15 @@ export default {
       };
       this.resetForm("form");
     },
-    /** 对比按钮操作 */
+    /** 搜索按钮操作 */
     handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-    },
-    // 搜索
-    handleQuerys(){
-          this.queryParams.pageNum = 1;
-          this.getLisths();
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.handleQuerys();
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -374,7 +320,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加导入人员信息";
+      this.title = "添加重点人群信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -383,7 +329,7 @@ export default {
       getInfo(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改导入人员信息";
+        this.title = "修改重点人群信息";
       });
     },
     /** 提交按钮 */
@@ -409,7 +355,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除导入人员信息编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除信息?').then(function() {
         return delInfo(ids);
       }).then(() => {
         this.getList();
@@ -429,24 +375,29 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      window.open("https://yqfk.qs163.cn/moban/模板.xlsx")
+      window.open("https://yqfk.qs163.cn/muban/muban.xlsx")
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
+      this.nlsmeh = true
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.upload.detectionNumber = null
-      this.upload.startTime=null
-      this.upload.endTime= null
-      this.upload.jobStyle= null
-      this.upload.focusCrowdStyle= null
+      // if(response.code == 200){
+        this.nlsmeh = false
+        this.upload.open = false;
+        this.upload.isUploading = false;
+        this.$refs.upload.clearFiles();
+        this.upload.detectionNumber = null
+        this.upload.startTime=null
+        this.upload.endTime= null
+        this.upload.jobStyle= null
+        this.upload.focusCrowdStyle= null
+
+      // }
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
+       this.getList();
     },
     // 提交上传文件
     submitFileForm() {
@@ -478,37 +429,25 @@ export default {
       this.upload.jobStyle= null
       this.upload.focusCrowdStyle= null
     },
-    getCurrentTime() {
-           //获取当前时间并打印
-           var _this = this;
-           console.log(3)
-         let yy = new Date().getFullYear();
-         let mm = new Date().getMonth()+1;
-         let dd = new Date().getDate();
-         let hh = new Date().getHours();
-         let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
-         let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
-         _this.gettime = yy+'-'+mm+'-'+dd;
-         console.log(_this.gettime)
-       },
-       // 获取屏幕高度
-                 showFilterForm () {
-                       this.filterActive = !this.filterActive
-                       this.changeTableMaxHeight()
-                     },
+    // 获取屏幕高度
+              showFilterForm () {
+                    this.filterActive = !this.filterActive
+                    this.changeTableMaxHeight()
+                  },
 
-                     changeTableMaxHeight () {
-                       let height = document.body.offsetHeight // 网页可视区域高度
-                       // if (this.filterActive) {
-                       //   this.tableMaxHeight = height - 320
-                       // } else {
-                         this.tableMaxHeight = height - 380
-                       // }
-                       console.log(height)
-                     },
+                  changeTableMaxHeight () {
+                    let height = document.body.offsetHeight // 网页可视区域高度
+                    // if (this.filterActive) {
+                    //   this.tableMaxHeight = height - 320
+                    // } else {
+                      this.tableMaxHeight = height - 280
+                    // }
+                    console.log(height)
+                  },
   }
 };
 </script>
+
 <style type="text/css" lang="scss">
 .nhkiu{
   .el-upload-dragger{

+ 1 - 1
ruoyi-ui/vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '重点人群核酸比对检测系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '潜山市重点人群周期性核酸检测平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口