Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 2071b6c4 by liuyong
Options

Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

2 parents 9970224f 03c2a10e
Inline Side-by-side
Showing with 34 additions and 14 deletions
src/views/JiaGouSTPZ/index.vue
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="add_dialog = false">发布</el-button> <el-button class="greenButton" @click="add_dialog = false">发布</el-button>
<el-button type="primary" @click="add_dialog = false">暂存</el-button> <el-button class="greenButton" @click="add_dialog = false">暂存</el-button>
<el-button @click="add_dialog = false">取消</el-button> <el-button @click="add_dialog = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -278,4 +278,8 @@ export default { ...@@ -278,4 +278,8 @@ export default {
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{ /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #0D867F; background-color: #0D867F;
} }
.greenButton{
background-color: #0D867F;
color: #fff;
}
</style> </style>
\ No newline at end of file
src/views/JiaGouYMXZD/index.vue
...@@ -38,14 +38,14 @@ ...@@ -38,14 +38,14 @@
</div> </div>
</div> </div>
<div class="search_btn"> <div class="search_btn">
<!-- <div class="add_btn" @click="add_dialog = true"> <div class="add_btn" @click="add_dialog = true">
<img class="btn_icon" src="@/assets/新建icon.png" alt="" /> <img class="btn_icon" src="@/assets/新建icon.png" alt="" />
<p>新建</p> <p>新建</p>
</div> </div>
<div class="version_btn"> <div class="version_btn">
<img class="btn_icon" src="@/assets/版本发布icon.png" alt="" /> <img class="btn_icon" src="@/assets/版本发布icon.png" alt="" />
<p>版本发布</p> <p>版本发布</p>
</div> --> </div>
</div> </div>
<el-table :data="tableData" stripe border> <el-table :data="tableData" stripe border>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
...@@ -93,13 +93,13 @@ ...@@ -93,13 +93,13 @@
</div> </div>
<el-dialog <el-dialog
title="新建元素关系" title="新建字典"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
width="40%"> width="40%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">元素关系名称</div> <div class="dialog_form_item_title">*字典名称</div>
<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="let1"></el-input> <el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="let1"></el-input>
</div> </div>
<!-- <div class="dialog_form_item"> <!-- <div class="dialog_form_item">
...@@ -117,13 +117,13 @@ ...@@ -117,13 +117,13 @@
</el-select> </el-select>
</div> --> </div> -->
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">元素关系描述</div> <div class="dialog_form_item_title">*字典描述</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="let4"></el-input> <el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="let4"></el-input>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="add_dialog = false">发布</el-button> <el-button class="greenButton" @click="add_dialog = false">发布</el-button>
<el-button type="primary" @click="add_dialog = false">暂存</el-button> <el-button class="greenButton" @click="add_dialog = false">暂存</el-button>
<el-button @click="add_dialog = false">取消</el-button> <el-button @click="add_dialog = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<script> <script>
export default { export default {
name: 'JiaGouYuanShuGuanLi', name: 'JiaGouYMXZD',
components: { components: {
}, },
...@@ -278,4 +278,8 @@ export default { ...@@ -278,4 +278,8 @@ export default {
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{ /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #0D867F; background-color: #0D867F;
} }
.greenButton{
background-color: #0D867F;
color: #fff;
}
</style> </style>
\ No newline at end of file
src/views/JiaGouYuanShuGuanXiGuanLi/index.vue
...@@ -123,8 +123,8 @@ ...@@ -123,8 +123,8 @@
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="add_dialog = false">发布</el-button> <el-button class="greenButton" @click="add_dialog = false">发布</el-button>
<el-button type="primary" @click="add_dialog = false">暂存</el-button> <el-button class="greenButton" @click="add_dialog = false">暂存</el-button>
<el-button @click="add_dialog = false">取消</el-button> <el-button @click="add_dialog = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -279,4 +279,8 @@ export default { ...@@ -279,4 +279,8 @@ export default {
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{ /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #0D867F; background-color: #0D867F;
} }
.greenButton{
background-color: #0D867F;
color: #fff;
}
</style> </style>
\ No newline at end of file
src/views/JiaGouYuanSuGuanLi/index.vue
...@@ -125,8 +125,8 @@ ...@@ -125,8 +125,8 @@
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="add_dialog = false">发布</el-button> <el-button class="greenButton" @click="add_dialog = false">发布</el-button>
<el-button type="primary" @click="add_dialog = false">暂存</el-button> <el-button class="greenButton" @click="add_dialog = false">暂存</el-button>
<el-button @click="add_dialog = false">取消</el-button> <el-button @click="add_dialog = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -325,4 +325,8 @@ export default { ...@@ -325,4 +325,8 @@ export default {
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{ /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #0D867F; background-color: #0D867F;
} }
.greenButton{
background-color: #0D867F;
color: #fff;
}
</style> </style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!