修改

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

@@ -23,7 +23,6 @@ export function importTemplate(params) {
     url: '/system/yxry/importTemplate',
     method: 'post',
     responseType: 'blob',
-    timeout: 30 * 1000,
     params
   })
 }
@@ -34,7 +33,6 @@ export function importExcel(data) {
     url: '/system/yxry/importData',
     method: 'post',
     responseType: 'blob',
-    timeout: 30 * 1000,
     data
   })
 }

ruoyi-ui/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 30000
 })
 
 // request拦截器

ruoyi-ui/src/views/system/hscj/index.vue

@@ -42,12 +42,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="小区/村名称" prop="community">
-        <el-input
-          v-model="queryParams.community"
-          placeholder="请输入小区/村名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select clearable v-model="queryParams.community" placeholder="请选择小区/村名称">
+          <el-option
+            v-for="dict in cunList"
+            :key="dict.code"
+            :label="dict.name"
+            :value="dict.code"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="采集地点" prop="cjPlace">
         <el-input

ruoyi-ui/src/views/system/ycsb/index.vue

@@ -55,12 +55,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="小区/村名称" prop="community">
-        <el-input
-          v-model="queryParams.community"
-          placeholder="请输入小区/村名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select clearable v-model="queryParams.community" placeholder="请选择小区/村名称">
+          <el-option
+            v-for="dict in cunList"
+            :key="dict.code"
+            :label="dict.name"
+            :value="dict.code"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="单元号" prop="unit">
         <el-input
@@ -71,12 +73,14 @@
         />
       </el-form-item>
       <el-form-item label="是否做核酸" prop="hasAcid">
-        <el-input
-          v-model="queryParams.hasAcid"
-          placeholder="请输入是否做核酸"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select clearable v-model="queryParams.hasAcid" placeholder="请选择是否做核酸">
+          <el-option
+            v-for="dict in hasAcidOptions"
+            :key="dict.code"
+            :label="dict.name"
+            :value="dict.code"
+          ></el-option>
+        </el-select>
       </el-form-item>
 <!--      <el-form-item label="状态" prop="status">-->
 <!--        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>-->
@@ -712,6 +716,10 @@ export default {
         hasAcid: null,
         status: null,
       },
+      hasAcidOptions: [
+        {code: '0', name: '是'},
+        {code: '1', name: '否'}
+      ],
       // 表单参数
       form: {},
       // 表单校验