vue2-client 1.4.54 → 1.4.56

package/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.4.54 -2022-11-21 @陈栋杨**
+**1.4.54 - 1.4.56 -2022-11-25 @江超**
 - 现在登录时会清除indexedDB缓存了
+- 增加查询系统访问记录的接口
+- 优化单页面组件显示效果
 
 **1.4.53 -2022-11-21 @陈栋杨**
 - 优化单页面组件传值方式

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.54",
+  "version": "1.4.56",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/layouts/SinglePageView.vue

@@ -1,106 +1,111 @@
-<template>
-  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <template v-if="login">
-      <div style="padding-top: 1px; background-color: #fff;">
-        <iframe
-          ref="singlepage"
-          :src="url"
-          :name="this.fullPath"
-          class="single-page-iframe"
-          @load="load">
-        </iframe>
-      </div>
-    </template>
-  </page-toggle-transition>
-</template>
-
-<script>
-import PageToggleTransition from '@vue2-client/components/transition/PageToggleTransition'
-import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import { mapState, mapMutations } from 'vuex'
-import { CASLogin, doOtherValidate } from '@vue2-client/services/api/cas'
-
-export default {
-  name: 'SinglePageView',
-  components: { PageToggleTransition },
-  props: {
-    singlePageUrl: {
-      type: String,
-      default: ''
-    },
-    fullPath: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      iframe: null,
-      url: ''
-    }
-  },
-  computed: {
-    ...mapState('setting', ['animate', 'iframeSrc']),
-    ...mapState('account', ['login'])
-  },
-  created () {
-    if (this.singlePageUrl.indexOf('sso:') !== -1) {
-      const serviceKey = this.singlePageUrl.substring(4)
-      CASLogin(serviceKey, true).then(res => {
-        const redirectUrl = res.redirectUrl
-        if (redirectUrl.indexOf('logic@') !== -1) {
-          const logicName = redirectUrl.substring(6)
-          doOtherValidate(logicName, res.st, serviceKey).then(validateRes => {
-            this.url = validateRes.redirectUrl
-          })
-        } else {
-          const join = redirectUrl.split('?')[1] ? '&' : '?'
-          this.url = redirectUrl + join + 'ticket=' + res.st
-        }
-      }).catch(msg => {
-        console.warn(msg)
-        this.$message.error(msg)
-      })
-    } else {
-      this.url = this.iframeSrc
-    }
-  },
-  mounted () {
-    if (!this.login) {
-      this.setLogin(JSON.parse(sessionStorage.getItem(process.env.VUE_APP_LOGIN_KEY)))
-    }
-    this.iframe = this.$refs.singlepage.contentWindow
-    this.path = this.$route.path
-  },
-  methods: {
-    ...mapMutations('account', ['setLogin']),
-    load () {
-      if (this.singlePageUrl.indexOf('sso:') === -1) {
-        const appdata = {
-          singleValues: this.$appdata.getSingleValues(),
-          params: this.$appdata.getParams()
-        }
-        const data = {
-          token: localStorage.getItem(ACCESS_TOKEN),
-          login: this.login,
-          appdata: appdata,
-          page: this.singlePageUrl
-        }
-        console.log('发送参数', data)
-        if (this.iframe) {
-          this.iframe.postMessage(data, '*')
-        }
-      }
-      this.$emit('load', this.fullPath)
-    }
-  }
-}
-</script>
-
-<style lang="less">
-.single-page-iframe {
-  width: 100%;
-  height: calc(100vh - 117px);
-  border: none;
-}
-</style>
+<template>
+  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
+    <template v-if="login">
+      <a-spin tip="加载中，马上好" :spinning="!isLoaded">
+        <a-card>
+          <iframe
+            ref="singlepage"
+            :src="url"
+            :name="this.fullPath"
+            class="single-page-iframe"
+            @load="load">
+          </iframe>
+        </a-card>
+      </a-spin>
+    </template>
+  </page-toggle-transition>
+</template>
+
+<script>
+import PageToggleTransition from '@vue2-client/components/transition/PageToggleTransition'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+import { mapState, mapMutations } from 'vuex'
+import { CASLogin, doOtherValidate } from '@vue2-client/services/api/cas'
+
+export default {
+  name: 'SinglePageView',
+  components: { PageToggleTransition },
+  props: {
+    singlePageUrl: {
+      type: String,
+      default: ''
+    },
+    fullPath: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      iframe: null,
+      url: '',
+      isLoaded: false,
+    }
+  },
+  computed: {
+    ...mapState('setting', ['animate', 'iframeSrc']),
+    ...mapState('account', ['login'])
+  },
+  created () {
+    this.isLoaded = false
+    if (this.singlePageUrl.indexOf('sso:') !== -1) {
+      const serviceKey = this.singlePageUrl.substring(4)
+      CASLogin(serviceKey, true).then(res => {
+        const redirectUrl = res.redirectUrl
+        if (redirectUrl.indexOf('logic@') !== -1) {
+          const logicName = redirectUrl.substring(6)
+          doOtherValidate(logicName, res.st, serviceKey).then(validateRes => {
+            this.url = validateRes.redirectUrl
+          })
+        } else {
+          const join = redirectUrl.split('?')[1] ? '&' : '?'
+          this.url = redirectUrl + join + 'ticket=' + res.st
+        }
+      }).catch(msg => {
+        console.warn(msg)
+        this.$message.error(msg)
+      })
+    } else {
+      this.url = this.iframeSrc
+    }
+  },
+  mounted () {
+    if (!this.login) {
+      this.setLogin(JSON.parse(sessionStorage.getItem(process.env.VUE_APP_LOGIN_KEY)))
+    }
+    this.iframe = this.$refs.singlepage.contentWindow
+    this.path = this.$route.path
+  },
+  methods: {
+    ...mapMutations('account', ['setLogin']),
+    load () {
+      if (this.singlePageUrl.indexOf('sso:') === -1) {
+        const appdata = {
+          singleValues: this.$appdata.getSingleValues(),
+          params: this.$appdata.getParams()
+        }
+        const data = {
+          token: localStorage.getItem(ACCESS_TOKEN),
+          login: this.login,
+          appdata: appdata,
+          page: this.singlePageUrl
+        }
+        console.log('发送参数', data)
+        if (this.iframe) {
+          this.iframe.postMessage(data, '*')
+        }
+      }
+      this.$emit('load', this.fullPath)
+      this.isLoaded = true
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.single-page-iframe {
+  width: 100%;
+  height: calc(100vh - 117px);
+  border: none;
+}
+</style>

package/src/pages/CreateQueryPage.vue

@@ -1,65 +1,84 @@
-<template>
-  <div>
-    <create-query
-      :visible.sync="visible"
-      @saveQueryParams="saveQueryParams"
-    />
-    <create-simple-form-query
-      :visible.sync="createSimpleFormVisible"
-      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
-    />
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具</a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">打开基础表单配置生成工具</a-button>
-    <!--    <webmeter-analysis-view/>-->
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api/restTools'
-import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-
-export default {
-  name: 'CreateQueryPage',
-  components: {
-    CreateQuery,
-    CreateSimpleFormQuery
-  },
-  data () {
-    return {
-      visible: false,
-      createSimpleFormVisible: false
-    }
-  },
-  methods: {
-    showDrawer () {
-      this.visible = true
-    },
-    showSimpleFormQueryParamsDrawer () {
-      this.createSimpleFormVisible = true
-    },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      return post('/api/af-system/logic/addOrEditQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存查询配置成功')
-      }, err => {
-        console.error(err)
-      })
-    },
-    // 存储基础表单配置信息
-    saveSimpleFormQueryParams (source) {
-      return post('/api/af-system/logic/addOrEditSimpleFormQueryParams', {
-        source: source
-      }).then(res => {
-        this.$message.success('保存基础表单配置成功')
-      }, err => {
-        console.error(err)
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-</style>
+<template>
+  <div>
+    <create-query
+      :visible.sync="visible"
+      @saveQueryParams="saveQueryParams"
+    />
+    <create-simple-form-query
+      :visible.sync="createSimpleFormVisible"
+      @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
+    />
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">
+      打开基础表单配置生成工具
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="searchReport">请求数据</a-button>
+    <!--    <webmeter-analysis-view/>-->
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api/restTools'
+import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+
+export default {
+  name: 'CreateQueryPage',
+  components: {
+    CreateQuery,
+    CreateSimpleFormQuery
+  },
+  data () {
+    return {
+      visible: false,
+      createSimpleFormVisible: false
+    }
+  },
+  methods: {
+    showDrawer () {
+      this.visible = true
+    },
+    showSimpleFormQueryParamsDrawer () {
+      this.createSimpleFormVisible = true
+    },
+    // 查询report
+    searchReport (source) {
+      return post('/rs/report/saleMonthReport', {
+        'data': {
+          'condition': ' 1=1 ',
+          'startDate': '2022-11-21 00:00:00',
+          'endDate': '2022-11-21 23:59:59',
+          'f_orgid': 'f_orgid in (21142)'
+        }
+      }).then(res => {
+        this.$message.success(res)
+      }, err => {
+        console.error(err)
+      })
+    },
+    // 存储查询配置信息
+    saveQueryParams (source) {
+      return post('/api/af-system/logic/addOrEditQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存查询配置成功')
+      }, err => {
+        console.error(err)
+      })
+    },
+    // 存储基础表单配置信息
+    saveSimpleFormQueryParams (source) {
+      return post('/api/af-system/logic/addOrEditSimpleFormQueryParams', {
+        source: source
+      }).then(res => {
+        this.$message.success('保存基础表单配置成功')
+      }, err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+</style>

package/src/pages/ReportView.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <div id="reportContent">
+      <table style="margin: 0px auto" v-html="model"> </table>
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api/restTools'
+
+export default {
+  name: 'ReportView',
+  data () {
+    return {
+      model: ''
+    }
+  },
+  props: ['data'],
+  methods: {
+    // 查询report
+    searchReport (source) {
+      return post('/rs/report/saleMonthReport', {
+        // data: this.data.data
+        data: this.data['data']
+      }).then(res => {
+        this.model = res
+      }).catch(err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+#reportContent {
+  margin-top: 5px;
+}
+</style>
+<style>
+#reportContent .report-primary{
+  background-color: #dfedfb;
+  border: 1px solid #d8d7d7;
+  border-collapse: collapse;
+}
+#reportContent .report-success{
+  border: 1px solid #d8d7d7;
+  border-collapse: collapse;
+}
+</style>

package/src/router/async/router.map.js

@@ -1,65 +1,67 @@
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: '/login',
-    component: view.tabs
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 报表测试用页面
+routerResource.testPage = () => import('@vue2-client/pages/ReportView.vue')
+// 字典管理
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: '/login',
+    component: view.tabs
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

package/src/services/api/logininfor/index.js

@@ -0,0 +1,6 @@
+const loginforApi = {
+  // 查询：获取系统访问记录
+  query: '/api/af-system/logic/getLogininfor'
+}
+
+export { loginforApi }

package/vue.config.js

@@ -8,7 +8,7 @@ const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
-const server = 'http://121.36.106.17:8400'
+const server = 'http://123.60.214.109:8406'
 // const local = 'http://localhost:8445/webmeter'
 const local = 'http://123.60.214.109:8406'
 // const local = 'http://localhost:8080'
@@ -19,6 +19,11 @@ module.exports = {
     port: 8001,
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
+      '/rs/report': {
+        target: 'http://192.168.50.4:8400',
+        ws: false,
+        changeOrigin: true
+      },
       '/rs': {
         target: server,
         ws: false,
@@ -30,7 +35,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api': {
-        pathRewrite: { '^/api/af-system/': '/rs/' },
+        // pathRewrite: { '^/api/af-system/': '/rs/' },
         // pathRewrite: { '^/api': '/' },
         target: local,
         changeOrigin: true