root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:前端样式调整

Browse Source
This commit is contained in:
ludj
2024-05-14 10:54:53 +08:00
parent b713e082f5
commit e5e8d912d9
10 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java
View File

@@ -35,14 +35,11 @@ import org.springframework.web.bind.annotation.RestController;
@EnableTransactionManagement @EnableTransactionManagement
@MapperScan("org.nl.**.mapper") @MapperScan("org.nl.**.mapper")
public class AppRun implements CommandLineRunner { public class AppRun implements CommandLineRunner {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(AppRun.class, args); SpringApplication.run(AppRun.class, args);
} }
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
System.out.println(111); System.out.println(111);

BIN
wms_pro/qd/public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 622 B

BIN
wms_pro/qd/src/assets/images/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 120 KiB

16
wms_pro/qd/src/assets/styles/eladmin.scss
View File

@@ -1,5 +1,8 @@
.head-container { .head-container {
padding-bottom: 10px; padding-top: 4px;
padding-bottom: 6px;
background-color: #ffffff;
border-radius: 4px;
.filter-item { .filter-item {
display: inline-block; display: inline-block;
@@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button {
.el-table__fixed-header-wrapper { .el-table__fixed-header-wrapper {
th { th {
word-break: break-word; word-break: break-word;
background-color: #f8f8f9; background-color: #f5f5f5;
color: #515a6e; color: #515a6e;
height: 35px; height: 35px;
font-size: 13px; font-size: 13px;
@@ -215,4 +218,13 @@ input[type="number"]::-webkit-outer-spin-button {
.el-table--scrollable-y .el-table__body-wrapper { .el-table--scrollable-y .el-table__body-wrapper {
overflow-y: overlay !important; overflow-y: overlay !important;
} }
//左侧边框不显示start https://blog.csdn.net/m0_37922443/article/details/126487240
.el-table__row td:not(.is-hidden):last-child {
right: -1px;
}
thead th:not(.is-hidden):last-child {
right: -1px;
}
//左侧边框不显示end

5
wms_pro/qd/src/assets/styles/index.scss
View File

@@ -21,6 +21,7 @@ label {
html { html {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
background-color: #eeeeee;
} }
#app { #app {
@@ -98,7 +99,7 @@ div:focus {
} }
aside { aside {
background: #eef1f6; background: #d40c70;
padding: 8px 24px; padding: 8px 24px;
margin-bottom: 20px; margin-bottom: 20px;
border-radius: 2px; border-radius: 2px;
@@ -122,7 +123,7 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
padding: 20px 20px 45px 20px; padding: 10px 20px 45px 10px;
} }
.components-container { .components-container {

14
wms_pro/qd/src/assets/styles/variables.scss
View File

@@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529;
$base-menu-light-background:#ffffff; $base-menu-light-background:#ffffff;
// sidebar // sidebar
$menuText:#bfcbd9; $menuText: #ffffff;
$menuActiveText:#409EFF; $menuActiveText:#409EFF;
$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 $subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951
$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 $menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773
$menuHover:#263445; $menuHover:#4e5465;
$base-menu-light-color:rgba(0,0,0,.70); $base-menu-light-color:rgba(0,0,0,.70);
$subMenuBg:#1f2d3d; $subMenuBg:#000c17;
$subMenuHover:#001528; $subMenuHover:#4e5465;
$sideBarWidth: 205px; $sideBarWidth: 205px;
@@ -45,4 +45,4 @@ $sideBarWidth: 205px;
logoLightTitleColor: $base-logo-light-title-color logoLightTitleColor: $base-logo-light-title-color
} }
$base-sidebar-width: 200px; $base-sidebar-width: 2010px;

8
wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue
View File

@@ -60,11 +60,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="update_name" label="操作人" /> <el-table-column prop="update_name" label="操作人" />
<el-table-column prop="update_time" label="操作时间" /> <el-table-column min-width="160" prop="update_time" label="操作时间" />
<el-table-column <el-table-column
v-permission="[]" v-permission="[]"
label="操作" label="操作"
width="160" width="120"
align="center" align="center"
fixed="right" fixed="right"
> >
@@ -154,5 +154,7 @@ export default {
</script> </script>
<style scoped> <style scoped>
.is-scrolling-none + .el-table__fixed-right {
height: 100% !important;
}
</style> </style>

4
wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
View File

@@ -108,16 +108,16 @@
v-permission="['admin','actDeModel:edit','actDeModel:del']" v-permission="['admin','actDeModel:edit','actDeModel:del']"
fixed="right" fixed="right"
label="操作" label="操作"
width="300px" width="160px"
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button slot="right" @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="mini">预览</el-button>
<udOperation <udOperation
:data="scope.row" :data="scope.row"
:permission="permission" :permission="permission"
style="display: inline" style="display: inline"
/> />
<el-button slot="right" @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="mini">预览</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

35
wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
View File

@@ -75,7 +75,7 @@
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55"/>
<el-table-column prop="name" label="模型名称" width="150"/> <el-table-column prop="name" label="模型名称" width="150"/>
<el-table-column prop="model_key" label="模型KEY" width="150"/> <el-table-column prop="model_key" label="模型KEY" width="150"/>
<el-table-column prop="description" label="模型描述"/> <el-table-column prop="description" label="模型描述" min-width="100"/>
<el-table-column prop="model_comment" label="模型注释"/> <el-table-column prop="model_comment" label="模型注释"/>
<el-table-column prop="status" label="发布状态"> <el-table-column prop="status" label="发布状态">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -90,31 +90,32 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="version" label="版本号"/> <el-table-column prop="version" label="版本号"/>
<el-table-column prop="model_editor_json" label="模型数据" width="300" show-overflow-tooltip <el-table-column prop="model_editor_json" label="模型数据" width="300"
show-tooltip-when-overflow/> show-tooltip-when-overflow/>
<el-table-column prop="thumbnail" label="模型封面"/> <el-table-column prop="thumbnail" label="模型封面"/>
<el-table-column prop="model_type" label="模型类型"/> <el-table-column prop="model_type" label="模型类型" />
<el-table-column prop="form_type" label="单据类型"/> <el-table-column prop="form_type" label="单据类型" min-width="120"/>
<el-table-column prop="tenant_id" label="归属租户"/> <el-table-column prop="tenant_id" label="归属租户"/>
<el-table-column prop="updated_id" label="修改者"/> <el-table-column prop="updated_id" label="修改者" min-width="150"/>
<el-table-column prop="update_time" label="修改时间" width="135"/> <el-table-column prop="update_time" label="修改时间" width="135"/>
<el-table-column <el-table-column
v-permission="['admin','actDeModel:edit','actDeModel:del']"
fixed="right"
label="操作" label="操作"
width="300px" fixed="right"
align="center" align="center"
width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="publishDisabled(scope.row)" @click="publishClick(scope.row)" type="text" <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
icon="el-icon-arrow-up" size="small">发布 <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
</el-button> <el-dropdown size="mini">
<el-button @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="small">预览</el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-button @click="handleClick(scope.row)" type="text" icon="el-icon-set-up" size="small">设计</el-button> <el-dropdown-menu slot="dropdown">
<udOperation <el-dropdown-item icon="el-icon-refresh-right"><span @click="publishClick(scope.row)">发布</span></el-dropdown-item>
:data="scope.row" <el-dropdown-item icon="el-icon-key"><span @click="viewClick(scope.row)">预览</span> </el-dropdown-item>
:permission="permission" <el-dropdown-item icon="el-icon-key"><span @click="handleClick(scope.row)">设计</span></el-dropdown-item>
/> </el-dropdown-menu>
</el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

8
wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue
View File

@@ -229,19 +229,23 @@
<el-table-column prop="update_name" label="更新人" width="150" /> <el-table-column prop="update_name" label="更新人" width="150" />
<el-table-column prop="update_time" label="更新时间" width="150" /> <el-table-column prop="update_time" label="更新时间" width="150" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"
:permission="permission" :permission="permission"
style="display: inline"
/> />
<el-button <el-button
class="filter-item" class="filter-item"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
type="warning" type="text"
slot="right"
@click="syncTest(scope.row)" @click="syncTest(scope.row)"
>同步测试</el-button> >同步测试</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>