vue2-client 1.2.43 → 1.2.46

package/src/layouts/SinglePageView.vue

@@ -4,6 +4,7 @@
       <iframe
         ref="singlepage"
         :src="iframeSrc"
+        :name="this.fullPath"
         class="single-page-iframe"
         @load="load">
       </iframe>
@@ -23,16 +24,19 @@ export default {
     singlePageUrl: {
       type: String,
       default: ''
+    },
+    fullPath: {
+      type: String,
+      default: ''
     }
   },
   data () {
     return {
-      iframeSrc: '../singlepage/page.html',
       iframe: null
     }
   },
   computed: {
-    ...mapState('setting', ['animate']),
+    ...mapState('setting', ['animate', 'iframeSrc']),
     ...mapState('account', ['login'])
   },
   mounted () {
@@ -40,6 +44,7 @@ export default {
       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']),
@@ -58,6 +63,7 @@ export default {
       if (this.iframe) {
         this.iframe.postMessage(data, '*')
       }
+      this.$emit('load', this.fullPath)
     }
   }
 }

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>

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
+}