Merge branch 'master-500-dev-xwx' into 'master-500-dev'
【禅道#834】可视化配置,页面优化 See merge request !598
Showing
2 changed files
with
6 additions
and
6 deletions
@@ -98,7 +98,7 @@ | @@ -98,7 +98,7 @@ | ||
98 | allow-create | 98 | allow-create |
99 | default-first-option | 99 | default-first-option |
100 | :reserve-keyword="false" | 100 | :reserve-keyword="false" |
101 | - placeholder="请选择" style="width: 555px;"> | 101 | + placeholder="请选择" style="width: 100%;"> |
102 | <el-option | 102 | <el-option |
103 | v-for="item in menuOptions" | 103 | v-for="item in menuOptions" |
104 | :key="item.value" | 104 | :key="item.value" |
@@ -123,7 +123,7 @@ | @@ -123,7 +123,7 @@ | ||
123 | allow-create | 123 | allow-create |
124 | default-first-option | 124 | default-first-option |
125 | :reserve-keyword="false" | 125 | :reserve-keyword="false" |
126 | - placeholder="请选择" style="width: 510px;"> | 126 | + placeholder="请选择" style="width: 91.73%;"> |
127 | <el-option | 127 | <el-option |
128 | v-for="item in options" | 128 | v-for="item in options" |
129 | :key="item.value" | 129 | :key="item.value" |
@@ -171,7 +171,7 @@ | @@ -171,7 +171,7 @@ | ||
171 | 171 | ||
172 | <el-form-item label="厂商" prop="provider" v-if="ajConfigFrom.type==2" style="text-align: left"> | 172 | <el-form-item label="厂商" prop="provider" v-if="ajConfigFrom.type==2" style="text-align: left"> |
173 | <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>--> | 173 | <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>--> |
174 | - <el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags placeholder="请选择厂商" style="width: 550px"> | 174 | + <el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags placeholder="请选择厂商" style="width: 100%"> |
175 | <el-option | 175 | <el-option |
176 | v-for="item in ddicProvider" | 176 | v-for="item in ddicProvider" |
177 | :label="item.ddicName" :value="item.ddicCode"></el-option> | 177 | :label="item.ddicName" :value="item.ddicCode"></el-option> |
@@ -181,7 +181,7 @@ | @@ -181,7 +181,7 @@ | ||
181 | 181 | ||
182 | <el-form-item label="操作系统" prop="os" v-if="ajConfigFrom.type==2" style="text-align: left"> | 182 | <el-form-item label="操作系统" prop="os" v-if="ajConfigFrom.type==2" style="text-align: left"> |
183 | <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>--> | 183 | <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>--> |
184 | - <el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags placeholder="请选择操作类型" style="width: 550px"> | 184 | + <el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags placeholder="请选择操作类型" style="width: 100%"> |
185 | <el-option | 185 | <el-option |
186 | v-for="item in ddicOS" | 186 | v-for="item in ddicOS" |
187 | :label="item.ddicName" :value="item.ddicCode"></el-option> | 187 | :label="item.ddicName" :value="item.ddicCode"></el-option> |
@@ -149,7 +149,7 @@ export default { | @@ -149,7 +149,7 @@ export default { | ||
149 | prop: 'creatTime', | 149 | prop: 'creatTime', |
150 | label: '创建时间', | 150 | label: '创建时间', |
151 | sortable: true, | 151 | sortable: true, |
152 | - align: 'left' | 152 | + align: 'center' |
153 | } | 153 | } |
154 | ]) | 154 | ]) |
155 | let butColumns=Vue.ref([ | 155 | let butColumns=Vue.ref([ |
@@ -190,7 +190,7 @@ export default { | @@ -190,7 +190,7 @@ export default { | ||
190 | prop: 'creatTime', | 190 | prop: 'creatTime', |
191 | label: '创建时间', | 191 | label: '创建时间', |
192 | sortable: true, | 192 | sortable: true, |
193 | - align: 'left' | 193 | + align: '创建时间' |
194 | } | 194 | } |
195 | ]) | 195 | ]) |
196 | let currentPage=Vue.ref(1); | 196 | let currentPage=Vue.ref(1); |
-
Please register or login to post a comment