Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 4a33cec4 by liuyong
Options

修改bug

1 parent d9cbf78a
Inline Side-by-side
Showing with 37 additions and 18 deletions
src/views/archi-asset-manage/index.vue
...@@ -294,15 +294,17 @@ ...@@ -294,15 +294,17 @@
:center="false" :center="false"
:close-on-click-modal="false" :close-on-click-modal="false"
width="80%"> width="80%">
<el-card v-for="item in elementTree" :key="item.assetId" style="margin-bottom: 20px;"> <div style="height: 524px;">
<div style="text-align: left;"> <el-card v-for="item in elementTree" :key="item.assetId" style="margin-bottom: 20px;">
<el-checkbox :indeterminate="item.isIndeterminate" v-model="item.checkAll" @change="val => handleCheckAllChange(val, item)">{{ item.assetName }}</el-checkbox> <div style="text-align: left;">
</div> <el-checkbox :indeterminate="item.isIndeterminate" v-model="item.checkAll" @change="val => handleCheckAllChange(val, item)">{{ item.assetName }}</el-checkbox>
<div style="margin: 15px 0;"></div> </div>
<el-checkbox-group v-model="item.checkedCities" @change="value => handleCheckedCitiesChange(value, item)" style="overflow-x: auto;display: flex;"> <div style="margin: 15px 0;"></div>
<el-checkbox v-for="city in item.subList" :label="city.assetName" :key="city.assetId">{{ city.assetName }}</el-checkbox> <el-checkbox-group v-model="item.checkedCities" @change="value => handleCheckedCitiesChange(value, item)" style="overflow-x: auto;display: flex;">
</el-checkbox-group> <el-checkbox v-for="city in item.subList" :label="city.assetName" :key="city.assetId">{{ city.assetName }}</el-checkbox>
</el-card> </el-checkbox-group>
</el-card>
</div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="dialogOperation('saveFactor', null)">确定</el-button> <el-button class="greenButton" @click="dialogOperation('saveFactor', null)">确定</el-button>
<el-button @click="add_dialog4 = false">取消</el-button> <el-button @click="add_dialog4 = false">取消</el-button>
...@@ -796,7 +798,7 @@ ...@@ -796,7 +798,7 @@
} }
}, },
saveFactor() {//确定维护资产要素 saveFactor() {//确定维护资产要素
this.add_dialog4 = false;
}, },
saveDialog(){//保存架构 saveDialog(){//保存架构
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
...@@ -1143,6 +1145,10 @@ ...@@ -1143,6 +1145,10 @@
color: #DD6A15; color: #DD6A15;
background-color: #F8EBE2; background-color: #F8EBE2;
} }
.el-button.is-disabled{
color: #C0C4CC !important;
background-color: #fff !important;
}
.table_container{ .table_container{
width: 97%; width: 97%;
height: calc(100% - 40px); height: calc(100% - 40px);
......
src/views/etpManage/index.vue
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
<el-button class="editBtn" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)">编辑</el-button> <el-button type="primary" icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)">编辑</el-button>
<el-button class="delBtn" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)">删除</el-button> <el-button class="delBtn" type="primary" icon="el-icon-delete" size="mini" @click="operate('del',scope.row)">删除</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -535,6 +535,16 @@ export default { ...@@ -535,6 +535,16 @@ export default {
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
} }
/deep/ .el-dialog__header{
background-color: #0D867F;
text-align: left;
}
/deep/ .el-dialog__title{
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.etpManage{ .etpManage{
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -601,6 +611,11 @@ export default { ...@@ -601,6 +611,11 @@ export default {
border: 0; border: 0;
} }
} }
.el-button--primary{
background: rgba(13,134,127,0.1);
color: #0D867F;
border: 0;
}
.add_btn{ .add_btn{
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -673,11 +688,9 @@ export default { ...@@ -673,11 +688,9 @@ export default {
height: 30px; height: 30px;
} }
} }
.editBtn{
color: #0D867F;
}
.delBtn{ .delBtn{
color: #DB6209; color: #DD6A15;
background-color: #F8EBE2;
} }
.stopBtn{ .stopBtn{
color: #E7A20E; color: #E7A20E;
......
src/views/report-template-relative-use/index.vue
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<el-input v-no-backslash maxlength="100" v-model="ruleForm.let3"></el-input> <el-input v-no-backslash maxlength="100" v-model="ruleForm.let3"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模板名称:" prop="let4"> <el-form-item label="模板名称:" prop="let4">
<el-select clearable v-model="ruleForm.let4" placeholder="请选择" style="width: 210px;"> <el-select clearable v-model="ruleForm.let4" placeholder="请选择" style="width: 200px;">
<el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tempName" :value="item.tplId"></el-option> <el-option v-for="item in moBanMingCheng" :key="item.tplId" :label="item.tempName" :value="item.tplId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -513,7 +513,7 @@ export default { ...@@ -513,7 +513,7 @@ export default {
} }
.el-form-item{ .el-form-item{
display: flex; display: flex;
width: 33%; width: 34%;
margin-right: 30px; margin-right: 30px;
} }
.cross1{ .cross1{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!