Merge branch 'develop/0.0.2(样式修改)' into test

src/api/system/menu.js

@@ -18,10 +18,11 @@ export function getMenu(menuId) {
 }
 
 // 查询菜单下拉树结构
-export function treeselect() {
+export function treeselect(query) {
   return request({
     url: '/system/menu/treeselect',
-    method: 'get'
+    method: 'get',
+    params: query
   })
 }
 

src/components/GanttChart/index.vue

@@ -29,7 +29,7 @@
           <div :style="{
         display: getDisplay(element), top: getTop(element), left: getLeft(element),
         height: getHeight(element), width: getWidth(element)
-      }" :class="[element.status === 0 ? 'grid-item' : 'grid-item-disabled']" @mousedown.stop>
+      }" :class="[element.status === 0 ? 'grid-item' : 'grid-item-disabled']">
             <el-popover placement="right" width="300px" popper-class="popper" :popper-style="popperStyle"
               :hide-after="0" trigger="click">
               <div class="title">

src/views/system/role/index.vue

@@ -123,7 +123,7 @@
           <el-checkbox v-model="form.menuCheckStrictly"
             @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
           <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
-            :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
+            :check-strictly="!form.menuCheckStrictly" empty-text="暂无数据"
             :props="{ label: 'label', children: 'children' }"></el-tree>
         </el-form-item>
         <el-form-item label="备注">
@@ -300,8 +300,11 @@ function handleAuthUser(row) {
   router.push("/system/role-auth/user/" + row.roleId);
 }
 /** 查询菜单树结构 */
-function getMenuTreeselect() {
-  menuTreeselect().then(response => {
+function getMenuTreeselect(val) {
+  console.log(val);
+  let obj = {}
+  val !== undefined ? obj.roleType = val : ''
+  menuTreeselect(obj).then(response => {
     menuOptions.value = response.data;
   });
 }
@@ -488,5 +491,10 @@ function cancelDataScope() {
   reset();
 }
 
+// 检测功能类型
+watch(() => form.value.roleType, (val) => {
+  getMenuTreeselect(val)
+})
+
 getList();
 </script>