黎有为 пре 1 година
родитељ
комит
10c892e392
2 измењених фајлова са 23 додато и 29 уклоњено
  1. 0 12
      src/views/dataSource/Detail.vue
  2. 23 17
      src/views/taskManage/dialog/ConvergeAdd.vue

+ 0 - 12
src/views/dataSource/Detail.vue

@@ -20,18 +20,6 @@
         <my-form :form-data="form.basicInfo" class="form-detail" ref="basicInfo"></my-form>
         <span class="detail-part-title">详细信息</span>
         <my-form :form-data="selectedFormData" class="form-detail" ref="extentInfo"></my-form>
-        <span class="detail-part-title">文件上传</span>
-        <el-form-item label="文件类型">
-          <el-select v-model="fileType" placeholder="请选择">
-            <el-option v-for="item in FileType" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="文件上传">
-          <el-upload v-model:file-list="fileList" class="upload-demo" :before-upload="beforeFileUpload"
-            :http-request="uploadFile" drag multiple>
-            <el-button type="primary">Click to upload</el-button>
-          </el-upload>
-        </el-form-item>
       </div>
     </div>
   </div>

+ 23 - 17
src/views/taskManage/dialog/ConvergeAdd.vue

@@ -2,19 +2,21 @@
   <el-dialog title="数据汇聚" v-model="innerVisible" :modal-append-to-body='false' class="dialog-default" width="30%">
     <el-form :model="convergeItemForm" label-width="100px" label-position="right">
       <el-row>
-        <el-form-item label="汇聚模式" required ="true">
+        <el-form-item label="汇聚模式" required="true">
           <el-select v-model="convergeItemForm.type" placeholder="汇聚模式" @change="aggregateModelChange">
             <el-option v-for="item in dataTypeArr" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
       </el-row>
-      <el-row>
-        <el-form-item label="前置源" required ="true">
-          <el-select v-model="convergeItemForm.sourceId" placeholder="前置源" @change="sourceIdChange">
-            <el-option v-for="item in sourceArr" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-      </el-row>
+      <template v-if="convergeItemForm.type !== '3'">
+        <el-row>
+          <el-form-item label="前置源" required="true">
+            <el-select v-model="convergeItemForm.sourceId" placeholder="前置源" @change="sourceIdChange">
+              <el-option v-for="item in sourceArr" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+        </el-row>
+      </template>
       <template v-if="convergeItemForm.type === '1'">
         <el-row>
           <el-form-item label="前置库">
@@ -35,12 +37,18 @@
         </el-row>
       </template>
       <template v-if="convergeItemForm.type === '3'">
-        <el-row>
-          <el-form-item label="文件路径" required ="true" style="width: 59%">
-            <el-input v-model="convergeItemForm.fileName" label="文件名" />
-          </el-form-item>
-        </el-row>
-        <el-form-item label="读取规则" required ="true">
+        <el-form-item label="文件类型" required='true'>
+          <el-select v-model="fileType" placeholder="请选择">
+            <el-option v-for="item in FileType" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="文件上传" required='true'>
+          <el-upload v-model:file-list="fileList" class="upload-demo" :before-upload="beforeFileUpload"
+            :http-request="uploadFile" drag multiple>
+            <el-button type="primary">Click to upload</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="读取规则" required="true">
           <el-radio-group v-model="convergeItemForm.fileType">
             <el-radio :label="1">最新文件</el-radio>
             <el-radio :label="2">最新文件+文件名关键词</el-radio>
@@ -151,6 +159,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>