vue2-client 1.2.42 → 1.2.45

package/src/config/default/setting.config.js

@@ -1,35 +1,39 @@
-// 此配置为系统默认设置
-module.exports = {
-  lang: 'CN', // 语言，可选 CN(简体)、HK(繁体)、US(英语)，也可扩展其它语言
-  theme: { // 主题
-    color: '#1890ff', // 主题色
-    mode: 'dark', // 主题模式 可选 dark、 light 和 night
-    success: '#52c41a', // 成功色
-    warning: '#faad14', // 警告色
-    error: '#f5222f' // 错误色
-  },
-  layout: 'side', // 导航布局，可选 side 和 head，分别为侧边导航和顶部导航
-  fixedHeader: true, // 固定头部状态栏，true:固定，false:不固定
-  fixedSideBar: true, // 固定侧边栏，true:固定，false:不固定
-  fixedTabs: true, // 固定页签头，true:固定，false:不固定
-  pageWidth: 'fixed', // 内容区域宽度，fixed:固定宽度，fluid:流式宽度
-  weekMode: false, // 色弱模式，true:开启，false:不开启
-  multiPage: true, // 多页签模式，true:开启，false:不开启
-  cachePage: true, // 是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
-  hideSetting: false, // 隐藏设置抽屉，true:隐藏，false:不隐藏
-  homePage: '/system/dictionaryManage', // 首页路由, 登陆后默认打开
-  ticketPage: '/submitTicket', // 提交工单路由
-  systemName: '基础组件平台', // 系统名称
-  systemDesc: '为PC端中、后台系统业务开发提供支持', // 系统描述
-  copyright: '2022 AoFengSoft', // copyright
-  asyncRoutes: true, // 异步加载路由，true:开启，false:不开启
-  showPageTitle: true, // 是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示
-  filterMenu: true, // 根据权限过滤菜单，true:过滤，false:不过滤
-  animate: { // 动画设置
-    disabled: true, // 禁用动画，true:禁用，false:启用
-    name: 'lightSpeed', // 动画效果，支持的动画效果可参考 ./animate.config.js
-    direction: 'left' // 动画方向，切换页面时动画的方向，参考 ./animate.config.js
-  },
-  footerLinks: [ // 页面底部链接，{link: '链接地址', name: '名称/显示文字', icon: '图标，支持 ant design vue 图标库'}
-  ]
-}
+// 此配置为系统默认设置
+module.exports = {
+  lang: 'CN', // 语言，可选 CN(简体)、HK(繁体)、US(英语)，也可扩展其它语言
+  theme: { // 主题
+    color: '#1890ff', // 主题色
+    mode: 'dark', // 主题模式 可选 dark、 light 和 night
+    success: '#52c41a', // 成功色
+    warning: '#faad14', // 警告色
+    error: '#f5222f' // 错误色
+  },
+  layout: 'side', // 导航布局，可选 side 和 head，分别为侧边导航和顶部导航
+  fixedHeader: true, // 固定头部状态栏，true:固定，false:不固定
+  fixedSideBar: true, // 固定侧边栏，true:固定，false:不固定
+  fixedTabs: true, // 固定页签头，true:固定，false:不固定
+  pageWidth: 'fixed', // 内容区域宽度，fixed:固定宽度，fluid:流式宽度
+  weekMode: false, // 色弱模式，true:开启，false:不开启
+  multiPage: true, // 多页签模式，true:开启，false:不开启
+  cachePage: true, // 是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
+  hideSetting: false, // 隐藏设置抽屉，true:隐藏，false:不隐藏
+  homePage: '/system/dictionaryManage', // 首页路由, 登陆后默认打开
+  ticketPage: '/submitTicket', // 提交工单路由
+  systemName: '基础组件平台', // 系统名称
+  systemDesc: '为PC端中、后台系统业务开发提供支持', // 系统描述
+  copyright: '2022 AoFengSoft', // copyright
+  asyncRoutes: true, // 异步加载路由，true:开启，false:不开启
+  showPageTitle: true, // 是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示
+  filterMenu: true, // 根据权限过滤菜单，true:过滤，false:不过滤
+  animate: { // 动画设置
+    disabled: true, // 禁用动画，true:禁用，false:启用
+    name: 'lightSpeed', // 动画效果，支持的动画效果可参考 ./animate.config.js
+    direction: 'left' // 动画方向，切换页面时动画的方向，参考 ./animate.config.js
+  },
+  footerLinks: [ // 页面底部链接，{link: '链接地址', name: '名称/显示文字', icon: '图标，支持 ant design vue 图标库'}
+  ],
+  // 旧系统路径
+  iframeSrc: '../../singlepage/page.html',
+  // 兼容V2版本系统 true:启用, false:禁用
+  compatibleV2: false
+}

package/src/config/index.js

@@ -1,3 +1,3 @@
-const { setting } = require('./default')
-
-module.exports = setting
+const { setting } = require('./default')
+
+module.exports = setting

package/src/layouts/SinglePageView.vue

@@ -1,70 +1,78 @@
-<template>
-  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <template v-if="login">
-      <iframe
-        ref="singlepage"
-        :src="iframeSrc"
-        class="single-page-iframe"
-        @load="load">
-      </iframe>
-    </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'
-
-export default {
-  name: 'SinglePageView',
-  components: { PageToggleTransition },
-  props: {
-    singlePageUrl: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      iframeSrc: '../singlepage/page.html',
-      iframe: null
-    }
-  },
-  computed: {
-    ...mapState('setting', ['animate']),
-    ...mapState('account', ['login'])
-  },
-  mounted () {
-    if (!this.login) {
-      this.setLogin(JSON.parse(sessionStorage.getItem(process.env.VUE_APP_LOGIN_KEY)))
-    }
-    this.iframe = this.$refs.singlepage.contentWindow
-  },
-  methods: {
-    ...mapMutations('account', ['setLogin']),
-    load () {
-      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)
-      this.iframe?.postMessage(data, '*')
-    }
-  }
-}
-</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">
+      <iframe
+        ref="singlepage"
+        :src="iframeSrc"
+        :name="this.fullPath"
+        class="single-page-iframe"
+        @load="load">
+      </iframe>
+    </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'
+
+export default {
+  name: 'SinglePageView',
+  components: { PageToggleTransition },
+  props: {
+    singlePageUrl: {
+      type: String,
+      default: ''
+    },
+    fullPath: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      iframe: null
+    }
+  },
+  computed: {
+    ...mapState('setting', ['animate', 'iframeSrc']),
+    ...mapState('account', ['login'])
+  },
+  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 () {
+      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>

package/src/layouts/header/AdminHeader.vue

@@ -2,7 +2,7 @@
   <a-layout-header :class="[headerTheme, 'admin-header']">
     <div :class="['admin-header-wide', layout, pageWidth]">
       <router-link v-if="isMobile || layout === 'head'" to="/" :class="['logo', isMobile ? null : 'pc', headerTheme]">
-        <img width="32" src="@/assets/img/logo.png" />
+        <img width="32" src="@vue2-client/assets/img/logo.png" />
         <h1 v-if="!isMobile">{{ systemName }}</h1>
       </router-link>
       <a-divider v-if="isMobile" type="vertical" />

package/src/layouts/header/HeaderNotice.vue

@@ -1,97 +1,97 @@
-<template>
-  <a-dropdown :trigger="['click']" v-model="show">
-    <div slot="overlay">
-      <a-spin :spinning="loading">
-        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
-          <a-tab-pane tab="通知" key="1">
-            <a-list>
-              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
-                <a-list-item-meta :title="'设备号'+ item.e_f_device_id" :description="item.e_f_error_msg" @click="read(item)">
-                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="消息" key="2">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="待办" key="3">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-        </a-tabs>
-      </a-spin>
-    </div>
-    <span @click="fetchNotice" class="header-notice">
-      <a-badge class="notice-badge" :count=" exception.length">
-        <a-icon :class="['header-notice-icon']" type="bell" />
-      </a-badge>
-    </span>
-  </a-dropdown>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-export default {
-  name: 'HeaderNotice',
-  data () {
-    return {
-      loading: false,
-      show: false,
-      exception: []
-    }
-  },
-  computed: {
-  },
-  created () {
-    this.refresh()
-  },
-  methods: {
-    read (item) {
-      post('/webmeterapi/saveSingleTable', { data: { tablename: 't_iot_device_exception', param: { id: item.e_id, f_is_read: 1 } } }).then(res => {
-        this.refresh()
-      })
-    },
-    refresh () {
-      post('/webmeterapi/commonQuery', { queryParamsName: 'deviceExceptionQueryParams', conditionParams: { e_f_is_read: 0 }, pageNo: 1, pageSize: 999999 }).then(res => {
-        this.exception = res.data
-      })
-    },
-    fetchNotice () {
-      if (this.loading) {
-        this.loading = false
-        return
-      }
-      this.loadding = true
-      setTimeout(() => {
-        this.loadding = false
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .header-notice{
-    display: inline-block;
-    transition: all 0.3s;
-    span {
-      vertical-align: initial;
-    }
-    .notice-badge{
-      color: inherit;
-      .header-notice-icon{
-        font-size: 16px;
-        padding: 4px;
-      }
-    }
-  }
-  .dropdown-tabs{
-    background-color: @base-bg-color;
-    box-shadow: 0 2px 8px @shadow-color;
-    border-radius: 4px;
-    .tab-pane{
-      padding: 0 24px 12px;
-      min-height: 250px;
-    }
-  }
-</style>
+<template>
+  <a-dropdown :trigger="['click']" v-model="show">
+    <div slot="overlay">
+      <a-spin :spinning="loading">
+        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
+          <a-tab-pane tab="通知" key="1">
+            <a-list>
+              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
+                <a-list-item-meta :title="'设备号'+ item.e_f_device_id" :description="item.e_f_error_msg" @click="read(item)">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+            </a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="消息" key="2">
+            <a-list class="tab-pane"></a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="待办" key="3">
+            <a-list class="tab-pane"></a-list>
+          </a-tab-pane>
+        </a-tabs>
+      </a-spin>
+    </div>
+    <span @click="fetchNotice" class="header-notice">
+      <a-badge class="notice-badge" :count=" exception.length">
+        <a-icon :class="['header-notice-icon']" type="bell" />
+      </a-badge>
+    </span>
+  </a-dropdown>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+export default {
+  name: 'HeaderNotice',
+  data () {
+    return {
+      loading: false,
+      show: false,
+      exception: []
+    }
+  },
+  computed: {
+  },
+  created () {
+    this.refresh()
+  },
+  methods: {
+    read (item) {
+      post('/webmeterapi/saveSingleTable', { data: { tablename: 't_iot_device_exception', param: { id: item.e_id, f_is_read: 1 } } }).then(res => {
+        this.refresh()
+      })
+    },
+    refresh () {
+      post('/webmeterapi/commonQuery', { queryParamsName: 'deviceExceptionQueryParams', conditionParams: { e_f_is_read: 0 }, pageNo: 1, pageSize: 999999 }).then(res => {
+        this.exception = res.data
+      })
+    },
+    fetchNotice () {
+      if (this.loading) {
+        this.loading = false
+        return
+      }
+      this.loadding = true
+      setTimeout(() => {
+        this.loadding = false
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .header-notice{
+    display: inline-block;
+    transition: all 0.3s;
+    span {
+      vertical-align: initial;
+    }
+    .notice-badge{
+      color: inherit;
+      .header-notice-icon{
+        font-size: 16px;
+        padding: 4px;
+      }
+    }
+  }
+  .dropdown-tabs{
+    background-color: @base-bg-color;
+    box-shadow: 0 2px 8px @shadow-color;
+    border-radius: 4px;
+    .tab-pane{
+      padding: 0 24px 12px;
+      min-height: 250px;
+    }
+  }
+</style>

package/src/layouts/tabs/TabsView.vue

@@ -19,7 +19,12 @@
           <router-view ref="tabContent" v-else-if="!refreshing" />
         </page-toggle-transition>
         <template v-for="page in single">
-          <single-page-view v-show="page.meta.singlePage === $route.meta.singlePage" :single-page-url="page.meta.singlePage" :key="page.meta.singlePage" />
+          <single-page-view
+            v-show="page.meta.singlePage === $route.meta.singlePage"
+            :single-page-url="page.meta.singlePage"
+            :full-path="page.fullPath"
+            :key="page.meta.singlePage"
+            @load="onSinglePageLoad" />
         </template>
       </div>
     </admin-layout>
@@ -146,6 +151,12 @@ export default {
     refresh (key, page) {
       page = page || this.pageList.find(item => item.path === key)
       page.loading = true
+      // 单页面刷新
+      const singlePage = this.allSinglePages.find(item => item.fullPath === key)
+      if (singlePage) {
+        window.frames[singlePage.fullPath].location.reload()
+        return
+      }
       this.clearCache(page)
       if (key === this.activePage) {
         // eslint-disable-next-line no-return-assign
@@ -156,6 +167,10 @@ export default {
         setTimeout(() => page.loading = false, 500)
       }
     },
+    onSinglePageLoad (fullPath) {
+      const page = this.pageList.find(item => item.fullPath === fullPath)
+      page.loading = false
+    },
     onContextmenu (pageKey, e) {
       if (pageKey) {
         e.preventDefault()

package/src/pages/exception/403.vue

@@ -1,25 +1,21 @@
-<template>
-  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="403" />
-</template>
-
-<script>
-import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
-import { mapState } from 'vuex'
-const { homePage } = require('@vue2-client/config')
-export default {
-  name: 'Exp403',
-  components: { ExceptionPage },
-  computed: {
-    homePage () {
-      return homePage
-    },
-    ...mapState('setting', ['pageMinHeight']),
-    minHeight () {
-      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-</style>
+<template>
+  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="403" />
+</template>
+
+<script>
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
+import { mapState } from 'vuex'
+export default {
+  name: 'Exp403',
+  components: { ExceptionPage },
+  computed: {
+    ...mapState('setting', ['pageMinHeight', 'homePage']),
+    minHeight () {
+      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+</style>

package/src/pages/exception/404.vue

@@ -1,25 +1,21 @@
-<template>
-  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="404" />
-</template>
-
-<script>
-import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
-import { mapState } from 'vuex'
-const { homePage } = require('@vue2-client/config')
-export default {
-  name: 'Exp404',
-  components: { ExceptionPage },
-  computed: {
-    homePage () {
-      return homePage
-    },
-    ...mapState('setting', ['pageMinHeight']),
-    minHeight () {
-      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-</style>
+<template>
+  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="404" />
+</template>
+
+<script>
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
+import { mapState } from 'vuex'
+export default {
+  name: 'Exp404',
+  components: { ExceptionPage },
+  computed: {
+    ...mapState('setting', ['pageMinHeight', 'homePage']),
+    minHeight () {
+      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+</style>

package/src/pages/exception/500.vue

@@ -1,25 +1,21 @@
-<template>
-  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="500" />
-</template>
-
-<script>
-import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
-import { mapState } from 'vuex'
-const { homePage } = require('@vue2-client/config')
-export default {
-  name: 'Exp500',
-  components: { ExceptionPage },
-  computed: {
-    homePage () {
-      return homePage
-    },
-    ...mapState('setting', ['pageMinHeight']),
-    minHeight () {
-      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-</style>
+<template>
+  <exception-page :home-route="homePage" :style="`min-height: ${minHeight}`" type="500" />
+</template>
+
+<script>
+import ExceptionPage from '@vue2-client/components/exception/ExceptionPage'
+import { mapState } from 'vuex'
+export default {
+  name: 'Exp500',
+  components: { ExceptionPage },
+  computed: {
+    ...mapState('setting', ['pageMinHeight', 'homePage']),
+    minHeight () {
+      return this.pageMinHeight ? this.pageMinHeight + 'px' : '100vh'
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+</style>