Merge remote-tracking branch 'origin/develop' into develop

src/components/ImportPicDataset/index.vue

@@ -51,9 +51,9 @@
         <el-input v-model="formModel.gatherSpot" placeholder="请输入采集地点" />
       </el-form-item>
 
-      <el-form-item label="采集时间" prop="gatherTime">
-        <el-date-picker v-model="formModel.gatherTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择采集时间" />
-      </el-form-item>
+      <!--      <el-form-item label="采集时间" prop="gatherTime">-->
+      <!--        <el-date-picker v-model="formModel.gatherTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择采集时间" />-->
+      <!--      </el-form-item>-->
 
       <el-form-item label="数据类型" prop="dataType">
         <el-select v-model="formModel.dataType" placeholder="请选择数据类型">

src/views/demo/data/index.vue

@@ -647,7 +647,8 @@ const setFormItems = () => {
         elTagName: 'date-picker',
         type: 'datetime',
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        placeholder: '请选择采集时间'
+        placeholder: '请选择采集时间',
+        disabled: true
       }
     },
     {