vue2-client 1.2.42 → 1.2.45

package/src/pages/login/Login.vue

@@ -2,7 +2,7 @@
   <common-layout>
     <div class="top">
       <div class="header">
-        <img alt="logo" class="logo" src="@/assets/img/logo.png" />
+        <img alt="logo" class="logo" src="@vue2-client/assets/img/logo.png" />
         <span class="title">{{ systemName }}</span>
       </div>
       <div class="desc">{{ systemDesc }}</div>
@@ -57,14 +57,12 @@ import CommonLayout from '@vue2-client/layouts/CommonLayout'
 import { getRoutesConfig, login } from '@vue2-client/services/user'
 import { setAuthorization } from '@vue2-client/utils/request'
 import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
-import { mapMutations } from 'vuex'
+import { mapMutations, mapState } from 'vuex'
 import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import Vue from 'vue'
 import { positions } from '@vue2-client/mock/common'
 import { timeFix } from '@vue2-client/utils/util'
-const { homePage, ticketPage } = require('@vue2-client/config')
-// import { router } from '@vue2-client/mock/user/routes'
 
 export default {
   name: 'Login',
@@ -77,12 +75,7 @@ export default {
     }
   },
   computed: {
-    systemName () {
-      return this.$store.state.setting.systemName
-    },
-    systemDesc () {
-      return this.$store.state.setting.systemDesc
-    }
+    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage'])
   },
   methods: {
     ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
@@ -127,9 +120,9 @@ export default {
             setAuthorization({ token: data, expireAt: dateAfter })
             loadRoutes(funcToRouter(user.functions))
             if (result.deps === '用户工单登记') {
-              this.$router.push(ticketPage).catch(() => {})
+              this.$router.push(this.ticketPage).catch(() => {})
             } else {
-              this.$router.push(homePage).catch(() => {})
+              this.$router.push(this.homePage).catch(() => {})
             }
             this.$message.success(timeFix().CN + '，欢迎回来', 3)
           })

package/src/pages/report/ReportTableHome.vue

@@ -1,28 +1,28 @@
-<template>
-  <report-table :tableData="tableData"></report-table>
-</template>
-
-<script>
-  import { post } from '@vue2-client/services/api'
-  import ReportTable from '@vue2-client/pages/report/ReportTable'
-  export default {
-    name: 'ReportTableHome',
-    components: { ReportTable },
-    data () {
-      return {
-        tableData: null
-      }
-    },
-    created () {
-    },
-    mounted () {
-      this.getData()
-    },
-    methods: {
-      async getData () {
-        this.tableData = await post('webmeterapi/reportTest', {})
-        console.log('数据=>', JSON.stringify(this.tableData))
-      }
-    }
-  }
-</script>
+<template>
+  <report-table :tableData="tableData"></report-table>
+</template>
+
+<script>
+  import { post } from '@vue2-client/services/api'
+  import ReportTable from '@vue2-client/pages/report/ReportTable'
+  export default {
+    name: 'ReportTableHome',
+    components: { ReportTable },
+    data () {
+      return {
+        tableData: null
+      }
+    },
+    created () {
+    },
+    mounted () {
+      this.getData()
+    },
+    methods: {
+      async getData () {
+        this.tableData = await post('webmeterapi/reportTest', {})
+        console.log('数据=>', JSON.stringify(this.tableData))
+      }
+    }
+  }
+</script>

package/src/pages/resourceManage/depListManage.vue

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

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

@@ -1,15 +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
-}
+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

@@ -1,98 +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>
+<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/roleListManage.vue

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

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

package/src/pages/system/ticket/index.vue

@@ -239,7 +239,7 @@
 
 <script>
 import { TicketDetailsViewApi, post } from '@vue2-client/services/api'
-import { logout } from '@/services/user'
+import { logout } from '@vue2-client/services/user'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import Vue from 'vue'