Merge remote-tracking branch 'origin/master'

src/views/engine/engine/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-
     <el-form  label-width="80px" :model="engine"  :inline="true" class="demo-form-inline" size="small">
       <el-form-item label="规则名称">
         <el-input v-model="engine.name"></el-input>
@@ -18,9 +17,6 @@
         查询
       </el-button>
     </el-form>
-
-
-
     <el-button
       type="warning"
       plain
@@ -30,8 +26,6 @@
       v-hasPermi="['source:data:export']"
     >导出
     </el-button>
-
-
     <el-button
       icon="el-icon-delete"
       plain
@@ -40,10 +34,7 @@
       @click="insert()"
     >新增
     </el-button>
-
-
     <el-dialog title="添加数据源接入" :visible.sync="dialogFormVisible" >
-
       <el-form :model="engine">
         <el-form-item label="接入源名称">
           <el-input v-model="engine.id"></el-input>
@@ -69,24 +60,13 @@
         <el-form-item label="数据库密码">
           <el-input v-model="engine.description"></el-input>
         </el-form-item>
-
       </el-form>
-
-
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
       </div>
-
     </el-dialog>
-
-
-
-
-
-
     <el-table :data="arr" style="width: 100%">
-
       <el-table-column label="编号" prop="id"></el-table-column>
       <el-table-column label="名称" prop="name"></el-table-column>
       <el-table-column label="类型" style="color: #13ce66" prop="type">
@@ -115,39 +95,27 @@
         </template>
       </el-table-column>
       <el-table-column label="状态"  style="color: #787be8" prop="status">
-
         <template v-slot="scope">
           <span v-if="scope.row.status==1">开启</span>
           <span v-if="scope.row.status==2">关闭</span>
         </template>
-
       </el-table-column>
       <el-table-column label="描述" prop="description"></el-table-column>
-
-
-
-
       <el-table-column
         align="right">
         <template slot-scope="scope">
-
           <el-button
             icon="el-icon-delete"
             size="mini"
             type="text"
             @click="handleDelete(scope.row.id)">删除</el-button>
-
           <el-button
             icon="el-icon-service"
             size="mini"
             type="text"
             @click="handUpdate(scope.row.id)">规则维护</el-button>
-
-
         </template>
-
       </el-table-column>
-
     </el-table>
 
 

src/views/etl/switch/index.vue

@@ -16,16 +16,6 @@
       </el-button>
     </el-form>
 
-
-<!--    <el-button-->
-<!--      v-hasPermi="['system:user:remove']"-->
-<!--      icon="el-icon-delete"-->
-<!--      size="mini"-->
-<!--      type="text"-->
-<!--      @click="handleDelete(scope.row)"-->
-<!--    >删除-->
-<!--    </el-button>-->
-
     <el-button
       v-hasPermi="['tool:gen:import']"
       icon="el-icon-download"