vue2-client 1.2.103 → 1.2.107

package/src/layouts/header/InstitutionDetail.vue

@@ -1,177 +1,177 @@
-<template>
-  <div>
-    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
-    <p>简述: {{ institutionData.f_sketch }}</p>
-    <p>生效时间: {{ format(institutionData.f_effective_date) }}</p>
-    <div v-if="showDocument" class="content">
-      <iframe :src="institutionDocUrl" width="100%" height="100%" frameborder="0"></iframe>
-    </div>
-    <!-- 其他附件 -->
-    <div class="other-file">
-      <div class="title">其他附件</div>
-      <div v-for="file in otherFiles" :key="file.id">
-        <a class="file-item">
-          <span class="file-action" @click="handlePreviewDoc(file.url)">
-            <a-icon type="link" />{{ file.name }}
-          </span>
-          <span class="file-action" @click="handlePreviewDoc(file.url)">
-            <a-icon type="eye" />预览
-          </span>
-          <a class="file-action" @click="handlePreDowDoc(file)" target="_blank"><a-icon type="download" />下载</a>
-        </a>
-      </div>
-    </div>
-    <!-- 其他附件预览 -->
-    <a-modal v-model="previewDocVisible" :footer="null" :dialog-style="{ top: '20px' }" width="97%" :z-index="1001">
-      <div class="preview-doc-container">
-        <a-spin size="large" :spinning="previewDocLoading" />
-        <iframe
-          v-show="!previewDocLoading"
-          :src="previewDocUrl"
-          width="100%"
-          height="100%"
-          frameborder="0"
-          @load="previewDocLoading = false" />
-      </div>
-    </a-modal>
-    <a-button type="primary" @click="confirm_institution">确认</a-button>
-  </div>
-</template>
-
-<script>
-import { Base64 } from 'js-base64'
-import { post } from '@vue2-client/services/api/restTools'
-import { formatDate } from '@vue2-client/utils/util'
-
-export default {
-  name: 'InstitutionDetail',
-  props: {
-    institutionId: {
-      type: Number,
-      default: undefined
-    },
-    affirmInstitution: {
-      type: Number,
-      default: undefined
-    }
-  },
-  data () {
-    return {
-      institutionDocUrl: undefined,
-      showDocument: false,
-      otherFiles: [],
-      institutionData: {},
-      previewDocVisible: false,
-      previewDocUrl: undefined,
-      previewDocLoading: false
-    }
-  },
-  watch: {
-    institutionId () {
-      this.getDetailData()
-    }
-  },
-  mounted () {
-    this.getDetailData()
-  },
-  methods: {
-    // 获取详情数据
-    getDetailData () {
-      if (!this.institutionId) {
-        return
-      }
-      const otherFiles = []
-      post('/webmeterapi/getInstitutionDetail', {
-        id: this.institutionId
-      }).then(res => {
-        res.files.forEach(item => {
-          if (item.use_type === '制度文件') {
-            const institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
-            this.institutionDocUrl = institutionDocUrl
-            this.showDocument = true
-          } else {
-            otherFiles.push(item)
-          }
-        })
-        this.institutionData = res.institution
-        this.otherFiles = otherFiles
-      })
-    },
-    format (dateStr) {
-      return formatDate(dateStr, 'yyyy-MM-dd')
-    },
-    // 其他附件预览
-    handlePreviewDoc (url) {
-      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
-      if (this.previewDocUrl != previewDocUrl) {
-        this.previewDocLoading = true
-        this.previewDocUrl = previewDocUrl
-      }
-      this.previewDocVisible = true
-    },
-    // 下载文档
-    handlePreDowDoc (file) {
-      const a = document.createElement('a')
-      a.href = file.url
-      a.download = file.name
-      a.click()
-    },
-    confirm_institution () {
-      post('/webmeterapi/affirmInstitution', {
-        data: {
-          tobe: [
-            {
-              id: this.affirmInstitution,
-              f_affirm_type: '系统确认'
-            }
-          ]
-        }
-      }).then(res => {
-        this.$message.success('确认成功')
-        this.$emit('get_to_be_confirmed')
-      })
-    },
-  }
-}
-// 文档预览服务 API
-const previewDocService = 'http://123.60.214.109:8012/onlinePreview?url='
-// 文件服务器地址
-const fileServer = 'http://123.60.214.109:8406'
-</script>
-
-<style lang="less" scoped>
-.content {
-  height: 80vh;
-  img {
-    max-width: 100%;
-  }
-}
-.other-file {
-  margin: 16px 0;
-  .title {
-    margin-bottom: 6px;
-  }
-}
-.file-item {
-  .file-action {
-    padding: 3px 4px;
-    color: #1890ff;
-    &:hover {
-      background: #e6f7ff;
-    }
-  }
-  .anticon {
-    margin-right: 3px;
-  }
-}
-.file-list-title {
-  color: rgba(0, 0, 0, 0.85);
-  font-weight: bold;
-  font-size: 16px;
-  margin-bottom: 8px;
-}
-.preview-doc-container {
-  height: calc(100vh - 92px);
-  padding-top: 20px;
-}
-</style>
+<template>
+  <div>
+    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
+    <p>简述: {{ institutionData.f_sketch }}</p>
+    <p>生效时间: {{ format(institutionData.f_effective_date) }}</p>
+    <div v-if="showDocument" class="content">
+      <iframe :src="institutionDocUrl" width="100%" height="100%" frameborder="0"></iframe>
+    </div>
+    <!-- 其他附件 -->
+    <div class="other-file">
+      <div class="title">其他附件</div>
+      <div v-for="file in otherFiles" :key="file.id">
+        <a class="file-item">
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="link" />{{ file.name }}
+          </span>
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="eye" />预览
+          </span>
+          <a class="file-action" @click="handlePreDowDoc(file)" target="_blank"><a-icon type="download" />下载</a>
+        </a>
+      </div>
+    </div>
+    <!-- 其他附件预览 -->
+    <a-modal v-model="previewDocVisible" :footer="null" :dialog-style="{ top: '20px' }" width="97%" :z-index="1001">
+      <div class="preview-doc-container">
+        <a-spin size="large" :spinning="previewDocLoading" />
+        <iframe
+          v-show="!previewDocLoading"
+          :src="previewDocUrl"
+          width="100%"
+          height="100%"
+          frameborder="0"
+          @load="previewDocLoading = false" />
+      </div>
+    </a-modal>
+    <a-button type="primary" @click="confirm_institution">确认</a-button>
+  </div>
+</template>
+
+<script>
+import { Base64 } from 'js-base64'
+import { post } from '@vue2-client/services/api/restTools'
+import { formatDate } from '@vue2-client/utils/util'
+
+export default {
+  name: 'InstitutionDetail',
+  props: {
+    institutionId: {
+      type: Number,
+      default: undefined
+    },
+    affirmInstitution: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data () {
+    return {
+      institutionDocUrl: undefined,
+      showDocument: false,
+      otherFiles: [],
+      institutionData: {},
+      previewDocVisible: false,
+      previewDocUrl: undefined,
+      previewDocLoading: false
+    }
+  },
+  watch: {
+    institutionId () {
+      this.getDetailData()
+    }
+  },
+  mounted () {
+    this.getDetailData()
+  },
+  methods: {
+    // 获取详情数据
+    getDetailData () {
+      if (!this.institutionId) {
+        return
+      }
+      const otherFiles = []
+      post('/webmeterapi/getInstitutionDetail', {
+        id: this.institutionId
+      }).then(res => {
+        res.files.forEach(item => {
+          if (item.use_type === '制度文件') {
+            const institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
+            this.institutionDocUrl = institutionDocUrl
+            this.showDocument = true
+          } else {
+            otherFiles.push(item)
+          }
+        })
+        this.institutionData = res.institution
+        this.otherFiles = otherFiles
+      })
+    },
+    format (dateStr) {
+      return formatDate(dateStr, 'yyyy-MM-dd')
+    },
+    // 其他附件预览
+    handlePreviewDoc (url) {
+      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
+      if (this.previewDocUrl != previewDocUrl) {
+        this.previewDocLoading = true
+        this.previewDocUrl = previewDocUrl
+      }
+      this.previewDocVisible = true
+    },
+    // 下载文档
+    handlePreDowDoc (file) {
+      const a = document.createElement('a')
+      a.href = file.url
+      a.download = file.name
+      a.click()
+    },
+    confirm_institution () {
+      post('/webmeterapi/affirmInstitution', {
+        data: {
+          tobe: [
+            {
+              id: this.affirmInstitution,
+              f_affirm_type: '系统确认'
+            }
+          ]
+        }
+      }).then(res => {
+        this.$message.success('确认成功')
+        this.$emit('get_to_be_confirmed')
+      })
+    },
+  }
+}
+// 文档预览服务 API
+const previewDocService = 'http://123.60.214.109:8012/onlinePreview?url='
+// 文件服务器地址
+const fileServer = 'http://123.60.214.109:8406'
+</script>
+
+<style lang="less" scoped>
+.content {
+  height: 80vh;
+  img {
+    max-width: 100%;
+  }
+}
+.other-file {
+  margin: 16px 0;
+  .title {
+    margin-bottom: 6px;
+  }
+}
+.file-item {
+  .file-action {
+    padding: 3px 4px;
+    color: #1890ff;
+    &:hover {
+      background: #e6f7ff;
+    }
+  }
+  .anticon {
+    margin-right: 3px;
+  }
+}
+.file-list-title {
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: bold;
+  font-size: 16px;
+  margin-bottom: 8px;
+}
+.preview-doc-container {
+  height: calc(100vh - 92px);
+  padding-top: 20px;
+}
+</style>

package/src/pages/login/Login.vue

@@ -201,7 +201,7 @@ export default {
     setACCESSTOKEN (data) {
       localStorage.setItem(ACCESS_TOKEN, data)
       let timestamp = new Date().getTime()// 当前的时间戳
-      timestamp = timestamp + 60 * 60 * 1000
+      timestamp = timestamp + 12 * 60 * 60 * 1000
       // 格式化时间获取年月日, 登陆过期时间
       const dateAfter = new Date(timestamp)
       setAuthorization({ token: data, expireAt: dateAfter })

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

@@ -1,60 +1,60 @@
-// 视图组件
-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.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
-// 查询配置生成
-routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage.vue')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
-// --------------------------------------报表组件--------------------------------------
-routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
-// --------------------------------------资源管理--------------------------------------
-routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
-
-// 基础路由组件注册
-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.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
+// 查询配置生成
+routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage.vue')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
+// --------------------------------------报表组件--------------------------------------
+routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
+// --------------------------------------资源管理--------------------------------------
+routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
+
+// 基础路由组件注册
+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/WebmeterAnalysisViewApi.js

@@ -1,24 +1,24 @@
-const WebmeterAnalysisViewApi = {
-  // 查询：指令数统计
-  instructSumCount: '/webmeterapi/foreignaidInstructSumCountData',
-  // 查询：抄表数统计
-  meteReadSumCount: '/webmeterapi/foreignaidMetereadSumCountData',
-  // 查询：近一周抄表量数据
-  meteReadDataByWeek: '/webmeterapi/foreignaidMetereadDataByWeekData',
-  // 查询：在用表具数
-  usingMeterSumCount: '/webmeterapi/foreignaidUsingMeterSumCountData',
-  // 查询：近一周在用表具数数据
-  usingMeterDataByWeek: '/webmeterapi/foreignaidUsingMeterDataByWeekData',
-  // 查询：指令成功率统计
-  instructRateOfSuccess: '/webmeterapi/foreignaidInstructRateOfSuccessData',
-  // 查询：按表厂抄表量统计
-  handMeterSumCountData: '/webmeterapi/foreignaidHandMeterSumCountData',
-  // 查询：统计用气量数据
-  useGasSumCount: '/webmeterapi/foreignaidUseGasSumCountData',
-  // 查询：按用气性质统计用气量
-  GasByGasProperties: '/webmeterapi/foreignaidGasByGasProperties',
-  // 查询：用户在用气量占比
-  GasInUser: '/webmeterapi/foreignaidGasInUser'
-}
-
-export { WebmeterAnalysisViewApi }
+const WebmeterAnalysisViewApi = {
+  // 查询：指令数统计
+  instructSumCount: '/webmeterapi/foreignaidInstructSumCountData',
+  // 查询：抄表数统计
+  meteReadSumCount: '/webmeterapi/foreignaidMetereadSumCountData',
+  // 查询：近一周抄表量数据
+  meteReadDataByWeek: '/webmeterapi/foreignaidMetereadDataByWeekData',
+  // 查询：在用表具数
+  usingMeterSumCount: '/webmeterapi/foreignaidUsingMeterSumCountData',
+  // 查询：近一周在用表具数数据
+  usingMeterDataByWeek: '/webmeterapi/foreignaidUsingMeterDataByWeekData',
+  // 查询：指令成功率统计
+  instructRateOfSuccess: '/webmeterapi/foreignaidInstructRateOfSuccessData',
+  // 查询：按表厂抄表量统计
+  handMeterSumCountData: '/webmeterapi/foreignaidHandMeterSumCountData',
+  // 查询：统计用气量数据
+  useGasSumCount: '/webmeterapi/foreignaidUseGasSumCountData',
+  // 查询：按用气性质统计用气量
+  GasByGasProperties: '/webmeterapi/foreignaidGasByGasProperties',
+  // 查询：用户在用气量占比
+  GasInUser: '/webmeterapi/foreignaidGasInUser'
+}
+
+export { WebmeterAnalysisViewApi }

package/src/services/api/manage.js

@@ -1,16 +1,16 @@
-const manageApi = {
-  // 查询：获取燃气公司列表
-  orgList: '/webmeterapi/foreignaidGetOrgList',
-  // 查询：获取客户列表
-  customerList: '/webmeterapi/foreignaidGetCustomerList',
-  // 查询：检查链接有效性
-  checkUrlWork: '/webmeterapi/foreignaidCheckUrl',
-  // 操作：客户数据
-  doCustomerInfo: '/webmeterapi/foreignaidDoCustomerInfo',
-  // 查询：获取字典键列表
-  getDictionaryValue: '/webmeterapi/getDictionaryValue',
-  // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/webmeterapi/getDivisionsOhChina'
-}
-
-export { manageApi }
+const manageApi = {
+  // 查询：获取燃气公司列表
+  orgList: '/webmeterapi/foreignaidGetOrgList',
+  // 查询：获取客户列表
+  customerList: '/webmeterapi/foreignaidGetCustomerList',
+  // 查询：检查链接有效性
+  checkUrlWork: '/webmeterapi/foreignaidCheckUrl',
+  // 操作：客户数据
+  doCustomerInfo: '/webmeterapi/foreignaidDoCustomerInfo',
+  // 查询：获取字典键列表
+  getDictionaryValue: '/webmeterapi/getDictionaryValue',
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/webmeterapi/getDivisionsOhChina'
+}
+
+export { manageApi }

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }