vue2-client 1.2.26 → 1.2.28-test1

package/src/base-client/plugins/AppData.js

@@ -1,5 +1,4 @@
-import { post } from '@vue2-client/services/api/restTools'
-import { manageApi } from '@vue2-client/services/api/manage'
+import { manageApi, post } from '@vue2-client/services/api'
 
 const GetAppDataService = {
   install (Vue) {

package/src/base-client/plugins/GetLoginInfoService.js

@@ -1,17 +1,6 @@
 import Vue from 'vue'
-import { SEARCH } from '@vue2-client/services/api'
-import { post } from '@vue2-client/services/api/restTools'
-
-const loginGen = async function (response) {
-  Vue.$login.f = response
-  await Promise.all([Vue.$appdata.load(), getGasman(), getLic(), getViewDetails()])
-  const login = {
-    f: Vue.$login.f,
-    jwt: Vue.$login.f.id,
-    r: Vue.$login.r
-  }
-  Vue.$store.commit('account/setLogin', login)
-}
+import { SEARCH } from '@vue2-client/services/apiService'
+import { post } from '@vue2-client/services/api'
 
 /**
  * 获取片区
@@ -107,7 +96,47 @@ async function getResourceFunction () {
     console.log('获取资源功能异常', error)
   }
 }
+/**
+ * 获取组织管理数据
+ * @returns {Promise<void>}
+ */
+async function getOrganization () {
+  try {
+    const resourceFunction = await post(SEARCH, {
+      source: 'tool.getFullTree(this.getRights().where(row.getType() == $organization$||row.getType() == $zone$))',
+      userid: Vue.$login.f.id
+    }, { resolveMsg: null, rejectMsg: null })
+    return resourceFunction
+  } catch (error) {
+    console.log('获取组织管理数据异常', error)
+  }
+}
+/**
+ * 完整资源树筛选指定名称的资源
+ * @param fun 要筛选的资源树
+ * @param name 筛选的资源名称
+ * @returns {*}
+ */
+function searchFun (fun, name) {
+  if (fun.length > 0) {
+    if (fun[0].name == name) {
+      return fun[0].children
+    } else {
+      return searchFun(fun[0].children, name)
+    }
+  }
+}
 
+const loginGen = async function (response) {
+  Vue.$login.f = response
+  await Promise.all([Vue.$appdata.load(), getGasman(), getLic(), getViewDetails()])
+  const login = {
+    f: Vue.$login.f,
+    jwt: Vue.$login.f.id,
+    r: Vue.$login.r
+  }
+  Vue.$store.commit('account/setLogin', login)
+}
 const GetLoginInfoService = {
   install (Vue) {
     // 给vue增添对话框显示方法
@@ -217,5 +246,7 @@ const GetLoginInfoService = {
 
 export default GetLoginInfoService
 export {
-  getResourceFunction
+  getResourceFunction,
+  getOrganization,
+  searchFun
 }

package/src/components/exception/ExceptionPage.vue

@@ -7,7 +7,7 @@
       <h1>{{ config[type].title }}</h1>
       <div class="desc">{{ config[type].desc }}</div>
       <div class="action">
-        <a-button type="primary" @click="backHome">返回首页</a-button>
+        <!--<a-button type="primary" @click="backHome">返回首页</a-button>-->
       </div>
     </div>
   </div>

package/src/config/CreateQueryConfig.js

@@ -1,40 +1,80 @@
-module.exports = {
-  queryType: [
-    {
-      label: '相等(=)', key: '=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '不相等(!=)', key: '!=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '全模糊(like)', key: 'LIKE', match: 'input;select;radio;cascader;selects'
-    },
-    {
-      label: '左模糊(left like)', key: 'LEFT_LIKE', match: 'input;select;radio;cascader;selects'
-    },
-    {
-      label: '右模糊(right like)', key: 'RIGHT_LIKE', match: 'input;select;radio;cascader;selects'
-    },
-    {
-      label: '大于(>)', key: '>', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '大于等于(>=)', key: '>=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '小于(<)', key: '<', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '小于等于(<=)', key: '<=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
-    },
-    {
-      label: '包含(in)', key: 'IN', match: 'checkbox;select;cascader;selects'
-    },
-    {
-      label: '不包含(not in)', key: 'NOT_IN', match: 'checkbox;select;cascader;selects'
-    },
-    {
-      label: '之间(between)', key: 'BETWEEN', match: 'rangePicker'
-    }
-  ]
-}
+module.exports = {
+  // 文件上传类型
+  file_ype: [
+    {
+      label: 'word文档',
+      accept: '.doc,.docx,'
+    },
+    {
+      label: 'excel表格',
+      accept: '.xlsx,.xls,'
+    },
+    {
+      label: 'ppt幻灯片',
+      accept: '.ppt,.pptx,'
+    },
+    {
+      label: '图片',
+      accept: '.jpg,.jpeg,.ico,.gif,svg,.webp,.png,.bmp,.pjpeg,'
+    },
+    {
+      label: '视频',
+      accept: '.mp4,.mov,.m4v,.wmv,.asf,.asx,.rm,.rmvb,.3gp,.avi,.mkv,'
+    },
+    {
+      label: '音频',
+      accept: '.mp3,.cda,.wav,.aif,.aiff,.ape,.ra,'
+    },
+    {
+      label: '压缩包',
+      accept: '.zip,.rar,.7z,'
+    },
+    {
+      label: '其他文本',
+      accept: '.json,.txt,'
+    },
+    {
+      label: '无限制',
+      accept: '*'
+    },
+  ],
+  // 查询方式
+  queryType: [
+    {
+      label: '相等(=)', key: '=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '不相等(!=)', key: '!=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '全模糊(like)', key: 'LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '左模糊(left like)', key: 'LEFT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '右模糊(right like)', key: 'RIGHT_LIKE', match: 'input;select;radio;cascader;selects'
+    },
+    {
+      label: '大于(>)', key: '>', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '大于等于(>=)', key: '>=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于(<)', key: '<', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '小于等于(<=)', key: '<=', match: 'input;select;radio;monthPicker;datePicker;cascader;selects'
+    },
+    {
+      label: '包含(in)', key: 'IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '不包含(not in)', key: 'NOT_IN', match: 'checkbox;select;cascader;selects'
+    },
+    {
+      label: '之间(between)', key: 'BETWEEN', match: 'rangePicker'
+    }
+  ]
+}

package/src/layouts/ComponentLayoutOne.vue

@@ -35,7 +35,6 @@
 </script>
 
 <style lang="less">
-  @import '~ant-design-vue/../../src/theme/index';
   #ComponentLayoutOne {
     .ant-layout-sider {
       .ant-layout-sider-zero-width-trigger {

package/src/layouts/SinglePageView.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import PageToggleTransition from '../components/transition/PageToggleTransition'
+import PageToggleTransition from '@vue2-client/components/transition/PageToggleTransition'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import { mapState, mapMutations } from 'vuex'
 

package/src/layouts/header/HeaderNotice.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 export default {
   name: 'HeaderNotice',
   data () {

package/src/pages/report/ReportTableHome.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-  import { post } from '@vue2-client/services/api/restTools'
+  import { post } from '@vue2-client/services/api'
   import ReportTable from '@vue2-client/pages/report/ReportTable'
   export default {
     name: 'ReportTableHome',

package/src/pages/resourceManage/depListManage.vue

@@ -0,0 +1,23 @@
+<template>
+  <div id="depListManage">
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'depListManage',
+    data () {
+      return {}
+    },
+    created () {
+    },
+    mounted () {
+    },
+    methods: {}
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/pages/resourceManage/funListManage.vue

@@ -0,0 +1,23 @@
+<template>
+  <div id="funListManage">
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'funListManage',
+    data () {
+      return {}
+    },
+    created () {
+    },
+    mounted () {
+    },
+    methods: {}
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/pages/resourceManage/index.js

@@ -0,0 +1,15 @@
+import depListManage from '@vue2-client/pages/resourceManage/depListManage'
+import funListManage from '@vue2-client/pages/resourceManage/funListManage'
+import orgListManage from '@vue2-client/pages/resourceManage/orgListManage'
+import resourceManageMain from '@vue2-client/pages/resourceManage/resourceManageMain'
+import roleListManage from '@vue2-client/pages/resourceManage/roleListManage'
+import staffListManage from '@vue2-client/pages/resourceManage/staffListManage'
+
+export default resourceManageMain
+export {
+  depListManage,
+  funListManage,
+  orgListManage,
+  roleListManage,
+  staffListManage
+}

package/src/pages/resourceManage/orgListManage.vue

@@ -0,0 +1,98 @@
+<template>
+  <div id="orgListManage">
+    <a-card :bordered="false">
+      <!--<a-row :gutter="48">-->
+        <!--<a-col>-->
+          <!--<a-space>-->
+            <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
+              <!--<a-icon :style="iconStyle" type="plus"/>新增-->
+            <!--</a-button>-->
+            <!--<a-button-->
+              <!--v-if="!buttonState || buttonState.edit"-->
+              <!--:loading="editDataLoading"-->
+              <!--:disabled="!isModify"-->
+              <!--class="btn-success"-->
+              <!--type="dashed"-->
+              <!--@click="editItem">-->
+              <!--<a-icon :style="iconStyle" type="edit"/>修改-->
+            <!--</a-button>-->
+            <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
+              <!--<a-icon :style="iconStyle" type="delete"/>删除-->
+            <!--</a-button>-->
+          <!--</a-space>-->
+          <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
+            <!--<a-button-group>-->
+              <!--<a-button @click="toggleIsFormShow">-->
+                <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
+              <!--</a-button>-->
+              <!--<a-button @click="refresh(true)">-->
+                <!--<a-icon :style="iconStyle" type="reload" />-->
+              <!--</a-button>-->
+              <!--<a-button @click="showDrawer">-->
+                <!--<a-icon :style="iconStyle" type="table" />-->
+              <!--</a-button>-->
+              <!--<a-button @click="exports">-->
+                <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
+              <!--</a-button>-->
+            <!--</a-button-group>-->
+          <!--</span>-->
+        <!--</a-col>-->
+      <!--</a-row>-->
+      <a-table
+        rowKey="id"
+        size="middle"
+        bordered
+        :pagination="false"
+        :columns="columns"
+        :data-source="funTree">
+      </a-table>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
+  import { getColumnsJson } from '@vue2-client/services/api'
+  export default {
+    // 组织管理
+    name: 'orgListManage',
+    data () {
+      return {
+        columnsJson: [],
+        funTree: [],
+        columns: [
+          {
+            title: '组织名称',
+            dataIndex: 'name'
+          },
+          {
+            title: '排序',
+            dataIndex: 'position'
+          },
+          {
+            title: '组件目录',
+            dataIndex: 'f_dir'
+          },
+          {
+            title: '描述',
+            dataIndex: 'f_description'
+          }
+        ]
+      }
+    },
+    created () {
+    },
+    async mounted () {
+      getColumnsJson('orgListManage', (res) => {
+        this.columnsJson = res
+      })
+      const fun = await getOrganization()
+      this.funTree = searchFun(fun, '组织机构')
+    },
+    methods: {
+    }
+  }
+</script>
+
+<style lang="less">
+</style>

package/src/pages/resourceManage/resourceManageMain.vue

@@ -1,55 +1,58 @@
-<!--<template>-->
-  <!--<div id="resourceManageMain">-->
-    <!--<a-tabs>-->
-      <!--<a-tab-pane key="1" force-render>-->
-        <!--<span slot="tab"><a-icon type="apartment" />资源管理</span>-->
-        <!--Content of Tab Pane 1-->
-      <!--</a-tab-pane>-->
-      <!--<a-tab-pane key="2" tab="功能管理" force-render>-->
-        <!--Content of Tab Pane 2-->
-      <!--</a-tab-pane>-->
-      <!--<a-tab-pane key="3" tab="部门管理" force-render>-->
-        <!--Content of Tab Pane 3-->
-      <!--</a-tab-pane>-->
-    <!--</a-tabs>-->
-  <!--</div>-->
-<!--</template>-->
-
 <script>
-  import { mapState } from 'vuex'
-  import { getResourceFunction } from '@vue2-client/base-client/plugins/GetLoginInfoService'
+  import { depListManage, funListManage, orgListManage, roleListManage, staffListManage } from '@vue2-client/pages/resourceManage'
+  import exp403 from '@vue2-client/pages/exception/403'
+  import { getResourceFunction, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
 
   export default {
     name: 'resourceManageMain',
-    computed: {
-      ...mapState('account', ['login'])
-    },
+    components: { depListManage, funListManage, orgListManage, roleListManage, staffListManage },
     data () {
       return {
+        renderSW: false,
         resFun: []
       }
     },
+    render () {
+      if (!this.renderSW) return
+      if (!this.resFun || this.resFun.length <= 0) {
+        return (
+          <div id="resourceManageMain">
+            <exp403></exp403>
+          </div>
+        )
+      }
+      const tabPane = []
+      for (const [index, row] of this.resFun.entries()) {
+        tabPane.push(
+          <a-tab-pane key={index} force-render>
+            <span slot="tab"><a-icon type={row.icon || 'exclamation'}/>{row.name}</span>
+            <row.link></row.link>
+          </a-tab-pane>
+        )
+      }
+      return (
+        <div id="resourceManageMain">
+          <a-tabs>
+            {tabPane}
+          </a-tabs>
+        </div>
+      )
+    },
     created () {
     },
     async mounted () {
       const fun = await getResourceFunction()
-      console.log('->', fun)
-      this.resFun = this.searchFun(fun, '资源功能')
+      this.resFun = searchFun(fun, '资源功能')
+      this.renderSW = true
     },
     methods: {
-      searchFun (fun, name) {
-        if (fun.length > 0) {
-          if (fun[0].name == name) {
-            return fun[0].children
-          } else {
-            return this.searchFun(fun[0].children, name)
-          }
-        }
-      }
     }
   }
 </script>
 
 <style lang="less">
-
+  #resourceManageMain {
+    background-color: @gray-1;
+    height: calc(100vh - 117px);
+  }
 </style>

package/src/pages/resourceManage/roleListManage.vue

@@ -0,0 +1,23 @@
+<template>
+  <div id="roleListManage">
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'roleListManage',
+    data () {
+      return {}
+    },
+    created () {
+    },
+    mounted () {
+    },
+    methods: {}
+  }
+</script>
+
+<style lang="less">
+
+</style>

package/src/pages/resourceManage/staffListManage.vue

@@ -0,0 +1,23 @@
+<template>
+  <div id="staffListManage">
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'staffListManage',
+    data () {
+      return {}
+    },
+    created () {
+    },
+    mounted () {
+    },
+    methods: {}
+  }
+</script>
+
+<style lang="less">
+
+</style>