Browse Source

后台页面增加权限

Administrator 4 years ago
parent
commit
92161edd3f

+ 4 - 3
ruoyi-admin/src/main/resources/application.yml

@@ -49,8 +49,8 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles:
-    active: druid
+#  profiles:
+#    active: druid
   # 文件上传
   servlet:
     multipart:
@@ -69,7 +69,8 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://arenen.cn:3306/bm_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://arenen.cn:3306/bm_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.101.11:3306/bm_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: abc123+
       #            # 从库数据源

+ 5 - 1
ruoyi-ui/src/views/gallery/category/index.vue

@@ -53,6 +53,7 @@
           </el-switch>
         </template>
       </el-table-column>
+      <el-table-column label="排序" align="left" prop="sort"/>
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
@@ -61,7 +62,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleAdd(scope.row.id)"
-            v-hasPermi="['system:category:edit']"
+            v-hasPermi="['system:category:add']"
           >新增
           </el-button>
           <el-button
@@ -119,6 +120,9 @@
             placeholder="选择上级菜单"
           />
         </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="form.sort" placeholder="请输入展示顺序"/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>

+ 3 - 1
ruoyi-ui/src/views/gallery/pic/index.vue

@@ -42,6 +42,7 @@
             size="mini"
             type="text"
             icon="el-icon-help"
+            v-hasPermi="['system:pic:query']"
             @click="handleUpdate(scope.row)"
           >查看
           </el-button>
@@ -49,6 +50,7 @@
           <el-button
             size="mini"
             type="text"
+            v-hasPermi="['system:pic:remove']"
             @click="handleDel(scope.row)"
           >删除
           </el-button>
@@ -86,7 +88,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+<!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>