Authored by 王涛

设计页面优化

@@ -133,9 +133,9 @@ @@ -133,9 +133,9 @@
133 </el-dropdown> 133 </el-dropdown>
134 </el-form-item> 134 </el-form-item>
135 135
136 - <el-form-item label="厂商" prop="firm" v-if="ajConfigFrom.type==2" style="text-align: left"> 136 + <el-form-item label="厂商" prop="provider" v-if="ajConfigFrom.type==2" style="text-align: left">
137 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>--> 137 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
138 - <el-select v-model="ajConfigFrom.firm" multiple filterable clearable collapse-tags placeholder="请选择厂商" style="margin-top: 10px"> 138 + <el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags placeholder="请选择厂商" style="margin-top: 10px">
139 <el-option 139 <el-option
140 v-for="item in ddicProvider" 140 v-for="item in ddicProvider"
141 :label="item.ddicName" :value="item.ddicCode"></el-option> 141 :label="item.ddicName" :value="item.ddicCode"></el-option>
@@ -143,9 +143,9 @@ @@ -143,9 +143,9 @@
143 </el-form-item> 143 </el-form-item>
144 144
145 145
146 - <el-form-item label="操作系统" prop="firm" v-if="ajConfigFrom.type==2" style="text-align: left"> 146 + <el-form-item label="操作系统" prop="os" v-if="ajConfigFrom.type==2" style="text-align: left">
147 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>--> 147 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
148 - <el-select v-model="ajConfigFrom.firm" multiple filterable clearable collapse-tags placeholder="请选择操作类型" style="margin-top: 10px"> 148 + <el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags placeholder="请选择操作类型" style="margin-top: 10px">
149 <el-option 149 <el-option
150 v-for="item in ddicOS" 150 v-for="item in ddicOS"
151 :label="item.ddicName" :value="item.ddicCode"></el-option> 151 :label="item.ddicName" :value="item.ddicCode"></el-option>
@@ -59,7 +59,7 @@ export default { @@ -59,7 +59,7 @@ export default {
59 align: 'center', 59 align: 'center',
60 width:'250' 60 width:'250'
61 },{ 61 },{
62 - prop: 'firm', 62 + prop: 'provider',
63 label: '品牌', 63 label: '品牌',
64 sortable: true, 64 sortable: true,
65 align: 'center', 65 align: 'center',
@@ -98,8 +98,6 @@ export default { @@ -98,8 +98,6 @@ export default {
98 designPage: '', 98 designPage: '',
99 param: '&resId=#resId&access_token=#access_token', 99 param: '&resId=#resId&access_token=#access_token',
100 resType: '', 100 resType: '',
101 - firm:'',  
102 - resource:'',  
103 remark:'', 101 remark:'',
104 creatTime:'', 102 creatTime:'',
105 createName:'', 103 createName:'',
@@ -155,8 +153,6 @@ export default { @@ -155,8 +153,6 @@ export default {
155 designPage: '', 153 designPage: '',
156 param: '', 154 param: '',
157 resType: '', 155 resType: '',
158 - firm:'',  
159 - resource:'',  
160 remark:'', 156 remark:'',
161 creatTime:'', 157 creatTime:'',
162 createName:'', 158 createName:'',