设计页面优化

@@ -120,21 +120,42 @@
 
 
             <el-form-item label="传递参数" prop="param">
             <el-form-item label="传递参数" prop="param">
                 <el-input :size="$global.elementSize" v-model="ajConfigFrom.param" clearable></el-input>
                 <el-input :size="$global.elementSize" v-model="ajConfigFrom.param" clearable></el-input>
-                <div style="height: 15px;color: darkgrey">示例：&test=1&test1=1 说明：'&'开头,并且参数中间用'&'拼接</div>
+                <div style="height: 15px;color: darkgrey">示例：&resId=#resId&access_token=#access_token</div>
             </el-form-item>
             </el-form-item>
 
 
-            <el-form-item label="资源类型" prop="resType" v-if="ajConfigFrom.type==2">
-                <el-input :size="$global.elementSize" v-model="ajConfigFrom.resType" clearable></el-input>
+            <el-form-item label="资源类型" prop="resType" v-if="ajConfigFrom.type==2" style="text-align: left">
+                <!--<el-input :size="$global.elementSize" v-model="ajConfigFrom.resType" clearable></el-input>-->
+                <el-dropdown>
+                    <el-icon class="el-icon--right">
+                        <arrow-down/>
+                    </el-icon>
+                    <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
+                </el-dropdown>
             </el-form-item>
             </el-form-item>
 
 
-            <el-form-item label="厂商" prop="firm" v-if="ajConfigFrom.type==2">
-                <el-input :size="$global.elementSize" v-model="ajConfigFrom.firm" clearable></el-input>
+            <el-form-item label="厂商" prop="firm" 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.firm" multiple filterable clearable collapse-tags  placeholder="请选择厂商" style="margin-top: 10px">
+                    <el-option
+                            v-for="item in ddicProvider"
+                            :label="item.ddicName" :value="item.ddicCode"></el-option>
+                </el-select>
             </el-form-item>
             </el-form-item>
 
 
-            <el-form-item label="绑定资源" prop="resource" v-if="ajConfigFrom.type==2">
-                <el-input :size="$global.elementSize" v-model="ajConfigFrom.resource" clearable></el-input>
+
+            <el-form-item label="操作系统" prop="firm" 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.firm" multiple filterable clearable collapse-tags  placeholder="请选择操作类型" style="margin-top: 10px">
+                    <el-option
+                            v-for="item in ddicOS"
+                            :label="item.ddicName" :value="item.ddicCode"></el-option>
+                </el-select>
             </el-form-item>
             </el-form-item>
 
 
+            <!--<el-form-item label="绑定资源" prop="resource" v-if="ajConfigFrom.type==2">
+                <el-input :size="$global.elementSize" v-model="ajConfigFrom.resource" clearable></el-input>
+            </el-form-item>-->
+
             <el-form-item label="备注" prop="remark">
             <el-form-item label="备注" prop="remark">
                 <el-input :size="$global.elementSize" v-model="ajConfigFrom.remark" clearable></el-input>
                 <el-input :size="$global.elementSize" v-model="ajConfigFrom.remark" clearable></el-input>
             </el-form-item>
             </el-form-item>

@@ -24,11 +24,11 @@ export default {
                     message: '请选择设计页面！',
                     message: '请选择设计页面！',
                     trigger: 'blur',
                     trigger: 'blur',
                 }],
                 }],
-                resource:[{
+                /*resource:[{
                     required: true,
                     required: true,
                     message: '请填写绑定资源！',
                     message: '请填写绑定资源！',
                     trigger: 'blur',
                     trigger: 'blur',
-                }],
+                }],*/
             }
             }
         }
         }
 
 
@@ -96,7 +96,7 @@ export default {
             id:'',
             id:'',
             type: 0,
             type: 0,
             designPage: '',
             designPage: '',
-            param: '',
+            param: '&resId=#resId&access_token=#access_token',
             resType: '',
             resType: '',
             firm:'',
             firm:'',
             resource:'',
             resource:'',
@@ -273,7 +273,35 @@ export default {
 
 
         })
         })
 
 
+
+        let getResType = (arr) => {
+
+            var types = arr.map(function (v) {
+                return v.id;
+            });
+            ajConfigFrom.value.resType = types[0];
+        }
+
+        // 加载字典项
+        let ddicProvider = Vue.ref([]);
+        let ddicOS = Vue.ref([]);
+        // let ddicProvider = Vue.ref([]);
+
+        proxy.$http.post(`/api-web/manage/ddic/findSucDdics/provider`, {}, function (res) {
+            if (res && res.data) {
+                ddicProvider.value = res.data;
+            }
+        });
+
+        proxy.$http.post(`/api-web/manage/ddic/findSucDdics/os`, {}, function (res) {
+            if (res && res.data) {
+                ddicOS.value = res.data;
+            }
+        });
+
         return {
         return {
+            ddicProvider,
+            ddicOS,
             height,
             height,
             columns,
             columns,
             currentPage,
             currentPage,
@@ -299,7 +327,8 @@ export default {
             radio,
             radio,
             options,
             options,
             menuList,
             menuList,
-            menuOptions
+            menuOptions,
+            getResType
         }
         }
     }
     }