From bd9e302e52036a06ce9c1707c9d28938ea985577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:41:39 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 1fc3495..4e8d9b0 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -189,28 +189,28 @@
 
       <el-form  label-width="80px" :model="taskInfoList" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="任务id">
-          <el-input v-model="taskInfoList.taskId"></el-input>
+          <el-input v-model="taskInfo.taskId"></el-input>
         </el-form-item>
 
         <el-form-item label="数据库id">
-          <el-input v-model="taskInfoList.databaseId"></el-input>
+          <el-input v-model="taskInfo.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select v-model="taskInfoList.tableName" placeholder="请选择等级">
+          <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
             <span v-for="table in taskInfoList">
-              <el-option :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option @change="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>
         <el-form-item label="表别名">
-          <el-input v-model="taskInputReq.tableAsName"></el-input>
+          <el-input v-model="taskInfo.tableAsName"></el-input>
         </el-form-item>
       </el-form>
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="taskInputAdd = false">取 消</el-button>
-        <el-button type="primary" @click="addTaskInput()">下一步</el-button>
+        <el-button type="primary" @click="addTaskInput(taskInfo)">下一步</el-button>
       </div>
 
 
@@ -340,6 +340,7 @@ export default {
       taskInputReq:{},
       taskList:[],
       taskInfoList:[],
+      taskInfo:{},
       tableList:[],
       structureList:[],
     };
@@ -350,9 +351,14 @@ export default {
   watch: {},
   //方法集合",
   methods: {
+    //选择数据表改变数据
+    changeTableName(row){
+      this.taskInfo = row;
+    },
+
     //查询字段
-    findByInputId(row){
-      findByInputId(row.id).then(res=>{
+    findByInputId(taskInfo){
+      findByInputId(taskInfo.id).then(res=>{
         this.structureList = res.data;
       })
 
@@ -371,9 +377,9 @@ export default {
     },
 
 
-    addTaskInput(){
+    addTaskInput(taskInfo){
       this.taskInputAdd = false;
-      this.findByInputId();
+      this.findByInputId(taskInfo);
       this.taskInputFieldAdd = true;
     },
 

From badc198cdedf7f7f2c89c3d6e04f66de1168f682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:45:16 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 4e8d9b0..9b9cea7 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -187,7 +187,7 @@
 <!--    添加任务详情设计-->
     <el-dialog title="添加表" :visible.sync="taskInputAdd">
 
-      <el-form  label-width="80px" :model="taskInfoList" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
+      <el-form  label-width="80px" :model="taskInfo" ref="queryForm"  :inline="true" class="demo-form-inline" size="small">
         <el-form-item label="任务id">
           <el-input v-model="taskInfo.taskId"></el-input>
         </el-form-item>
@@ -353,6 +353,7 @@ export default {
   methods: {
     //选择数据表改变数据
     changeTableName(row){
+      console.log(row);
       this.taskInfo = row;
     },
 

From d3659e5468609390c82df65afa27adabb336ef90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Sun, 25 Aug 2024 11:47:30 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E8=AE=BE=E8=AE=A1=E9=9B=8F=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/task/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/task/task/index.vue b/src/views/task/task/index.vue
index 9b9cea7..b8fcd94 100644
--- a/src/views/task/task/index.vue
+++ b/src/views/task/task/index.vue
@@ -199,7 +199,7 @@
           <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
             <span v-for="table in taskInfoList">
-              <el-option @change="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option @select="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>

From f4d9897c2dfeaaa395998bb0e372563cbdffec9d Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 25 Aug 2024 11:48:51 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=88=97=E8=A1=A8=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/etl/switch/index.vue | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/etl/switch/index.vue b/src/views/etl/switch/index.vue
index 6d7ff59..a737215 100644
--- a/src/views/etl/switch/index.vue
+++ b/src/views/etl/switch/index.vue
@@ -136,16 +136,16 @@
           <span>其他信息</span>
         </div>
         <el-form ref="form" :model="sourceAddReq"  label-width="140px" :inline="true" class="demo-form-inline">
-<!--          <el-form-item label="是否初始化：" prop="status">-->
-<!--            <el-radio-group v-model="sourceAddReq.status">-->
-<!--              <el-radio-->
-<!--                v-for="dict in dict.type.yes_no"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.value"-->
-<!--              >{{ dict.label }}-->
-<!--              </el-radio>-->
-<!--            </el-radio-group>-->
-<!--          </el-form-item>-->
+          <el-form-item label="是否初始化：" prop="status">
+            <el-radio-group v-model="sourceAddReq.status">
+              <el-radio
+                v-for="dict in dict.type.yes_no"
+                :key="dict.value"
+                :label="dict.value"
+              >{{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="备注：">
             <el-input type="textarea" v-model="sourceAddReq.remark"></el-input>
           </el-form-item>
@@ -210,7 +210,10 @@
 
       <el-table-column
         label="是否初始化"
-        prop="name">
+        prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.yes_no" :value="scope.row.status"/>
+        </template>
       </el-table-column>
 
       <el-table-column

From 905a67d1b8f21bd359b33fbc5b61b2a4b5d8c901 Mon Sep 17 00:00:00 2001
From: chaiyapeng <3535863041@qq.com>
Date: Sun, 25 Aug 2024 11:50:03 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B0=8F=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/port/port/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/port/port/index.vue b/src/views/port/port/index.vue
index 53d02d5..07f3293 100644
--- a/src/views/port/port/index.vue
+++ b/src/views/port/port/index.vue
@@ -5,7 +5,8 @@
         <el-card shadow="hover">
           <div slot="header" class="clearfix">
             <span>手机号查询归属地</span>
-            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>
+            <button @click="testPhone">测试</button>
+<!--            <el-button style="float: right; padding: 3px 0" type="text">测试</el-button>-->
             <el-button style="float: right; padding: 3px 0" type="text">购买</el-button>
           </div>
         </el-card>