Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -84,9 +84,9 @@
 
             <el-form-item label="类型" prop="type">
                 <div style="width: 240px">
-                <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio>
-                <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio>
-                <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio>
+                    <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio>
+                    <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio>
+                    <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio>
                 </div>
                 <!--                <div style="height: 15px; color: darkgrey">说明：参数中间用'&'拼接</div>-->
             </el-form-item>
@@ -98,7 +98,7 @@
                            allow-create
                            default-first-option
                            :reserve-keyword="false"
-                           placeholder="请选择" style="width: 555px;">
+                           placeholder="请选择" style="width: 100%;">
                     <el-option
                             v-for="item in menuOptions"
                             :key="item.value"
@@ -123,7 +123,7 @@
                            allow-create
                            default-first-option
                            :reserve-keyword="false"
-                           placeholder="请选择" style="width: 510px;">
+                           placeholder="请选择" style="width: 91.73%;">
                     <el-option
                             v-for="item in options"
                             :key="item.value"
@@ -171,7 +171,7 @@
 
             <el-form-item label="厂商" prop="provider" v-if="ajConfigFrom.type==2" style="text-align: left">
                 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
-                <el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags  placeholder="请选择厂商" style="width: 550px">
+                <el-select v-model="ajConfigFrom.provider" filterable clearable collapse-tags  placeholder="请选择厂商" style="width: 100%">
                     <el-option
                             v-for="item in ddicProvider"
                             :label="item.ddicName" :value="item.ddicCode"></el-option>
@@ -181,7 +181,7 @@
 
             <el-form-item label="操作系统" prop="os" v-if="ajConfigFrom.type==2" style="text-align: left">
                 <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>-->
-                <el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags  placeholder="请选择操作类型" style="width: 550px">
+                <el-select v-model="ajConfigFrom.os" filterable clearable collapse-tags  placeholder="请选择操作类型" style="width: 100%">
                     <el-option
                             v-for="item in ddicOS"
                             :label="item.ddicName" :value="item.ddicCode"></el-option>

@@ -149,7 +149,7 @@ export default {
                 prop: 'creatTime',
                 label: '创建时间',
                 sortable: true,
-                align: 'left'
+                align: 'center'
             }
         ])
         let butColumns=Vue.ref([
@@ -190,7 +190,7 @@ export default {
                 prop: 'creatTime',
                 label: '创建时间',
                 sortable: true,
-                align: 'left'
+                align: 'center'
             }
         ])
         let currentPage=Vue.ref(1);