TreeData
/
cloud-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
wxy 2024-08-25 11:52:25 +08:00
parent 95b3db2f10 27d8cbadba
commit b603b06f05
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/etl/switch/index.vue
View File

@ -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

3
src/views/port/port/index.vue
View File

@ -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>

29
src/views/task/task/index.vue
View File

@ -187,30 +187,30 @@
<!-- 添加任务详情设计-->
<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="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 @select="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,15 @@ export default {
watch: {},
//方法集合",
methods: {
//选择数据表改变数据
changeTableName(row){
console.log(row);
this.taskInfo = row;
},
//查询字段
findByInputId(row){
findByInputId(row.id).then(res=>{
findByInputId(taskInfo){
findByInputId(taskInfo.id).then(res=>{
this.structureList = res.data;
})
@ -371,9 +378,9 @@ export default {
},
addTaskInput(){
addTaskInput(taskInfo){
this.taskInputAdd = false;
this.findByInputId();
this.findByInputId(taskInfo);
this.taskInputFieldAdd = true;
},