Merge branch 'master' of http://218.59.175.43:3000/zhangzl/rongxin.dashboard

src/views/system/dict/data.vue

@@ -141,8 +141,8 @@
     />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
         </el-form-item>
@@ -152,7 +152,13 @@
         <el-form-item label="数据键值" prop="dictValue">
           <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
         </el-form-item>
-        <el-form-item label="样式属性" prop="cssClass">
+        <el-form-item prop="cssClass">
+          <span slot="label">
+            样式属性
+            <el-tooltip content="优先级高于【回显样式】，如：purple（紫色）" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
           <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
         </el-form-item>
         <el-form-item label="显示排序" prop="dictSort">
@@ -234,7 +240,7 @@ export default {
         },
         {
           value: "info",
-          label: "紫色"
+          label: "灰色"
         },
         {
           value: "warning",
@@ -243,7 +249,7 @@ export default {
         {
           value: "danger",
           label: "红色"
-        }
+        },
       ],
       // 类型数据字典
       typeOptions: [],

src/views/system/menuapp/index.vue

@@ -132,7 +132,7 @@
         </el-form-item>
         <el-form-item label="菜单状态" prop="menuStatus">
           <el-radio-group v-model="form.menuStatus">
-            <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+            <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"></el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -353,7 +353,7 @@ export default {
     doPrint() {
         const originalTitle = document.title;
         try {
-            document.title = this.title || '通用附件详情';
+            document.title = this.title || '手机菜单详情';
             const printElement = document.getElementById('printDetail');
             const printFrame = document.createElement('iframe');
             printFrame.style.position = 'absolute';