vue2-client 1.8.45 → 1.8.47

package/src/pages/ServiceReview/index.vue

@@ -0,0 +1,284 @@
+<template>
+  <div :class="isWidth800? 'ServiceReviewPhone':'ServiceReviewPc'">
+    <div id="ServiceWarp" :class="!isWidth800?'ServiceWarpPC':''">
+      <div id="ServiceHeader" v-if="!isWidth800">
+        服务评价
+      </div>
+      <div id="ServiceContext" :class="!isWidth800?'ServiceContext':''" v-if="!submittedStatus">
+        <a-row id="ServiceContextTitle" v-if="!isWidth800">
+          <a-col :span="8">
+            <span class="ServiceContextLabel">业务名称</span>
+            <span>入户安检</span>
+          </a-col>
+          <a-col :span="8" style="text-align: center">
+            <span class="ServiceContextLabel">办理时间</span>
+            <span>2023-12-12</span>
+          </a-col>
+          <a-col :span="8" style="text-align: right">
+            <span class="ServiceContextLabel">办理人员</span>
+            <span>某某某</span>
+          </a-col>
+        </a-row>
+        <a-row id="ServiceContextTitle" v-if="isWidth800">
+          <a-col :span="24" style="margin: 15px auto">
+            <span class="ServiceContextLabelPhone">业务名称</span>
+            <span>入户安检</span>
+          </a-col>
+          <a-col :span="24" style="margin: 15px auto">
+            <span class="ServiceContextLabelPhone">办理时间</span>
+            <span>2023-12-12</span>
+          </a-col>
+          <a-col :span="24" style="margin: 15px auto">
+            <span class="ServiceContextLabelPhone ">办理人员</span>
+            <span>某某某</span>
+          </a-col>
+        </a-row>
+        <a-row id="Context">
+          <span id="ContextTitle">服务评价内容</span>
+        </a-row>
+        <a-row class="Satisfaction">
+          <a-col :span="isWidth800?7:6"><span>人员服务满意度</span></a-col>
+          <a-col :span="isWidth800?17:18">
+            <a-radio-group style="width:100%" v-model="model.personSatisfaction">
+              <a-space style="display: flex;justify-content: space-between;">
+                <a-radio value="满意">满意</a-radio>
+                <a-radio value="一般">一般</a-radio>
+                <a-radio value="不满意">不满意</a-radio>
+              </a-space>
+            </a-radio-group>
+          </a-col>
+        </a-row>
+        <a-row class="Satisfaction">
+          <a-col :span="isWidth800?7:6"><span>业务办理满意度</span></a-col>
+          <a-col :span="isWidth800?17:18">
+            <a-radio-group style="width:100%" v-model="model.personSatisfaction">
+              <a-space style="display: flex;justify-content: space-between;">
+                <a-radio value="满意">满意</a-radio>
+                <a-radio value="一般">一般</a-radio>
+                <a-radio value="不满意">不满意</a-radio>
+              </a-space>
+            </a-radio-group>
+          </a-col>
+        </a-row>
+        <a-row class="Satisfaction">
+          <a-col :span="isWidth800?7:6"><span>整体满意度</span></a-col>
+          <a-col :span="isWidth800?17:18">
+            <a-radio-group style="width:100%" v-model="model.personSatisfaction">
+              <a-space style="display: flex;justify-content: space-between;">
+                <a-radio value="满意">满意</a-radio>
+                <a-radio value="一般">一般</a-radio>
+                <a-radio value="不满意">不满意</a-radio>
+              </a-space>
+            </a-radio-group>
+          </a-col>
+        </a-row>
+        <a-row class="Satisfaction">
+          <a-textarea
+            class="textarea"
+            :showCount="true"
+            v-model="model.content"
+            placeholder="请填写对我们的建议..."
+            :auto-size="{ minRows: 4, maxRows: 5 }"
+          />
+        </a-row>
+        <a-row class="Satisfaction">
+          <a-col :span="isWidth800?7:6"><span>是否匿名</span></a-col>
+          <a-col :span="isWidth800?17:18">
+            <a-radio-group style="width:100%" v-model="model.personSatisfaction">
+              <a-space style="display: flex;justify-content: space-between;">
+                <a-radio value="是">是&emsp;</a-radio>
+                <a-radio value="否">否&emsp;</a-radio>
+                <div>&emsp;&emsp;&emsp;&emsp;&emsp;</div>
+              </a-space>
+            </a-radio-group>
+          </a-col>
+        </a-row>
+        <a-row class="Satisfaction_onsubmit">
+          <a-button class="submit" @click="submit" type="primary" shape="round">
+            提交
+          </a-button>
+        </a-row>
+      </div>
+      <div id="submitResult" v-if="submittedStatus">
+        <a-row style="text-align: center;margin-top: 8%;margin-bottom:5%">
+          <img src="../../../public/img/service/sendword.png" alt="" style="zoom:1.2">
+        </a-row>
+        <a-row style="text-align: center">
+          <span style="width:100%;font-weight: 600" >提交成功！感谢您提出的宝贵建议我们会继续改进我们的服务. . .</span>
+        </a-row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'ServiceReview',
+  data () {
+    return {
+      model: {
+        // 人员满意度
+        personSatisfaction: '',
+        // 业务办理满意度
+        businessSatisfaction: '',
+        // 整体满意度
+        overallSatisfaction: '',
+        // 评价内容
+        content: '',
+        // 是否匿名
+        isAnonymous: false
+      },
+      plainOptions: [{ label: '满意', value: '满意' },
+        { label: '一般', value: '一般' },
+        { label: '不满意', value: '不满意' },],
+      submittedStatus: false,
+      windowWidth: window.innerWidth,
+      isWidth800: false,
+    }
+  },
+  created () {
+    // TODO 接受 url 的参数并且查询 服务信息 然后给 model 赋值展示
+  },
+  mounted () {
+    this.checkWidth()
+    window.addEventListener('resize', this.checkWidth)
+  },
+  updated () {
+    this.checkWidth()
+  },
+  beforeDestroy () {
+    window.removeEventListener('resize', this.checkWidth)
+  },
+  methods: {
+    checkWidth () {
+      this.windowWidth = window.innerWidth
+      this.isWidth800 = this.windowWidth <= 800
+    },
+    submit () {
+      // TODO 提交评价
+      this.submittedStatus = true
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.ServiceReviewPc {
+  background-image: url('/public/img/login/background.webp');
+  background-size: cover;
+  background-position: center;
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.ServiceWarpPC {
+  width: 70%;
+  height: 80%;
+}
+
+#ServiceWarp {
+  background-color: white;
+  border-radius: 20px;
+  overflow: hidden;
+
+  #ServiceHeader {
+    height: 18%;
+    background-color: #ECF6FF;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #5290FF;
+    font-size: 2rem;
+    letter-spacing: 0.4em;
+  }
+
+  #submitResult {
+  }
+
+  .ServiceContext {
+    padding: 10px 40px;
+  }
+
+  #ServiceContext {
+    height: 82%;
+    overflow: auto;
+
+    #ServiceContextTitle {
+
+      // 底部边框灰色虚线
+      border-bottom: 1px dashed #eee;
+      padding-bottom: 20px;
+
+      .ServiceContextLabel {
+        font-size: 1.1rem;
+        font-weight: 500;
+        color: #555;
+        margin: 0 20px;
+        white-space: nowrap;
+      }
+
+      .ServiceContextLabel + span {
+        font-size: 1rem;
+        font-weight: 400;
+        color: #555;
+        margin: 0 20px;
+        white-space: nowrap;
+      }
+    }
+
+    .ServiceContextLabelPhone {
+      font-size: 1.1rem;
+      font-weight: 500;
+      color: #555;
+      margin:   20px;
+      white-space: nowrap;
+    }
+
+    .ServiceContextLabelPhone + span {
+      font-size: 1rem;
+      font-weight: 400;
+      color: #555;
+      margin: 0 20px;
+      white-space: nowrap;
+    }
+
+    #Context {
+      padding-top: 20px;
+      padding-left: 20px;
+
+      #ContextTitle {
+        font-size: 1.1rem;
+        font-weight: 600;
+        color: #5290FF;
+      }
+    }
+
+    .Satisfaction {
+      padding-top: 20px;
+      padding-left: 20px;
+
+      textarea {
+        resize: none;
+        height: 30%;
+        background-color: #F5F6F8;
+        border: 0
+      }
+    }
+
+    .Satisfaction_onsubmit{
+      padding-top: 20px;
+      padding-left: 20px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .submit {
+        width : 40%;
+        background: linear-gradient(90deg, #60B5EC 0%, #4F90EA 100%);
+      }
+    }
+  }
+}
+</style>

package/src/pages/login/Login.vue

@@ -56,7 +56,7 @@
 import CommonLayout from '@vue2-client/layouts/CommonLayout'
 import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
 import { setAuthorization } from '@vue2-client/utils/request'
-import { loadRoutes, funcToRouterOA } from '@vue2-client/utils/routerUtil'
+import { loadRoutes, funcToRouterOA, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations, mapState } from 'vuex'
 import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
@@ -200,7 +200,16 @@ export default {
       this.setUser(user)
       this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
       this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-      loadRoutes(funcToRouterOA(user.functions))
+      let func
+      switch (this.compatible) {
+        case 'OA' :
+          func = funcToRouterOA(user.functions)
+          break
+        default:
+          func = funcToRouter(user.functions)
+          break
+      }
+      loadRoutes(func)
       // 每次重新登录时，清除indexedDB缓存
       indexedDB.clear()
       this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)

package/src/router/async/config.async.js

@@ -5,6 +5,8 @@ import { parseRoutes } from '@vue2-client/utils/routerUtil'
 const routesConfig = [
   'login',
   'submitTicket',
+  'ServiceReview',
+  'dynamicStatistics',
   'settings',
   'createQuery',
   'root',

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

@@ -29,12 +29,16 @@ routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/logi
 routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
 // 系统问题反馈工单
 routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
+// 通用服务评价
+routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
 // 系统设置
 routerResource.settings = () => import('@vue2-client/pages/system/settings')
 // 查询配置生成工具
 routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage')
 // AMIS示例页面
 routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
+// 数据检索
+routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
 
 // 基础路由组件注册
 const routerMap = {

package/src/router/index.js

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

package/src/router.js

@@ -10,6 +10,7 @@ const routes = [
   { path: '/XStepView', component: loadView('XStepView') },
   { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
   { path: '/Amis2', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo2') },
+  { path: '/DynamicStatistics', component: () => import('@vue2-client/pages/DynamicStatistics/index') },
   // ... 其他路由
 ]
 export default routes

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 }

package/src/utils/indexedDB.js

@@ -92,6 +92,22 @@ export const indexedDB = {
       }
     })
   },
+  getAll: function (callback) {
+    const self = this
+    self.openDB((res) => {
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.getAll()
+      request.onerror = function () {
+        console.log('读取数据失败')
+      }
+      request.onsuccess = function (e) {
+        const result = e.target.result
+        if (typeof (callback) === 'function') {
+          callback(result)
+        }
+      }
+    })
+  },
   getByWeb: function (key, url, params, callback, processFun) {
     const self = this
     self.openDB((res) => {

package/src/utils/map-utils.js

@@ -11,7 +11,7 @@ async function GetGDMap (secretKey, key) {
       key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
       version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
       plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
         'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       AMapUI: {
         version: '1.1', // AMapUI 缺省 1.1

package/src/utils/routerUtil.js

@@ -383,14 +383,14 @@ function positionRouter (r) {
   return router
 }
 
-function funcToRouterOA(func) {
+function funcToRouterOA (func) {
   return [{
     router: 'root',
     children: positionRouterOA(parsefuncOA(func))
   }]
 }
 
-function positionRouterOA(r) {
+function positionRouterOA (r) {
   let router = []
   for (const row of r) {
     router[row.position] = row
@@ -399,7 +399,7 @@ function positionRouterOA(r) {
   return router
 }
 
-function parsefuncOA(func) {
+function parsefuncOA (func) {
   const router = []
   for (const row of func) {
     const route = {

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}

package/vue.config.js

@@ -43,7 +43,12 @@ module.exports = {
         pathRewrite: { '^/resource': '/' },
         target: 'http://127.0.0.1:4789',
         changeOrigin: true
-      }
+      },
+      '/ai': {
+        target: 'http://192.168.50.67:31761',
+        pathRewrite: { '^/ai': '/' },
+        changeOrigin: true
+      },
     },
     client: {
       overlay: false