Merge branch 'master'

src/views/GATHER/index.vue

@@ -1,11 +1,28 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="数据类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择数据类型" clearable filterable class="se">
-          <el-option v-for="dict in typeList" :key="dict.value + 'typeList'" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+    >
+<!--      <el-form-item label="数据类型" prop="type">-->
+<!--        <el-select-->
+<!--          v-model="queryParams.type"-->
+<!--          placeholder="请选择数据类型"-->
+<!--          clearable-->
+<!--          filterable-->
+<!--          class="se"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="dict in typeList"-->
+<!--            :key="dict.value + 'typeList'"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="采集状态" prop="collStatus">
         <el-select v-model="queryParams.collStatus" placeholder="请选择采集状态" clearable filterable class="se">
           <el-option v-for="dict in collStatus" :key="dict.value + 'collStatus'" :label="dict.label"
@@ -196,13 +213,34 @@
       @pagination="getList" />
 
     <!-- 上传文件对话框  历史数据导入 -->
-    <el-dialog center title="导入" :visible.sync="openUpload" width="50%" append-to-body>
-      <el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="120px">
-        <el-form-item label="数据类型" prop="type">
-          <el-select v-model="uploadForm.type" placeholder="请选择数据类型" clearable filterable>
-            <el-option v-for="dict in typeList" :key="dict.value + 'typeList'" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
+    <el-dialog
+      center
+      title="导入"
+      :visible.sync="openUpload"
+      width="50%"
+      append-to-body
+    >
+      <el-form
+        ref="uploadForm"
+        :model="uploadForm"
+        :rules="rules"
+        label-width="120px"
+      >
+<!--        <el-form-item label="数据类型" prop="type">-->
+<!--          <el-select-->
+<!--            v-model="uploadForm.type"-->
+<!--            placeholder="请选择数据类型"-->
+<!--            clearable-->
+<!--            filterable-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="dict in typeList"-->
+<!--              :key="dict.value + 'typeList'"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="文件" prop="linkUrl" v-show="uploadForm.type">
           <el-upload class="upload-demo" ref="upload" action="#" :http-request="httprequest" :before-upload="uploadFile"
             :file-list="fileList" :auto-upload="false" :limit="1">