vue2-client 1.2.33 → 1.2.36

package/src/pages/system/ticket/index.vue

@@ -118,17 +118,17 @@
         <br/>
       </div>
     </a-modal>
-    <a-card>
+    <a-card v-if="visible">
       <div style="text-align: right">
-        <p>欢迎您：{{ currUser.name }}，<a @click="logout">退出登录</a></p>
+        <p>欢迎您：{{ currUser.ename }}</p>
       </div>
       <div class="submitTicketTitle">
         <span>奥枫问题反馈平台</span>
       </div>
-      <a-tabs>
-        <a-tab-pane :key="1" tab="工单提交">
+      <a-tabs :activeKey="tabActiveKey" @change="changeTab">
+        <a-tab-pane key="workSubmit" tab="工单提交">
           <!--   表格主体   -->
-          <a-row>
+          <a-row v-if="tabActiveKey === 'workSubmit'">
             <a-col :span="18">
               <a-form :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
                 <!--     问题类型单选框     -->
@@ -210,9 +210,10 @@
             </a-col>
           </a-row>
         </a-tab-pane>
-        <a-tab-pane :key="2" tab="历史工单">
+        <a-tab-pane key="workHistory" tab="历史工单">
           <!--   查询表单   -->
           <x-form-table
+            v-if="tabActiveKey === 'workHistory'"
             title="已提交工单"
             :queryParamsName="queryParamsName"
             :fixed-query-form="fixedQueryForm"
@@ -227,8 +228,8 @@
 <script>
   import { TicketDetailsViewApi, post } from '@vue2-client/services/api'
   import { logout } from '@/services/user'
-  import { mapState } from 'vuex'
   import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+  import Vue from 'vue'
 
   export default {
     name: 'submitTicket',
@@ -272,16 +273,25 @@
         // 工单类型在字典中显示的文字值
         categoryStr: '',
         // 当前登陆用户手机号
-        phoneNumber: ''
+        phoneNumber: '',
+        // 用户信息
+        currUser: {
+          ename: '',
+          phoneNumber: ''
+        },
+        visible: false,
+        tabActiveKey: 'workSubmit'
       }
     },
+    created () {
+      Vue.$appdata.load().then(res => {
+        this.currUser.phoneNumber = this.$route.query.personPhone ? this.$route.query.personPhone : '未定义'
+        this.currUser.ename = this.$route.query.orgName
+        this.fixedQueryForm['t_uploader'] = this.currUser.ename
+        this.visible = true
+      })
+    },
     mounted () {
-      if (!this.currUser) {
-        this.$router.replace('/login')
-        return
-      }
-      this.getCurrentUserPhone()
-      this.fixedQueryForm['t_uploader'] = this.currUser.ename
     },
     methods: {
       toDetail (record, id) {
@@ -296,14 +306,6 @@
           reader.onerror = error => reject(error)
         })
       },
-      // 获取当前用户手机号
-      getCurrentUserPhone () {
-        if (this.currUser.f_user_telephone === undefined) {
-          this.phoneNumber = '未定义'
-        } else {
-          this.phoneNumber = this.currUser.f_user_telephone
-        }
-      },
       // 图像修改检测
       handleChange ({ fileList }) {
         this.fileList = fileList.filter((item) => {
@@ -374,7 +376,7 @@
               serial_number: serialNumber,
               images: this.fileList,
               categoryStr: this.categoryStr,
-              phoneNumber: this.phoneNumber
+              phoneNumber: this.currUser.phoneNumber
             })
               .then(res => {
                 this.serialNumber = serialNumber
@@ -409,11 +411,12 @@
       logout () {
         logout()
         this.$router.push('/login')
+      },
+      // 切换标签页
+      changeTab (id) {
+        this.tabActiveKey = id
       }
     },
-    computed: {
-      ...mapState('account', { currUser: 'user' })
-    },
     watch: {
       // 监控类别的改变，当类别改变，校验通过
       'form.category' (newVal) {

package/src/router/index.js

@@ -3,7 +3,7 @@ import { formatRoutes } from '@vue2-client/utils/routerUtil'
 // 不需要登录拦截的路由配置
 const loginIgnore = {
   names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login'], // 根据路由fullPath匹配
+  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
   /**
    * 判断路由是否包含在该配置中
    * @param route vue-router 的 route 对象

package/src/services/api/EmployeeDetailsViewApi.js

@@ -1,16 +1,16 @@
-const EmployeeDetailsViewApi = {
-  // 查询：获取员工详细信息
-  getEmployeeDetails: '/webmeterapi/getEmployeeDetails',
-  // 查询：获取员工上一周应答工单数量
-  getConfirmTicketsCountWeekly: '/webmeterapi/getConfirmTicketsCountWeekly',
-  // 查询：获取员工上一周完成工单数量
-  getFinishedTicketsCountWeekly: '/webmeterapi/getFinishedTicketsCountWeekly',
-  // 查询：是否存在此员工
-  findEmpName: '/webmeterapi/findEmpName',
-  // 查询：获取所有员工名，供前端展示备选项
-  getAllEmployeeName: '/webmeterapi/getAllEmployeeName',
-  // 查询：根据员工名，获取员工id
-  getEmployeeId: '/webmeterapi/getEmployeeId'
-}
-
-export { EmployeeDetailsViewApi }
+const EmployeeDetailsViewApi = {
+  // 查询：获取员工详细信息
+  getEmployeeDetails: '/webmeterapi/getEmployeeDetails',
+  // 查询：获取员工上一周应答工单数量
+  getConfirmTicketsCountWeekly: '/webmeterapi/getConfirmTicketsCountWeekly',
+  // 查询：获取员工上一周完成工单数量
+  getFinishedTicketsCountWeekly: '/webmeterapi/getFinishedTicketsCountWeekly',
+  // 查询：是否存在此员工
+  findEmpName: '/webmeterapi/findEmpName',
+  // 查询：获取所有员工名，供前端展示备选项
+  getAllEmployeeName: '/webmeterapi/getAllEmployeeName',
+  // 查询：根据员工名，获取员工id
+  getEmployeeId: '/webmeterapi/getEmployeeId'
+}
+
+export { EmployeeDetailsViewApi }

package/src/services/api/applyInstallApi.js

@@ -1,14 +1,14 @@
-const ApplyInstallApi = {
-  // 查询：获取报装临时表所需数据
-  getApplySubTableData: '/webmeterapi/getApplySubTableData',
-  // 初始化子表
-  initApplySubTable: '/webmeterapi/initApplySubTable',
-  // 删除临时子表
-  deleteApplySubTempTable: '/webmeterapi/deleteApplySubTempTable',
-  // 创建报建子表的临时表，根据配置文件动态生成
-  createTempTable: '/webmeterapi/createTempTable',
-  // 向临时表中插入数据
-  insertDataToTempTable: '/webmeterapi/insertDataToTempTable'
-}
-
-export { ApplyInstallApi }
+const ApplyInstallApi = {
+  // 查询：获取报装临时表所需数据
+  getApplySubTableData: '/webmeterapi/getApplySubTableData',
+  // 初始化子表
+  initApplySubTable: '/webmeterapi/initApplySubTable',
+  // 删除临时子表
+  deleteApplySubTempTable: '/webmeterapi/deleteApplySubTempTable',
+  // 创建报建子表的临时表，根据配置文件动态生成
+  createTempTable: '/webmeterapi/createTempTable',
+  // 向临时表中插入数据
+  insertDataToTempTable: '/webmeterapi/insertDataToTempTable'
+}
+
+export { ApplyInstallApi }

package/src/services/api/restTools.js

@@ -1,23 +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 请求参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter) {
-  return request(url, METHOD.POST, parameter)
-}
-
-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 }

package/src/utils/request.js

@@ -31,6 +31,7 @@ const METHOD = {
  * @param url 请求地址
  * @param method {METHOD} http method
  * @param params 请求参数
+ * @param config
  * @returns {Promise<AxiosResponse<T>>}
  */
 async function request (url, method, params, config) {

package/vue.config.js

@@ -1,143 +1,143 @@
-const path = require('path')
-const webpack = require('webpack')
-const ThemeColorReplacer = require('webpack-theme-color-replacer')
-const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
-const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
-const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-const productionGzipExtensions = ['js', 'css']
-const isProd = process.env.NODE_ENV === 'production'
-
-const assetsCDN = {
-  // webpack build externals
-  externals: {
-    vue: 'Vue',
-    'vue-router': 'VueRouter',
-    vuex: 'Vuex',
-    axios: 'axios',
-    nprogress: 'NProgress',
-    clipboard: 'ClipboardJS',
-    '@antv/data-set': 'DataSet',
-    'js-cookie': 'Cookies'
-  },
-  css: [
-  ],
-  js: [
-    '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
-    '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
-    '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
-    '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
-    '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
-    '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
-    '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
-    '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
-  ]
-}
-
-const server = 'http://121.36.106.17:8400'
-// const local = 'http://localhost:8445/webmeter'
-const local = 'http://123.60.214.109:8405/webmeter'
-
-module.exports = {
-  devServer: {
-    // development server port 8000
-    port: 8001,
-    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
-    proxy: {
-      '/rs': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/image': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/webapps': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/webmeterapi': {
-        pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeteruploadapi': {
-        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
-        target: local,
-        changeOrigin: true
-      }
-    }
-  },
-  pluginOptions: {
-    'style-resources-loader': {
-      preProcessor: 'less',
-      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
-    }
-  },
-  configureWebpack: config => {
-    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
-    config.performance = {
-      hints: false
-    }
-    config.plugins.push(
-      new ThemeColorReplacer({
-        fileName: 'css/theme-colors-[contenthash:8].css',
-        matchColors: getThemeColors(),
-        injectCss: true,
-        resolveCss
-      })
-    )
-    // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
-    // 生产环境下将资源压缩成gzip格式
-    if (isProd) {
-      // add `CompressionWebpack` plugin to webpack plugins
-      config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
-        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-        threshold: 10240,
-        minRatio: 0.8
-      }))
-    }
-    // if prod, add externals
-    if (isProd) {
-      config.externals = assetsCDN.externals
-    }
-  },
-  chainWebpack: config => {
-    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
-    if (isProd) {
-      config.plugin('optimize-css')
-        .tap(args => {
-            args[0].cssnanoOptions.preset[1].colormin = false
-          return args
-        })
-    }
-    // 生产环境下使用CDN
-    if (isProd) {
-      config.plugin('html')
-        .tap(args => {
-          args[0].cdn = assetsCDN
-        return args
-      })
-    }
-    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
-  },
-  css: {
-    loaderOptions: {
-      less: {
-        lessOptions: {
-          modifyVars: modifyVars(),
-          javascriptEnabled: true
-        }
-      }
-    }
-  },
-  publicPath: process.env.VUE_APP_PUBLIC_PATH,
-  outputDir: 'dist',
-  assetsDir: 'static',
-  productionSourceMap: false
-}
+const path = require('path')
+const webpack = require('webpack')
+const ThemeColorReplacer = require('webpack-theme-color-replacer')
+const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
+const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+const productionGzipExtensions = ['js', 'css']
+const isProd = process.env.NODE_ENV === 'production'
+
+// const assetsCDN = {
+//   // webpack build externals
+//   externals: {
+//     vue: 'Vue',
+//     'vue-router': 'VueRouter',
+//     vuex: 'Vuex',
+//     axios: 'axios',
+//     nprogress: 'NProgress',
+//     clipboard: 'ClipboardJS',
+//     '@antv/data-set': 'DataSet',
+//     'js-cookie': 'Cookies'
+//   },
+//   css: [
+//   ],
+//   js: [
+//     '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
+//     '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
+//     '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
+//     '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
+//     '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
+//     '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
+//     '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
+//     '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
+//   ]
+// }
+
+const server = 'http://121.36.106.17:8400'
+// const local = 'http://localhost:8445/webmeter'
+const local = 'http://123.60.214.109:8405/webmeter'
+
+module.exports = {
+  devServer: {
+    // development server port 8000
+    port: 8001,
+    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
+    proxy: {
+      '/rs': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/image': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/webapps': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/webmeterapi': {
+        pathRewrite: { '^/webmeterapi': '/rs/logic' },
+        target: local,
+        changeOrigin: true
+      },
+      '/webmeteruploadapi': {
+        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
+        target: local,
+        changeOrigin: true
+      }
+    }
+  },
+  pluginOptions: {
+    'style-resources-loader': {
+      preProcessor: 'less',
+      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
+    }
+  },
+  configureWebpack: config => {
+    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
+    config.performance = {
+      hints: false
+    }
+    config.plugins.push(
+      new ThemeColorReplacer({
+        fileName: 'css/theme-colors-[contenthash:8].css',
+        matchColors: getThemeColors(),
+        injectCss: true,
+        resolveCss
+      })
+    )
+    // Ignore all locale files of moment.js
+    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
+    // 生产环境下将资源压缩成gzip格式
+    if (isProd) {
+      // add `CompressionWebpack` plugin to webpack plugins
+      config.plugins.push(new CompressionWebpackPlugin({
+        algorithm: 'gzip',
+        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+        threshold: 10240,
+        minRatio: 0.8
+      }))
+    }
+    // if prod, add externals
+    // if (isProd) {
+    //   config.externals = assetsCDN.externals
+    // }
+  },
+  chainWebpack: config => {
+    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
+    if (isProd) {
+      config.plugin('optimize-css')
+        .tap(args => {
+          args[0].cssnanoOptions.preset[1].colormin = false
+          return args
+        })
+    }
+    // 生产环境下使用CDN
+    // if (isProd) {
+    //   config.plugin('html')
+    //     .tap(args => {
+    //       args[0].cdn = assetsCDN
+    //     return args
+    //   })
+    // }
+    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
+  },
+  css: {
+    loaderOptions: {
+      less: {
+        lessOptions: {
+          modifyVars: modifyVars(),
+          javascriptEnabled: true
+        }
+      }
+    }
+  },
+  publicPath: process.env.VUE_APP_PUBLIC_PATH,
+  outputDir: 'dist',
+  assetsDir: 'static',
+  productionSourceMap: false
+}