diff --git a/src/views/Home.vue b/src/views/Home.vue index fb3e9cd..1d93a26 100755 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -8,7 +8,7 @@ <div class="tools" @click.prevent="collapse" style="width: 15px;margin-top: 72px;margin-left:1px;z-index:9999;position:absolute;"> <!-- ;margin-top: 80px;z-index:9999;margin-left: 170px--> <!-- <i class="el-icon-s-operation" style="color: rgb(38,56,76)"></i>--> - <img :class="[rotate?'go':'aa']" @click="start" width="23" height="49" src="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABCCAYAAABAfGYuAAAArklEQVRYhe3YIQ4CMRBG4b+IOhyS26DXEjySBE6A4QSINasRSAx3guBJECTdLMn6dtp0Be8loz/Tjhh3OLVBEzSbAhUwMDAwMDAwMDAw8B/A5+PuNzEtF/NycGwDut9u6sIj6r2vB6eiRWALmg1b0SzYOWndrExoFhyC1F3vejxfdeGh9+er9nIz4dmPy4oX+U4WvNgCScWLrswRj4k7FzAwMDAwMDAwMDBwYnLqAfLHOpMP7/PBAAAAAElFTkSuQmCC"> + <img :class="[rotate?'go':'aa']" @click="start" width="20" height="44" src="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABCCAYAAABAfGYuAAAArklEQVRYhe3YIQ4CMRBG4b+IOhyS26DXEjySBE6A4QSINasRSAx3guBJECTdLMn6dtp0Be8loz/Tjhh3OLVBEzSbAhUwMDAwMDAwMDAw8B/A5+PuNzEtF/NycGwDut9u6sIj6r2vB6eiRWALmg1b0SzYOWndrExoFhyC1F3vejxfdeGh9+er9nIz4dmPy4oX+U4WvNgCScWLrswRj4k7FzAwMDAwMDAwMDBwYnLqAfLHOpMP7/PBAAAAAElFTkSuQmCC"> </div> <!-- 标签i的图标 fa-align-justify--> </el-col> @@ -80,7 +80,7 @@ </li> </ul> </aside> -<div class="tabM" v-bind:style="{width: myWidth}"> +<div class="tabM"> <TabMenu></TabMenu> </div> @@ -506,8 +506,9 @@ } .tabM{ display: inline-block; - min-width: 870px; + min-width: 758px; max-width: 1190px; + padding-right: 15px; } .go{ transform:rotate(-180deg); diff --git a/src/views/hqpt/Job.vue b/src/views/hqpt/Job.vue index 8c82697..2047acc 100644 --- a/src/views/hqpt/Job.vue +++ b/src/views/hqpt/Job.vue @@ -29,7 +29,10 @@ </el-col> <!--列表--> - <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> + <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" + tooltip-effect="dark" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> <el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="index" width="60"> @@ -40,7 +43,7 @@ </el-table-column> <el-table-column prop="auditresuld" label="执行状态" min-width="80" :formatter="formatType" sortable> </el-table-column> - <el-table-column label="操作" min-width="260"> + <el-table-column label="操作" min-width="260" fixed="right"> <template slot-scope="scope"> <el-button size="small" @click="startJob(scope.$index, scope.row)">开始执行</el-button> <el-button size="small" @click="setPerm(scope.$index, scope.row)">完成任务</el-button> @@ -499,4 +502,4 @@ <style scoped> -</style> \ No newline at end of file +</style> diff --git a/src/views/hqpt/Process.vue b/src/views/hqpt/Process.vue index b29459a..5cd0b0b 100644 --- a/src/views/hqpt/Process.vue +++ b/src/views/hqpt/Process.vue @@ -28,7 +28,10 @@ </el-col> <!--列表--> - <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> + <el-table :data="processList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" + tooltip-effect="dark" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> <el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="index" width="60"> @@ -54,7 +57,7 @@ </el-table-column> <el-table-column prop="processstatus" label="工单状态" min-width="80" :formatter="formatState" sortable> </el-table-column> - <el-table-column label="操作" min-width="260"> + <el-table-column label="操作" min-width="260" fixed="right"> <template slot-scope="scope"> <!--<el-button size="small" @click="setPerm(scope.$index, scope.row)">分配工单</el-button>--> <el-button size="small" @click="shwoDialog(scope.$index, scope.row)">查看内容</el-button> @@ -490,4 +493,4 @@ <style scoped> -</style> \ No newline at end of file +</style> diff --git a/src/views/lostLoadChange/lostLoadChange.vue b/src/views/lostLoadChange/lostLoadChange.vue index fca5782..9c2543d 100644 --- a/src/views/lostLoadChange/lostLoadChange.vue +++ b/src/views/lostLoadChange/lostLoadChange.vue @@ -42,7 +42,9 @@ </el-row> </div> <tree-table v-loading="listLoading" :data="manifestData" :eval-func="func" :expand-all="true" - style="font-size: 13px" border @selection-change="handleSelectionChange" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" + tooltip-effect="dark" border @selection-change="handleSelectionChange" :row-class-name="tableRowClassName"> <el-table-column label="航班号" width="80px" align="center"> <template slot-scope="scope"> @@ -115,7 +117,7 @@ <!--</div>--> </template> </el-table-column> - <el-table-column label="操作" width="180px" align="center"> + <el-table-column label="操作" width="180px" align="center" fixed="right"> <template slot-scope="scope"> <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT2201'" @click="handleUpdate(scope.row)">预配舱单</a> <a style="color: #1d8ce0; margin-right: 5px" v-if="scope.row.messageType==='MT3201'" @click="handleUpdate(scope.row)">出港运抵</a> diff --git a/src/views/lostLoadChange/lostLoading.vue b/src/views/lostLoadChange/lostLoading.vue index 8cc1aa7..e1fb458 100644 --- a/src/views/lostLoadChange/lostLoading.vue +++ b/src/views/lostLoadChange/lostLoading.vue @@ -10,7 +10,9 @@ <span style="color: red">注:主分单必须同时为空或者同时不为空</span> </div> <tree-table v-loading="listLoading" :data="lostLoadData" :eval-func="func" :expand-all="true" - style="font-size: 12px" border> + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" + tooltip-effect="dark" border> <el-table-column label="航班号" width="70px" align="center"> <template slot-scope="scope"> <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span> @@ -86,7 +88,7 @@ <span>{{ scope.row.ext5 }}</span> </template> </el-table-column> - <el-table-column label="操作" width="220px" align="center"> + <el-table-column label="操作" width="220px" align="center" fixed="right"> <template slot-scope="scope"> <el-button size="mini" type="primary" @click="handleLostLoad(scope.row)" :disabled="scope.row.offload ==='002'">落装申请 diff --git a/src/views/nav1/Log.vue b/src/views/nav1/Log.vue index c276c42..bc80015 100755 --- a/src/views/nav1/Log.vue +++ b/src/views/nav1/Log.vue @@ -15,7 +15,10 @@ </el-form> </el-col> <!--列表--> - <el-table :data="logs" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> + <el-table :data="logs" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" + tooltip-effect="dark" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> <el-table-column type="index" width="60" align="center"> </el-table-column> <el-table-column prop="logid" label="ID" width="80" sortable align="center"> diff --git a/src/views/nav1/perm.vue b/src/views/nav1/perm.vue index e9a9386..6daf8d4 100755 --- a/src/views/nav1/perm.vue +++ b/src/views/nav1/perm.vue @@ -16,7 +16,10 @@ </el-col> <!--列表--> - <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;height:600px;overflow: scroll" + <el-table :data="tableList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" + tooltip-effect="dark" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" row-key="permissionId" border :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @@ -35,7 +38,7 @@ </el-table-column> <el-table-column prop="url" label="访问路径" width="300" sortable> </el-table-column> - <el-table-column label="操作" min-width="100"> + <el-table-column label="操作" min-width="100" fixed="right"> <template slot-scope="scope"> <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button> diff --git a/src/views/nav1/role.vue b/src/views/nav1/role.vue index f0b7503..9899374 100755 --- a/src/views/nav1/role.vue +++ b/src/views/nav1/role.vue @@ -16,10 +16,13 @@ </el-col> <!--列表--> - <el-table :data="roles" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;" + <el-table :data="roles" highlight-current-row v-loading="listLoading" @selection-change="selsChange" default-expand-all row-key="roleId" border + tooltip-effect="dark" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> <el-table-column type="selection" width="55"> </el-table-column> @@ -41,7 +44,7 @@ </el-table-column> <el-table-column prop="mqcode" label="海关通道编号" min-width="150" > </el-table-column> - <el-table-column label="操作" min-width="260"> + <el-table-column label="操作" min-width="260" fixed="right"> <template slot-scope="scope"> <el-button type="primary" size="small" @click="handleAdd(scope.$index, scope.row)">新增下级</el-button> <el-button size="small" @click="setPerm(scope.$index, scope.row)">设置权限</el-button> @@ -556,4 +559,4 @@ <style scoped> -</style> \ No newline at end of file +</style> diff --git a/src/views/nav1/user.vue b/src/views/nav1/user.vue index 6fbd5ad..d601775 100755 --- a/src/views/nav1/user.vue +++ b/src/views/nav1/user.vue @@ -19,7 +19,11 @@ </el-col> <!--列表--> - <el-table :data="users" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> + <el-table :data="users" highlight-current-row border v-loading="listLoading" + @selection-change="selsChange" + tooltip-effect="dark" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> <el-table-column type="selection" width="55"> </el-table-column> <!--<el-table-column type="index" width="60">--> @@ -44,7 +48,7 @@ </el-table-column> <el-table-column prop="state" label="启用" width="100" :formatter="formatState" sortable> </el-table-column> - <el-table-column label="操作" width="250"> + <el-table-column label="操作" width="250" fixed="right"> <template slot-scope="scope"> <el-button size="small" @click="roleEdit(scope.$index, scope.row)">角色配置</el-button> <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> @@ -566,4 +570,4 @@ <style scoped> -</style> \ No newline at end of file +</style> diff --git a/src/views/nav3/Page7.vue b/src/views/nav3/Page7.vue index f0de71d..c883a24 100644 --- a/src/views/nav3/Page7.vue +++ b/src/views/nav3/Page7.vue @@ -57,6 +57,8 @@ <el-table-column prop="receiptinformation" label="回执内容" width="280px"> </el-table-column> </el-table> + <div style="margin-left: 1190px"> + </div> </el-row> <!-- 申请表单信息--> <el-row style="padding-bottom: 0px;"> diff --git a/src/views/nav3/Way.vue b/src/views/nav3/Way.vue index 86d503e..7f97fe6 100644 --- a/src/views/nav3/Way.vue +++ b/src/views/nav3/Way.vue @@ -1,5 +1,5 @@ <template> - <div style="height: 850px;overflow: scroll;"> + <div style="height: 850px;overflow: scroll;margin-left: 25px"> <table class="tl" style="margin-top: 40px;font-size:small" border="1px" cellspacing="0px"> <tbody> <tr> diff --git a/src/views/nav4/booking.vue b/src/views/nav4/booking.vue index 5180246..fa8b472 100644 --- a/src/views/nav4/booking.vue +++ b/src/views/nav4/booking.vue @@ -516,6 +516,8 @@ </el-tab-pane> </el-tabs> </el-col> + <div style="margin-left: 1190px"> + </div> </el-row> </el-main> </el-container> diff --git a/src/views/nav4/inquiry.vue b/src/views/nav4/inquiry.vue index 30326c9..236f303 100644 --- a/src/views/nav4/inquiry.vue +++ b/src/views/nav4/inquiry.vue @@ -1,5 +1,5 @@ <template> - <el-container> + <el-container style="height: 550px;overflow:auto;"> <el-main style="background-color: #EAEAEA"> <!-- 航班号查询--> <el-row style="height: 180px"> @@ -62,7 +62,9 @@ <el-col :span="23"> <el-table :data="listDate" - style="width: 100%"> + tooltip-effect="dark" + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"> <el-table-column prop="fplt" label="计划离港"> </el-table-column> <el-table-column label="航班号"> @@ -382,4 +384,4 @@ width: 98%; background-color: #FFFFFF; } -</style> \ No newline at end of file +</style> diff --git a/src/views/station_manage/Bayonet.vue b/src/views/station_manage/Bayonet.vue index 79717e6..1617565 100644 --- a/src/views/station_manage/Bayonet.vue +++ b/src/views/station_manage/Bayonet.vue @@ -4,22 +4,24 @@ <!-- 搜素区域 --> <div> <el-row :gutter="10"> - <el-col :span="4"> + <el-col :span="5"> <el-input v-model="bayonet_queryInfo.stationName" prefix-icon="el-icon-search" size="small" placeholder="场站名称" clearable></el-input> </el-col> - <el-col :span="4"> + <el-col :span="5"> <el-input v-model="bayonet_queryInfo.name" prefix-icon="el-icon-search" size="small" placeholder="卡口名称" clearable></el-input> </el-col> - <el-col :span="4"> + <el-col :span="5"> <el-input v-model="bayonet_queryInfo.channel" prefix-icon="el-icon-search" size="small" placeholder="通道编号" clearable></el-input> </el-col> - <el-col :span="8"> + <el-col :span="5"> <el-button type="success" style="width:120px" size="small" @click="bayonet_getList"> 查询 </el-button> + </el-col> + <el-col :span="4"> <el-button type="primary" style="width:120px" size="small" @click="bayonet_toAddDialog"> 卡口添加 </el-button> @@ -29,7 +31,10 @@ <!-- 列表区域 --> <div style="margin-top: 20px;"> - <el-table :data="bayonet_page.bayonetList" border size="mini" + <el-table :data="bayonet_page.bayonetList" border + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" + tooltip-effect="dark" v-loading="bayonet_loading.listLoading" element-loading-text="获取卡口列表,拼命加载中"> <el-table-column type="index" align="center"></el-table-column> <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column> @@ -43,7 +48,7 @@ </template> </el-table-column> <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column> - <el-table-column label="操作" width="140px" align="center"> + <el-table-column label="操作" align="center" fixed="right"> <template slot-scope="scope"> <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> <el-button type="text" icon="el-icon-edit" size="mini" @@ -500,4 +505,4 @@ <style scoped> -</style> \ No newline at end of file +</style> diff --git a/src/views/station_manage/Warehouse.vue b/src/views/station_manage/Warehouse.vue index 4c8129f..627903d 100644 --- a/src/views/station_manage/Warehouse.vue +++ b/src/views/station_manage/Warehouse.vue @@ -4,19 +4,20 @@ <!-- 搜素区域 --> <div> <el-row :gutter="10"> - <el-col :span="4"> + <el-col :span="5"> <el-input v-model="warehouse_queryInfo.stationName" prefix-icon="el-icon-search" size="small" placeholder="场站名称" clearable></el-input> </el-col> - <el-col :span="4"> + <el-col :span="5"> <el-input v-model="warehouse_queryInfo.name" prefix-icon="el-icon-search" size="small" placeholder="仓库名称" clearable></el-input> </el-col> - - <el-col :span="8"> + <el-col :span="5"> <el-button type="success" style="width:120px" size="small" @click="warehouse_getList"> 查询 </el-button> + </el-col> + <el-col :span="5"> <el-button type="primary" style="width:120px" size="small" @click="warehouse_toAddDialog"> 仓库添加 </el-button> @@ -26,7 +27,10 @@ <!-- 列表区域 --> <div style="margin-top: 20px;"> - <el-table :data="warehouse_page.warehouseList" border size="mini" + <el-table :data="warehouse_page.warehouseList" border + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" + tooltip-effect="dark" v-loading="warehouse_loading.listLoading" element-loading-text="获取仓库列表,拼命加载中"> <el-table-column type="index" align="center"></el-table-column> <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column> @@ -45,7 +49,7 @@ <el-table-column label="仓库面积(平方米)" prop="warehouseArea" align="center" width="140"></el-table-column> <el-table-column label="仓库体积(立方米)" prop="warehouseVolume" align="center" width="140"></el-table-column> <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column> - <el-table-column label="操作" width="160px" align="center" fixed="right"> + <el-table-column label="操作" align="center" fixed="right"> <template slot-scope="scope"> <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> <el-button type="text" icon="el-icon-edit" size="mini" @@ -61,6 +65,7 @@ </template> </el-table-column> </el-table> + <div style="margin-left: 1190px"></div> </div> <!-- 分页区域 --> @@ -589,4 +594,4 @@ <style scoped> -</style> \ No newline at end of file +</style> diff --git a/src/views/station_manage/Yard.vue b/src/views/station_manage/Yard.vue index c2c1c58..0493155 100644 --- a/src/views/station_manage/Yard.vue +++ b/src/views/station_manage/Yard.vue @@ -4,18 +4,20 @@ <!-- 搜素区域 --> <div> <el-row :gutter="10"> - <el-col :span="4"> + <el-col :span="5"> <el-input v-model="yard_queryInfo.name" prefix-icon="el-icon-search" size="small" placeholder="场站名称" clearable></el-input> </el-col> - <el-col :span="4"> + <el-col :span="5"> <el-input v-model="yard_queryInfo.customsCode" prefix-icon="el-icon-search" size="small" placeholder="关区代码" clearable></el-input> </el-col> - <el-col :span="8"> + <el-col :span="5"> <el-button type="success" style="width:120px" size="small" @click="yard_getList"> 查询 </el-button> + </el-col> + <el-col :span="5"> <el-button type="primary" style="width:120px" size="small" @click="yard_toAddDialog"> 场站添加 </el-button> @@ -25,7 +27,10 @@ <!-- 列表区域 --> <div style="margin-top: 20px;"> - <el-table :data="yard_page.yardList" border size="mini" + <el-table :data="yard_page.yardList" border + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" + tooltip-effect="dark" v-loading="yard_loading.listLoading" element-loading-text="获取场站列表,拼命加载中"> <el-table-column type="index" align="center"></el-table-column> <el-table-column label="场站名称" prop="name" align="center" width="120"></el-table-column> @@ -33,7 +38,7 @@ <el-table-column label="场站编号" prop="stationId" align="center" width="120"></el-table-column> <el-table-column label="关区代码" prop="customsCode" align="center" width="120"></el-table-column> <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column> - <el-table-column label="操作" width="140px" align="center"> + <el-table-column label="操作" align="center" fixed="right"> <template slot-scope="scope"> <el-tooltip effect="dark" content="编辑" placement="top-start" :enterable="false"> <el-button type="text" icon="el-icon-edit" size="mini" @@ -49,6 +54,7 @@ </template> </el-table-column> </el-table> + <div style="margin-left: 1190px"></div> </div> <!-- 分页区域 --> @@ -423,4 +429,4 @@ <style scoped> -</style> \ No newline at end of file +</style>