升级:1、增加界面夜间模式
2、qtask 功能交互升级
3、mysql连接管理增加心跳保活
4、其他修改
This commit is contained in:
@@ -30,6 +30,10 @@
|
||||
</style>
|
||||
<!-- 对话框HTML -->
|
||||
<div class="importDev">
|
||||
<div class="col-md-12">
|
||||
<h3>实体导入</h3>
|
||||
</div>
|
||||
|
||||
<div class="info">
|
||||
<a @click="showInfo()" href="javascript:;"><i class="icon icon-info"></i></a>
|
||||
</div>
|
||||
@@ -108,7 +112,7 @@
|
||||
<!-- excel sheets -->
|
||||
<div class="row" v-show="sheet">
|
||||
<div class="col-xs-2 sheet-cell">
|
||||
<div style="padding-left: 10px;background-color: #ccc;width: 100%"> Excel-Sheet</div>
|
||||
<div class="base-info"> Excel-Sheet</div>
|
||||
<ul class="nav nav-tabs nav-stacked tlist" style="height: 100%">
|
||||
<li class="checkbox-inline clearfix" v-for="item in sheetArr" >
|
||||
<!-- || sheetData[item]['hv']==1 -->
|
||||
@@ -123,15 +127,15 @@
|
||||
<p v-show="ck && ck.length">已选择 <code v-text="ck.length||0"></code> 个实体待导入</p>
|
||||
</div>
|
||||
<div class="col-xs-8">
|
||||
<div style="padding-left: 10px;background-color: #ccc;width: 100%"> Sheet-Detail</div>
|
||||
<div class="base-info"> Sheet-Detail</div>
|
||||
<div class="tab-content col-xs-9">
|
||||
<div class="tab-pane fade active in" id="">
|
||||
<table class="table-bordered" style="width: 100%">
|
||||
<table class="table-bordered">
|
||||
<caption class="" v-show="sheet && (sheet!='表说明' || sheet!='表名称')">
|
||||
表名称: <span v-text="metaTable.field"></span>,中文名:<span v-text="metaTable.comment"></span>
|
||||
</caption>
|
||||
<thead>
|
||||
<tr style="background-color: #f1f1f1" v-show="sheet && sheet!='表说明' && sheet!='表名称'">
|
||||
<tr v-show="sheet && sheet!='表说明' && sheet!='表名称'">
|
||||
<th>列名</th>
|
||||
<th>注释</th>
|
||||
<th>数据类型</th>
|
||||
@@ -193,10 +197,10 @@
|
||||
|
||||
<div class="clearfix"></div>
|
||||
<div class="row" v-show="tableName">
|
||||
<div class="col-xs-2 sheet-cell">
|
||||
<div style="padding-left: 10px;background-color: #ccc;width: 100%"> DB-Table</div>
|
||||
<div class="col-xs-4 sheet-cell">
|
||||
<div class="base-info"> DB-Table</div>
|
||||
<ul class="nav nav-tabs nav-stacked tlist" style="height: 90%">
|
||||
<li class="checkbox-inline clearfix" v-for="item in tableArr" >
|
||||
<li class="checkbox-inline" v-for="item in tableArr" >
|
||||
<!-- || tableData[item]['hv']==1 -->
|
||||
<input type="checkbox"
|
||||
v-model="ckTable"
|
||||
@@ -207,13 +211,20 @@
|
||||
</li>
|
||||
</ul>
|
||||
<!-- v-show="ckTable && ckTable.length" -->
|
||||
|
||||
<p >已选择 <code v-text="ckTable.length||0"></code> 个实体待导入,上面<code class="text-danger">红色</code> 部分已经导入过的数据表</p>
|
||||
|
||||
<div class="modal-footer" v-show="cate=='mysql'">
|
||||
<button @click="back()" type="button" class="btn btn-default" data-dismiss="modal">返回</button>
|
||||
<button @click="ckTable=[]" type="button" class="btn btn-default" data-dismiss="modal">取消选择</button>
|
||||
<button @click="saveTable()" type="button" class="btn btn-primary">导入</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-8">
|
||||
<div style="padding-left: 10px;background-color: #ccc;width: 100%"> Table-Detail</div>
|
||||
<div class="base-info"> Table-Detail</div>
|
||||
<div class="tab-content col-xs-9">
|
||||
<div class="tab-pane fade active in">
|
||||
<table class="table-bordered" style="width: 100%">
|
||||
<table class="table-bordered">
|
||||
<caption class="" v-show="tableName && (sheet!='表说明' || sheet!='表名称')">
|
||||
表名称: <span v-text="tableInfo.name"></span>,中文名:<span v-text="tableInfo.comment"></span>
|
||||
</caption>
|
||||
@@ -255,11 +266,6 @@
|
||||
<button @click="ck=[]" type="button" class="btn btn-default" data-dismiss="modal">取消选择</button>
|
||||
<button @click="saveTable()" type="button" class="btn btn-primary">确定</button>
|
||||
</div>
|
||||
<div class="modal-footer" v-show="cate=='mysql'">
|
||||
<button @click="ckTable=[]" type="button" class="btn btn-default" data-dismiss="modal">取消选择</button>
|
||||
<button @click="back()" type="button" class="btn btn-default" data-dismiss="modal">取消</button>
|
||||
<button @click="saveTable()" type="button" class="btn btn-primary">确定</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
||||
Reference in New Issue
Block a user