d

38a41d22 · 蒋勇 · ca973e50 · 38a41d22 · 38a41d22 · 38a41d22
Commit 38a41d22 authored May 16, 2020 by 蒋勇
13 changed files
--- a/iview-admin/public/ccc.png
+++ b/iview-admin/public/ccc.png
--- a/iview-admin/public/index.html
+++ b/iview-admin/public/index.html
@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>ccc.png">
    <title></title>
  </head>
  <body>

--- a/iview-admin/src/assets/images/ccc.png
+++ b/iview-admin/src/assets/images/ccc.png
--- a/iview-admin/src/components/main/main.vue
+++ b/iview-admin/src/components/main/main.vue
@@ -7,7 +7,7 @@
          <!-- <img v-show="!collapsed" :src="maxLogo" key="max-logo" /> -->
          <img v-show="collapsed" :src="minLogo" key="min-logo" />
          <div v-show="!collapsed" style="font-size:28px;color:white">
-            <Icon type="ios-apps" size="28" color="white"/>智慧中台</div>
+            <Icon type="ios-apps" size="28" color="white"/>企服交付中台</div>
        </div>
      </side-menu>
    </Sider>
@@ -51,7 +51,7 @@ import ErrorStore from './components/error-store'
 import { mapMutations, mapActions, mapGetters } from 'vuex'
 import { getNewTagList, routeEqual } from '@/libs/util'
 import routers from '@/router/routers'
-import minLogo from '@/assets/images/logo-min.jpg'
+import minLogo from '@/assets/images/ccc.png'
 import maxLogo from '@/assets/images/logo.jpg'
 import './main.less'
 export default {

--- a/iview-admin/src/config/index.js
+++ b/iview-admin/src/config/index.js
@@ -2,7 +2,7 @@ export default {
  /**
   * @description 配置显示在浏览器标签的title
   */
-  title: '智慧中台 ',
+  title: '企服交付中台 ',
  appkey:'cbb91171-3c68-49f9-b27f-fa38daa376ee',
  companykey:'41fabc4fc3a049f9823eee96cec7a94d',
  /**

--- a/iview-admin/src/router/routers.js
+++ b/iview-admin/src/router/routers.js
@@ -120,7 +120,9 @@ export default [
        name: 'functree_info',
        meta: {
          icon: 'md-clipboard',
-          title: '功能清单'
+          title: '功能清单',
+          hideInMenu:true,
+          hideInBread:true
        },
        component: () => import('@/view/appinfo/functree_page.vue')
      }
@@ -155,7 +157,7 @@ export default [
      // },
      {
        path: 'role_info',
-        name: 'role_info_page',
+        name: 'role_info',
        meta: {
          icon: 'md-clipboard',
          title: '角色授权'

--- a/iview-admin/src/store/module/metainfo/appinfo.js
+++ b/iview-admin/src/store/module/metainfo/appinfo.js
@@ -49,7 +49,7 @@ export default {
    ]
  },
  "search": {
-    name: "search",
+    name: "高级查询",
    main: [
      {
        "title": "基本信息",

--- a/iview-admin/src/store/module/metainfo/dict.js
+++ b/iview-admin/src/store/module/metainfo/dict.js
@@ -2,7 +2,7 @@ export default {
        "app_type": { "api": "API服务","web": "PCWEB","app":"移动APP","xcx":"小程序","access":"接入"},
        "data_priv": { "auth.role": "角色", "auth.user": "用户" },
        "noticeType": {"sms": "短信", "email": "邮件","wechat":"微信"},
-        "authType": {"add": "新增", "edit": "编辑","delete":"删除","export":"导出","show":"查看"},
+        "authType": {"add": "新增", "edit": "编辑","delete":"删除","save":"保存","export":"导出","show":"查看"},
        "opstatus": {"0": "失败", "1": "成功"},
        "sex": {"male": "男", "female": "女"},
        "logLevel": {"debug": 0, "info": 1, "warn": 2, "error": 3, "fatal": 4},

--- a/iview-admin/src/store/module/metainfo/routeinfo.js
+++ b/iview-admin/src/store/module/metainfo/routeinfo.js
@@ -62,7 +62,7 @@ export default {
      { "icon": "ios-undo-outline", "title": "取消", "type": "text", "key": "cancel", "isOnForm": true },
      { "icon": "ios-undo-outline", "title": "取消", "type": "text", "key": "cancel-search", "isInSearch": true },
      { "icon": "ios-search-outline", "title": "搜索", "type": "text", "key": "start-search", "isInSearch": true },
-      { "icon": "ios-search-outline", "title": "高级", "type": "text", "key": "adv-search", "isOnGrid": true },
+      // { "icon": "ios-search-outline", "title": "高级", "type": "text", "key": "adv-search", "isOnGrid": true },
    ],
  }
 }
--- a/iview-admin/src/view/appinfo/routeinfo_page.vue
+++ b/iview-admin/src/view/appinfo/routeinfo_page.vue
@@ -6,6 +6,9 @@
      metaName="route_info"
      packageName="common"
      isMulti
+      :savebefore="beforesave"
+      :editbefore="beforedit"
+      :addbefore="beforeadd"
    ></BizTable>
  </div>
 </template>
@@ -20,6 +23,15 @@ export default {
    BizTable
  },
  methods: {
+     beforeadd(row, cbk) {
+      return cbk({ value: true, message: null });
+    },
+    beforedit(row, cbk) {
+      return cbk({ value: true, message: null });
+    },
+    beforesave(key, row, cbk) {
+      return cbk(row);
+    },
    // onnew() {
    //   this.$refs.bt.setFormCtlVisable("userName", true);
    // },

--- a/iview-admin/src/view/components/tables/biztables.vue
+++ b/iview-admin/src/view/components/tables/biztables.vue
@@ -7,6 +7,7 @@
        :mask-closable="false"
        v-model="showsearch"
        width="600"
+        @on-visible-change="ondrawvisable2"
      >
        <Forms ref="searchform" :fminfo="searchinfo" style="height:100%">
          <template v-slot:default="slotProps">
@@ -218,7 +219,8 @@ export default {
      avgdata: {},
      clickcount: { save: 0 },
      isrowdel: true,
-      initZIndex: this.initPropZIndex
+      initZIndex: this.initPropZIndex,
+      initZindex2: this.initPropZIndex
    };
  },
  methods: {
@@ -227,11 +229,30 @@ export default {
    },
    ondrawvisable(v) {
      if (v) {
+         this.$nextTick(()=>{
                 this.initZIndex = this.initZIndex;
        $("div.ivu-drawer-wrap:even").map((index, item) => {
          $(item).css("z-index", "" + this.initZIndex++);
        });
-      }
+         })
+      } else {
+        //this.initZIndex--
+      }
+    },
+    ondrawvisable2(v) {
+      // if (v) {
+      //   this.$nextTick(() => {
+      //     this.initZIndex2 = this.initZIndex;
+      //     $("div.ivu-drawer-wrap:even").map((index, item) => {
+      //       this.initZIndex2 += 8000;
+      //       $(item).css("z-index", "" + this.initZIndex2);
+      //     });
+      //   });
+      // } else {
+      //   //this.initZIndex2-=8000
+      // }
    },
    setFormCtlVisable(prop, isShow) {
      this.$refs.edform.setCtlVisable(prop, isShow);
@@ -358,6 +379,11 @@ export default {
              });
            }
          });
+        } else {
+          this.fm_status = "create";
+          this.showedform = true;
+          this.$refs.edform.activeChildTables(true);
+          this.$emit("onnew");
        }
      }
      if (key == "save") {
@@ -410,7 +436,27 @@ export default {
                    });
                  });
                } else {
-                  throw new Error("请绑定组件的savebore属性方法");
+                  // throw new Error("请绑定组件的savebore属性方法");
+                  saveFormData(url, data).then(res => {
+                    let rtn = res.data;
+                    console.log(rtn);
+                    if (rtn.status == 0) {
+                      this.$refs.edform.resetForm();
+                      this.fm_status = "normal";
+                      this.showedform = false;
+                      this.clickcount["save"] = this.clickcount["save"] - 1;
+                      this.$Message.success(msg);
+                      this.fetchData();
+                    } else {
+                      this.fm_status = "normal";
+                      this.showedform = false;
+                      this.$Message.error(
+                        "当前操作失败，请稍后重试或联系管理员."
+                      );
+                      this.fetchData();
+                    }
+                  });
                }
              });
            } else {

--- a/iview-admin/src/view/components/tables/forms/forms.vue
+++ b/iview-admin/src/view/components/tables/forms/forms.vue
@@ -424,7 +424,7 @@ export default {
            }
            if (
              ctl.type.indexOf("select") >= 0 ||
-              ctl.type.indexOf("checkgroups") >= 0
+              ctl.type.indexOf("checkgroup") >= 0
            ) {
              this.$set(this.formModel, ctl.prop, []);
            } else {

--- a/iview-admin/src/view/components/tables/forms/jsoneditor.vue
+++ b/iview-admin/src/view/components/tables/forms/jsoneditor.vue
@@ -145,7 +145,7 @@ export default {
                      this.currentData = data;
                      this.currentNode = node;
                      this.rootNode = root;
-                       this.selclick(root,node,data)
+                      this.selclick(root, node, data);
                    }
                  }
                },
@@ -235,8 +235,8 @@ export default {
    };
  },
  methods: {
-    selclick(root,node,data){
+    selclick(root, node, data) {
-        this.$emit("onselnode",root,node,data)
+      this.$emit("onselnode", root, node, data);
    },
    setCtlVisable(prop, b) {
      this.$refs.nodeform.setCtlVisable(prop, b);
@@ -291,14 +291,18 @@ export default {
    initTree() {
      //异步加载
      //按照当前公司加载组织结构,如果数据为空，那么就初始化一个根实体对象
-      if (this.initData && this.treedata.length==0) {
+      this.$nextTick(() => {
+        if (this.initData && this.treedata.length == 0) {
          this.initData(originalData => {
-          if((
+            if (
-            originalData &&
+              (originalData &&
                originalData[0] &&
                (!originalData.children ||
-              (originalData.children && originalData.children.length == 0))
+                  (originalData.children &&
-          ) || (originalData && originalData.length==0) || (!originalData)){
+                    originalData.children.length == 0))) ||
+              (originalData && originalData.length == 0) ||
+              !originalData
+            ) {
              this.originalRoot = Object.assign(
                this.originalRoot,
                originalData[0]
@@ -315,6 +319,7 @@ export default {
            }
          });
        }
+      });
    },
    setHeight() {
      let $orgcard = $("#orgcard");
@@ -323,6 +328,13 @@ export default {
      $orgcard.css("height", h + "px");
      this.treeheight = h;
    },
+    setSelCss($event){
+                  $("span", ".ptree").removeClass("spansel");
+                  $($event.target)
+                    .parent()
+                    .parent()
+                    .addClass("spansel");
+    },
    renderContent(h, { root, node, data }) {
      return h(
        "span",
@@ -338,18 +350,15 @@ export default {
            {
              on: {
                dblclick: $event => {
-                  $("span", ".ptree").removeClass("spansel");
+                  this.setSelCss( $event)
-                  $($event.target)
-                    .parent()
-                    .parent()
-                    .addClass("spansel");
                  this.onselnode(node, data);
                },
-                click: () => {
+                click: ($event) => {
+                   this.setSelCss( $event)
                  this.currentData = data;
                  this.currentNode = node;
                  this.rootNode = root;
-                  this.selclick(root,node,data)
+                  this.selclick(root, node, data);
                }
              }
            },
@@ -419,12 +428,12 @@ export default {
      const parent = root.find(el => el.nodeKey === parentKey).node;
      const index = parent.children.indexOf(data);
      parent.children.splice(index, 1);
-      this.$emit("deletenode",this.treedata,node)
+      this.$emit("deletenode", this.treedata, node);
    },
    findParentByNode(node) {
      const parentKey = this.rootNode.find(el => el === node).parent;
      const parent = this.rootNode.find(el => el.nodeKey === parentKey).node;
-      return parent
+      return parent;
    }
  }
 };