批量对比修改

ruoyi-ui/src/api/system/info.js

@@ -51,3 +51,12 @@ export function delInfo(id) {
     method: 'delete'
   })
 }
+
+// 核对批量核酸结果
+export function dataInfo(query) {
+  return request({
+    url: '/system/info/date',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/views/key/groups/index.vue

@@ -140,8 +140,8 @@
         <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="handleQuerys">搜索</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="handleQuery">搜索</el-button>
+             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys">对比</el-button>
              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
            </el-form-item>
         </el-col>
@@ -223,7 +223,7 @@
             <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="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">
@@ -235,7 +235,7 @@
         <template slot-scope="scope">
           <span>{{ scope.row.endTime}}</span>
         </template>
-      </el-table-column>
+      </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">
@@ -377,7 +377,7 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo,listInfohs } from "@/api/system/info";
+import { listInfo, getInfo, delInfo, addInfo, updateInfo,listInfohs,dataInfo } from "@/api/system/info";
 import { getToken } from "@/utils/auth";
 export default {
   dicts: ['occupational_category', 'classification_population','whether_abnormal'],
@@ -492,6 +492,17 @@ export default {
         this.loading = false;
       });
     },
+    /** 核对批量核酸结果 */
+    getdataLisths() {
+      this.loading = true;
+      dataInfo(this.queryParams).then(response => {
+        // 弹框
+        this.loading = false;
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "对比结果", { dangerouslyUseHTMLString: true });
+      }).catch(res=>{
+         this.loading = false;
+      });
+    },
     /** 查询总核酸次数 */
     getLisths() {
       // this.loading = true;
@@ -538,9 +549,10 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    /** 对比按钮操作 */
     handleQuerys() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.getdataLisths();
     },
     /** 重置按钮操作 */
     resetQuery() {

ruoyi-ui/src/views/key/ryxx/index.vue

@@ -64,7 +64,7 @@
           v-hasPermi="['keyPeople:info:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+     <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -73,7 +73,7 @@
           @click="handleExport"
           v-hasPermi="['keyPeople:info:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -84,6 +84,15 @@
           v-hasPermi="['keyPeople:info:import']"
         >导入</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="importTemplate"
+        >下载模板</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -92,7 +101,7 @@
       <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" prop="remark" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -133,9 +142,9 @@
         <el-form-item label="联系号码" prop="phoneNum">
           <el-input v-model="form.phoneNum" placeholder="请输入联系号码" />
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <!-- <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -220,12 +229,14 @@ export default {
           { 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]$/,
+          { required: true,
+            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}$/,
+          {required: true,
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
           message: "请输入正确的手机号码",
           trigger: "blur"}
 
@@ -375,7 +386,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      window.open("https://yqfk.qs163.cn/muban/muban.xlsx")
+      window.open("https://yqfk.qs163.cn/muban/user.xlsx")
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -401,11 +412,7 @@ export default {
     },
     // 提交上传文件
     submitFileForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.$refs.upload.submit();
-        }
-      });
+       this.$refs.upload.submit();
     },
     // 次数失去焦点事件
     nhkse(value){
@@ -442,7 +449,7 @@ export default {
                     // } else {
                       this.tableMaxHeight = height - 280
                     // }
-                    console.log(height)
+                    // console.log(height)
                   },
   }
 };