sss 2 years ago
parent
commit
719f00b921
2 changed files with 18 additions and 34 deletions
  1. 13 27
      src/views/dm/appMenu/index.vue
  2. 5 7
      src/views/dm/system/index.vue

+ 13 - 27
src/views/dm/appMenu/index.vue

@@ -13,24 +13,14 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="菜单名称">
+          <el-form-item label="菜单名称" prop="name">
             <el-input v-model="form.name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="菜单路由">
+          <el-form-item label="菜单路由" prop="route">
             <el-input v-model="form.route" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="菜单图标">
-            <el-upload
-              class="avatar-uploader"
-              :headers="headers"
-              :action="imagesUploadApi"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccess"
-              :file-list="fileList"
-            >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
-              <i v-else class="el-icon-plus avatar-uploader-icon" />
-            </el-upload>
+          <el-form-item label="菜单图标" prop="iocn">
+            <el-input v-model="form.iocn" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -69,7 +59,6 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import { getToken } from '@/utils/auth'
-import { mapGetters } from 'vuex'
 
 const defaultForm = { id: null, name: null, iocn: null, route: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
 export default {
@@ -88,6 +77,15 @@ export default {
         del: ['admin', 'dmAppMenu:del']
       },
       rules: {
+        name: [
+          { required: true, message: '菜单名称不能为空', trigger: 'blur' }
+        ],
+        route: [
+          { required: true, message: '菜单路由不能为空', trigger: 'blur' }
+        ],
+        iocn: [
+          { required: true, message: '菜单图标不能为空', trigger: 'blur' }
+        ]
       },
       queryTypeOptions: [
         { key: 'name', display_name: '菜单名称' }
@@ -96,22 +94,10 @@ export default {
       imageUrl: ''
     }
   },
-  computed: {
-    ...mapGetters([
-      'baseApi',
-      'imagesUploadApi'
-    ])
-  },
   methods: {
     // 钩子:在获取表格数据之前执行,false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
-    },
-    handleAvatarSuccess(res, file) {
-      this.form.iocn = 'https://smartpark.caih.com/static/zkptres/' + res.realName
-      this.imageUrl = (process.env.NODE_ENV !== 'production' ? this.baseApi + '/file/' + res.realName : 'https://smartpark.caih.com/static/zkptres/' + res.realName)
-      console.log('res', res)
-      console.log('file', file)
     }
   }
 }

+ 5 - 7
src/views/dm/system/index.vue

@@ -19,7 +19,7 @@
           <el-form-item label="系统地址" prop="systemUrl">
             <el-input v-model="form.systemUrl" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="系统图标" prop="storage.id">
+          <el-form-item label="系统图标" prop="storage.url">
             <!--            <el-input v-model="form.storageId" style="width: 370px;" />-->
             <el-upload
               class="avatar-uploader"
@@ -28,7 +28,7 @@
               :on-success="handleAvatarSuccess"
               :file-list="fileList"
             >
-              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <img v-if="form.storage.url" :src="form.storage.url" class="avatar">
               <i v-else class="el-icon-plus avatar-uploader-icon" />
             </el-upload>
           </el-form-item>
@@ -79,7 +79,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import dmUserTemp from '@/components/User/dmUserindex'
 
-const defaultForm = { systemName: null, systemUrl: null, storage: {}, dmUser: {}, isMenu: null, menuPath: null }
+const defaultForm = { systemName: null, systemUrl: null, storage: {}, dmUser: {}, isMenu: false, menuPath: null }
 export default {
   name: 'DmSystem',
   components: { pagination, crudOperation, rrOperation, udOperation, dmUserTemp },
@@ -101,14 +101,13 @@ export default {
         systemUrl: [
           { required: true, message: '子系统地址不能为空', trigger: 'blur' }
         ],
-        storage: [
+        'storage.url': [
           { required: true, message: '图片不能为空', trigger: 'blur' }
         ],
-        userId: [
+        'dmUser.name': [
           { required: true, message: '子系统管理员不能为空', trigger: 'blur' }
         ]
       },
-      imageUrl: '',
       fileList: [],
       isMenuPath: false
     }
@@ -138,7 +137,6 @@ export default {
     handleAvatarSuccess(res, file) {
       this.form.storageId = res.id
       this.form.storage = res
-      this.imageUrl = res.url
       console.log('res', res)
       console.log('file', file)
     },