@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-29 11:14:13 | * @Date: 2021-11-29 11:14:13 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-13 17:36:38 | |||||
* @LastEditTime: 2021-12-14 09:26:47 | |||||
* @FilePath: \GpsCardAdmin\README.md | * @FilePath: \GpsCardAdmin\README.md | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -76,4 +76,10 @@ IMPROVEMENT | |||||
FIX | FIX | ||||
- 修复 表格-操作列显示问题 | - 修复 表格-操作列显示问题 | ||||
- 取消 搜索选择类别 | - 取消 搜索选择类别 | ||||
- 修改 输入搜索框提示都为 '请输入内容' | |||||
- 修改 输入搜索框提示都为 '请输入内容' | |||||
## v1.0.8F | |||||
`2021年12月14日` | |||||
FIX | |||||
- 修复 token过期移动端无法跳转的问题 | |||||
- 删除 页面中不使用的 TopMenu组件 |
@@ -1,8 +1,8 @@ | |||||
/* | /* | ||||
* @Date: 2021-11-30 15:09:25 | * @Date: 2021-11-30 15:09:25 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-13 11:35:53 | |||||
* @LastEditTime: 2021-12-14 09:28:08 | |||||
* @FilePath: \GpsCardAdmin\src\utils\model.js | * @FilePath: \GpsCardAdmin\src\utils\model.js | ||||
* @description: 版本号 | * @description: 版本号 | ||||
*/ | */ | ||||
export const VersionModel = '1.0.7'; | |||||
export const VersionModel = '1.0.8'; |
@@ -1,7 +1,14 @@ | |||||
/* | |||||
* @Date: 2021-12-08 15:59:46 | |||||
* @LastEditors: JinxuChen | |||||
* @LastEditTime: 2021-12-14 09:25:12 | |||||
* @FilePath: \GpsCardAdmin\src\utils\request.js | |||||
* @description: | |||||
*/ | |||||
import axios from 'axios' | import axios from 'axios' | ||||
import { MessageBox, Message } from 'element-ui' | import { MessageBox, Message } from 'element-ui' | ||||
import store from '@/store' | import store from '@/store' | ||||
import { getToken } from '@/utils/auth' | |||||
/* import { getToken } from '@/utils/auth' */ | |||||
// create an axios instance | // create an axios instance | ||||
const service = axios.create({ | const service = axios.create({ | ||||
@@ -53,12 +60,12 @@ service.interceptors.response.use( | |||||
duration: 5 * 1000 | duration: 5 * 1000 | ||||
}) | }) | ||||
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; | |||||
if (res.code === 50008 || res.code === 50012 || res.code === 50014) { | |||||
// 106 token验证过期; | |||||
if (res.code === 106) { | |||||
// to re-login | // to re-login | ||||
MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { | |||||
confirmButtonText: 'Re-Login', | |||||
cancelButtonText: 'Cancel', | |||||
MessageBox.confirm('登录过期,是否重新登录?', { | |||||
confirmButtonText: '确认', | |||||
cancelButtonText: '取消', | |||||
type: 'warning' | type: 'warning' | ||||
}).then(() => { | }).then(() => { | ||||
store.dispatch('user/resetToken').then(() => { | store.dispatch('user/resetToken').then(() => { | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-13 17:31:26 | |||||
* @LastEditTime: 2021-12-14 09:22:56 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-query\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -51,13 +51,12 @@ | |||||
</template> | </template> | ||||
<script> | <script> | ||||
import TopMenu from "@/components/TopMenu"; | |||||
import TTable from "../../../components/TTable/TTable"; | import TTable from "../../../components/TTable/TTable"; | ||||
import Pagination from "@/components/Pagination"; | import Pagination from "@/components/Pagination"; | ||||
import APIAlarmQuery from "@/api/alarm-query"; | import APIAlarmQuery from "@/api/alarm-query"; | ||||
export default { | export default { | ||||
name: "", | name: "", | ||||
components: { TTable, TopMenu, Pagination }, | |||||
components: { TTable, Pagination }, | |||||
data() { | data() { | ||||
return { | return { | ||||
model: "", | model: "", | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-13 17:30:06 | |||||
* @LastEditTime: 2021-12-14 09:24:43 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-recognition\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\alarm-recognition\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -126,14 +126,13 @@ | |||||
</template> | </template> | ||||
<script> | <script> | ||||
import TopMenu from "@/components/TopMenu"; | |||||
import TTable from "../../../components/TTable/TTable"; | import TTable from "../../../components/TTable/TTable"; | ||||
import Pagination from "@/components/Pagination"; | import Pagination from "@/components/Pagination"; | ||||
import UploadExcelComponent from "@/components/UploadExcel/index.vue"; | import UploadExcelComponent from "@/components/UploadExcel/index.vue"; | ||||
import APILimits from "@/api/off-limits-manage"; | import APILimits from "@/api/off-limits-manage"; | ||||
export default { | export default { | ||||
name: "", | name: "", | ||||
components: { TTable, TopMenu, Pagination, UploadExcelComponent }, | |||||
components: { TTable, Pagination, UploadExcelComponent }, | |||||
data() { | data() { | ||||
return { | return { | ||||
buttonList: [ | buttonList: [ | ||||
@@ -287,7 +286,6 @@ export default { | |||||
this.dialogPvVisible = true; | this.dialogPvVisible = true; | ||||
this.dialogStatus = "update"; | this.dialogStatus = "update"; | ||||
this.dialogTitle = "修改告警识别内容"; // copy obj | this.dialogTitle = "修改告警识别内容"; // copy obj | ||||
/* this.form = Object.assign({}, row); */ ; | |||||
this.form.categoryId = row.categoryId; | this.form.categoryId = row.categoryId; | ||||
this.form.createTime = new Date(this.form.createTime); | this.form.createTime = new Date(this.form.createTime); | ||||
this.form.typeRadio = row.kindId; | this.form.typeRadio = row.kindId; | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-13 17:32:25 | |||||
* @LastEditTime: 2021-12-14 09:23:18 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\common-exception\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -124,14 +124,13 @@ | |||||
</template> | </template> | ||||
<script> | <script> | ||||
import TopMenu from "@/components/TopMenu"; | |||||
import TTable from "../../../components/TTable/TTable"; | import TTable from "../../../components/TTable/TTable"; | ||||
import Pagination from "@/components/Pagination"; | import Pagination from "@/components/Pagination"; | ||||
import APIExceptionGen from "@/api/common-exception"; | import APIExceptionGen from "@/api/common-exception"; | ||||
import APILimits from "@/api/off-limits-manage"; | import APILimits from "@/api/off-limits-manage"; | ||||
export default { | export default { | ||||
name: "", | name: "", | ||||
components: { TTable, TopMenu, Pagination }, | |||||
components: { TTable, Pagination }, | |||||
data() { | data() { | ||||
return { | return { | ||||
model: "", | model: "", | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Author: your name | * @Author: your name | ||||
* @Date: 2021-12-07 15:14:51 | * @Date: 2021-12-07 15:14:51 | ||||
* @LastEditTime: 2021-12-13 17:33:49 | |||||
* @LastEditTime: 2021-12-14 09:24:18 | |||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @Description: 自动报警分类 | * @Description: 自动报警分类 | ||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\off-limits-main\off-limits-type\index.vue | ||||
@@ -98,14 +98,13 @@ | |||||
</template> | </template> | ||||
<script> | <script> | ||||
import TopMenu from "@/components/TopMenu"; | |||||
import TTable from "../../../../components/TTable/TTable"; | import TTable from "../../../../components/TTable/TTable"; | ||||
import Pagination from "@/components/Pagination"; | import Pagination from "@/components/Pagination"; | ||||
import CategoryAPI from "@/api/area-category.js"; | import CategoryAPI from "@/api/area-category.js"; | ||||
export default { | export default { | ||||
name: "", | name: "", | ||||
components: { TTable, TopMenu, Pagination }, | |||||
components: { TTable, Pagination }, | |||||
data() { | data() { | ||||
return { | return { | ||||
@@ -170,7 +169,7 @@ export default { | |||||
status: true, | status: true, | ||||
}; | }; | ||||
CategoryAPI.AddAreaCategory(data).then((res) => { | |||||
CategoryAPI.AddAreaCategory(data).then(() => { | |||||
this.$message({ | this.$message({ | ||||
message: "新增类别成功", | message: "新增类别成功", | ||||
type: "success", | type: "success", | ||||
@@ -187,7 +186,7 @@ export default { | |||||
status: true, | status: true, | ||||
}; | }; | ||||
CategoryAPI.AddAreaCategory(data).then((res) => { | |||||
CategoryAPI.AddAreaCategory(data).then(() => { | |||||
this.$message({ | this.$message({ | ||||
message: "修改类别成功", | message: "修改类别成功", | ||||
type: "success", | type: "success", | ||||
@@ -1,7 +1,7 @@ | |||||
<!-- | <!-- | ||||
* @Date: 2021-11-30 09:44:24 | * @Date: 2021-11-30 09:44:24 | ||||
* @LastEditors: JinxuChen | * @LastEditors: JinxuChen | ||||
* @LastEditTime: 2021-12-13 17:35:05 | |||||
* @LastEditTime: 2021-12-14 09:23:29 | |||||
* @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue | * @FilePath: \GpsCardAdmin\src\views\off-limits-manage\user-exception\index.vue | ||||
* @description: | * @description: | ||||
--> | --> | ||||
@@ -128,7 +128,6 @@ | |||||
</template> | </template> | ||||
<script> | <script> | ||||
import TopMenu from "@/components/TopMenu"; | |||||
import TTable from "../../../components/TTable/TTable"; | import TTable from "../../../components/TTable/TTable"; | ||||
import Pagination from "@/components/Pagination"; | import Pagination from "@/components/Pagination"; | ||||
import APIExceptionUser from "@/api/user-exception"; | import APIExceptionUser from "@/api/user-exception"; | ||||
@@ -136,7 +135,7 @@ import APIExceptionGen from "@/api/common-exception"; | |||||
import APILimits from "@/api/off-limits-manage"; | import APILimits from "@/api/off-limits-manage"; | ||||
export default { | export default { | ||||
name: "", | name: "", | ||||
components: { TTable, TopMenu, Pagination }, | |||||
components: { TTable, Pagination }, | |||||
data() { | data() { | ||||
return { | return { | ||||
model: "", //下拉框的值 | model: "", //下拉框的值 | ||||