Merge remote-tracking branch 'origin/master'

src/views/port/port/index.vue

@@ -5,9 +5,8 @@
         <el-card shadow="hover">
           <div slot="header" class="clearfix">
             <span>手机号查询归属地</span>
-            <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>
+            <el-button style="float: right; padding: 3px 0" @click="testPhone">测试</el-button>
           </div>
         </el-card>
       </el-col>

src/views/task/task/index.vue

@@ -196,10 +196,10 @@
           <el-input v-model="taskInfo.databaseId"></el-input>
         </el-form-item>
         <el-form-item label="数据表">
-          <el-select  v-model="taskInfo.tableName" placeholder="请选择等级">
+          <el-select @change="changeTableName(taskInfo.tableName)" v-model="taskInfo.tableName" placeholder="请选择等级">
             <el-option label="请选择" value="0"></el-option>
             <span v-for="table in taskInfoList">
-              <el-option @select="changeTableName(table)" :label=table.tableName :value=table.id :key=table.id></el-option>
+              <el-option  :label=table.tableName :value=table.id :key=table.id></el-option>
             </span>
           </el-select>
         </el-form-item>
@@ -352,9 +352,12 @@ export default {
   //方法集合",
   methods: {
     //选择数据表改变数据
-    changeTableName(row){
+    changeTableName(table){
-      console.log(row);
+      this.taskInfoList.forEach(res=>{
-      this.taskInfo = row;
+        if(table.eq(res.tableName)){
+          this.taskInfo = res;
+        }
+      })
     },
 
     //查询字段