Merge branch 'bugfix-user-exception' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxuChen
- * @LastEditTime: 2022-01-07 15:14:51
+ * @LastEditTime: 2022-01-08 16:19:21
  * @FilePath: \GpsCardAdmin\README.md
  * @description:
 -->
@@ -154,4 +154,13 @@ FIX
 `2021年1月7日`
 FIX
 - 修改 登录过期提示
-- 修改 登录过期提示一
+- 修改 登录过期提示一
+
+
+## v1.1.9F
+`2021年1月8日`
+FIX
+- 修改 登录过期提示
+- 增加 ie10,11兼容 //todo 需后端修改下nginx配置
+- 取消 通用例外显示方式
+- 取消 用户例外转通用类别的显示

babel.config.js

@@ -1,7 +1,15 @@
+/*
+ * @Date: 2021-11-30 15:35:16
+ * @LastEditors: JinxuChen
+ * @LastEditTime: 2022-01-08 15:26:58
+ * @FilePath: \GpsCardAdmin\babel.config.js
+ * @description:
+ */
 module.exports = {
   presets: [
     // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
-    '@vue/cli-plugin-babel/preset'
+    '@vue/cli-plugin-babel/preset',
+    /* ["@vue/app", {useBuiltIns: "entry",}] */
   ],
   'env': {
     'development': {

package.json

@@ -38,6 +38,7 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "23.6.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
+    "babel-polyfill": "^6.26.0",
     "chalk": "2.4.2",
     "connect": "3.6.6",
     "eslint": "6.7.2",

src/main.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-11-30 15:35:16
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-15 16:30:23
+ * @LastEditTime: 2022-01-08 15:36:12
  * @FilePath: \GpsCardAdmin\src\main.js
  * @description:
  */
@@ -11,7 +11,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
-import locale from 'element-ui/lib/locale/lang/en' // lang i18n
+/* import locale from 'element-ui/lib/locale/lang/en' */ // lang i18n
 
 import '@/styles/index.scss' // global css
 
@@ -19,6 +19,9 @@ import App from './App'
 import store from './store'
 import router from './router'
 import localStore from './store/localStore'
+import 'babel-polyfill';
+import 'core-js/stable';
+import 'regenerator-runtime/runtime'
 
 import '@/icons' // icon
 import '@/permission' // permission control

src/utils/model.js

@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxuChen
- * @LastEditTime: 2022-01-07 15:00:20
+ * @LastEditTime: 2022-01-08 15:34:50
  * @FilePath: \GpsCardAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.1.8';
+export const VersionModel = '1.1.9';

src/utils/request.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-12-08 15:59:46
  * @LastEditors: JinxuChen
- * @LastEditTime: 2022-01-07 15:15:13
+ * @LastEditTime: 2022-01-08 16:36:58
  * @FilePath: \GpsCardAdmin\src\utils\request.js
  * @description:
  */
@@ -75,7 +75,7 @@ service.interceptors.response.use(
         setTimeout(() => {
             store.dispatch('user/resetToken').then(() => {
                 Message({
-                    message:/*  res.message || */ 'token过期,请重新登录',
+                    message: 'token过期,请重新登录',
                     type: 'error',
                     duration: 1500
                   })
@@ -84,7 +84,7 @@ service.interceptors.response.use(
         }, 1500)
         return Promise.reject(new Error('token过期,请重新登录'))
       }
-      return Promise.reject(new Error(res.message))
+      /* return Promise.reject(new Error(res.message)) */
     } else {
       return res
     }

src/views/off-limits-manage/common-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-28 10:42:15
+ * @LastEditTime: 2022-01-08 16:23:36
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue
  * @description:
 -->
@@ -81,8 +81,8 @@
                 label-position="left"
                 label-width="70px"
             >
-                <!-- 类别 -->
-                <el-form-item label="类别" prop="model">
+                <!-- 类别 todo 暂时隐藏-->
+                <!-- <el-form-item label="类别" prop="model">
                     <el-select
                         v-model="form.model"
                         class="filter-item"
@@ -97,7 +97,7 @@
                             :value="item.value"
                         />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <!-- 内容名称 -->
                 <el-form-item label="内容名称" prop="content" label-width="80px" clearable>
                     <el-input v-model="form.content" style="width: 100%" />
@@ -140,9 +140,9 @@ export default {
             model: "",
             searchValue: "",
             columns: [
-                { prop: "type", title: "类型", fixed: 'left'},
-                { prop: "model", title: "类别" },
-                { prop: "content", title: "内容名称" },
+               /*  { prop: "type", title: "类型", },
+                { prop: "model", title: "类别" }, */
+                { prop: "content", title: "内容名称", fixed: 'left'},
                 { prop: "createTime", title: "创建时间" },
                 { prop: "status", title: "状态" },
                 {
@@ -222,7 +222,7 @@ export default {
             this.searchValue = '';
             let reqBody = {
                 id: 0,
-                categoryId: this.form.categoryId,
+                categoryId: /* this.form.categoryId */'1639028957414', //todo 需求暂时隐藏类别，使用默认的类别
                 keyword: this.form.content,
                 status: this.checkoutStatusToNum(this.form.status),
                 glat: 0,

src/views/off-limits-manage/user-exception/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-30 09:44:24
  * @LastEditors: JinxuChen
- * @LastEditTime: 2021-12-28 17:00:02
+ * @LastEditTime: 2022-01-08 16:27:51
  * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue
  * @description:
 -->
@@ -103,11 +103,11 @@
         </el-dialog>
         <!-- 转通用弹窗 -->
         <el-dialog :visible.sync="dialogTrans" :title="dialogTransTitle">
-            <p>请选择要转换的类别:</p>
+            <!-- <p>请选择要转换的类别:</p> -->
             <!-- <el-radio v-model="radio1" label="1" border>关键字</el-radio>
             <el-radio v-model="radio1" label="2" border>固定地点</el-radio>-->
             <!-- 类别 -->
-            <el-select
+            <!-- <el-select
                 v-model="model"
                 placeholder="类别"
                 style="width: 130px; margin-left: 10px;"
@@ -122,7 +122,7 @@
                     :value="item.value"
                     class="filter-item"
                 ></el-option>
-            </el-select>
+            </el-select> -->
             <span slot="footer" class="dialog-footer">
                 <el-button type="error" @click="dialogTrans = false">取消</el-button>
                 <el-button type="primary" @click="onTransConfirm">确认</el-button>
@@ -142,7 +142,7 @@ export default {
     components: { TTable, Pagination },
     data() {
         return {
-            model: "", //下拉框的值
+            model: '1639028957414', //下拉框的值
             content: "", //内容
             modelOptions: [],
             searchValue: "",
@@ -342,7 +342,7 @@ export default {
         onTransConfirm() {
             let reqBody = {
                 id: 0,
-                categoryId: this.model,
+                categoryId: this.model, //todo 需求暂时隐藏类别，使用默认的类别
                 keyword: this.content,
                 status: this.form.status,
                 glat: 0,

vue.config.js

@@ -59,7 +59,7 @@ module.exports = {
         include: 'initial'
       }
     ])
-
+    config.entry.app = ["babel-polyfill", "./src/main.js"];
     // when there are many pages, it will cause too many meaningless requests
     config.plugins.delete('prefetch')