vue2-client 1.2.37 → 1.2.41

package/src/config/index.js

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

package/src/layouts/SinglePageView.vue

@@ -2,11 +2,10 @@
   <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
     <template v-if="login">
       <iframe
-        id="singlepageview"
-        @load="load"
-        :src="url"
-        frameborder="0"
-        ref="singlepage">
+        ref="singlepage"
+        :src="iframeSrc"
+        class="single-page-iframe"
+        @load="load">
       </iframe>
     </template>
   </page-toggle-transition>
@@ -22,32 +21,29 @@ export default {
   components: { PageToggleTransition },
   props: {
     singlePageUrl: {
-      type: Object,
-      default: () => {
-        return { url: '' }
-      }
+      type: String,
+      default: ''
     }
   },
   data () {
     return {
-      url: '../singlepage/page.html',
-      // singlePageUrl: null,
-      iframe: {}
+      iframeSrc: '../singlepage/page.html',
+      iframe: null
     }
   },
   computed: {
-    ...mapState('setting', ['multiPage', 'animate']),
+    ...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 () {
-      this.iframe = this.$refs.singlepage.contentWindow
       const appdata = {
         singleValues: this.$appdata.getSingleValues(),
         params: this.$appdata.getParams()
@@ -56,17 +52,17 @@ export default {
         token: localStorage.getItem(ACCESS_TOKEN),
         login: this.login,
         appdata: appdata,
-        page: this.singlePageUrl.url
+        page: this.singlePageUrl
       }
       console.log('发送参数', data)
-      this.iframe.postMessage(data, '*')
+      this.iframe?.postMessage(data, '*')
     }
   }
 }
 </script>
 
 <style lang="less">
-#singlepageview {
+.single-page-iframe {
   width: 100%;
   height: calc(100vh - 117px);
   border: none;

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

@@ -17,11 +17,9 @@
         </a-keep-alive>
         <router-view ref="tabContent" v-else-if="!refreshing" />
       </page-toggle-transition>
-      <div v-show="$route.meta.singlePage && this.single.length > 0">
-        <template v-for="page in single">
-          <single-page-view v-show="page.meta.singlePage === $route.meta.singlePage" :single-page-url="{url:page.meta.singlePage}" :key="page.meta.singlePage"></single-page-view>
-        </template>
-      </div>
+      <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" />
+      </template>
     </div>
   </admin-layout>
 </template>

package/src/pages/login/Login.vue

@@ -5,7 +5,7 @@
         <img alt="logo" class="logo" src="@/assets/img/logo.png" />
         <span class="title">{{ systemName }}</span>
       </div>
-      <div class="desc">为物联网设备的兼容、监控和统计提供支持</div>
+      <div class="desc">{{ systemDesc }}</div>
     </div>
     <div class="login">
       <a-form @submit="onSubmit" :form="form">
@@ -79,6 +79,9 @@ export default {
   computed: {
     systemName () {
       return this.$store.state.setting.systemName
+    },
+    systemDesc () {
+      return this.$store.state.setting.systemDesc
     }
   },
   methods: {

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