Commit 7ca02c84 by yuhao

修改

parent d53d18f5
...@@ -2,6 +2,8 @@ import Vue from "vue"; ...@@ -2,6 +2,8 @@ import Vue from "vue";
import VueRouter from "vue-router"; import VueRouter from "vue-router";
import loginRoutes from "./modules/login"; import loginRoutes from "./modules/login";
import statistical from "./modules/statistical"; import statistical from "./modules/statistical";
import Util from '../utils/util'
import Watermark from "../utils/watermark.js"
const originalPush = VueRouter.prototype.push; const originalPush = VueRouter.prototype.push;
...@@ -55,5 +57,26 @@ const router = new VueRouter({ ...@@ -55,5 +57,26 @@ const router = new VueRouter({
// } // }
// next(); // next();
// }); // });
router.afterEach((to, from) => {
if (to.path != '/login') {
let userInfo = window.sessionStorage.getItem("userInfo") || "";
if (userInfo) {
userInfo = JSON.parse(window.sessionStorage.getItem("userInfo"))
let zjhm = userInfo.identitycard.replace(/^(.{10})(?:\d+)(.{4})$/, "$1****$2")
let name = userInfo.realname.substring(0, userInfo.realname.length - 1)
let names = userInfo.realname.replace(name, '***')
let xmmc = '跨区域协作平台'
let time = Util.timeStampTurnTime(new Date().getTime())
let one = `${zjhm} ${names}`
let two = `${userInfo.ip} ${time}`
Watermark.set(xmmc, one, two)
}
} else if (from.path == '/queryBaxz' || from.path == '/queryDshxz' || from.path == '/queryDbxz' || from.path == '/queryYbxz' || from.path == '/queryApproval') {
Watermark.set('', '', '')
}
});
export default router; export default router;
...@@ -324,7 +324,7 @@ export default { ...@@ -324,7 +324,7 @@ export default {
name: "协作单位", name: "协作单位",
id: "xzdwdm", id: "xzdwdm",
props: "checkEmpty", props: "checkEmpty",
type: "codeTreeDialogs", type: "codeTreeDialog",
readonly: false, readonly: false,
value: "", value: "",
placeholder: "请选择", placeholder: "请选择",
......
...@@ -555,14 +555,14 @@ export default { ...@@ -555,14 +555,14 @@ export default {
this.getZhrList() this.getZhrList()
}, },
async getZhrList () { async getZhrList () {
this.downLoading = true this.columObjXyr.loading = true
const paramas = new FormData() const paramas = new FormData()
paramas.append('glxxzjbh', this.$route.query.id) paramas.append('glxxzjbh', this.$route.query.id)
paramas.append('page', this.pageObjXyr.pageData.page) paramas.append('page', this.pageObjXyr.pageData.page)
paramas.append('limit', this.pageObjXyr.pageData.size) paramas.append('limit', this.pageObjXyr.pageData.size)
let res = await selectAllZhr(paramas) let res = await selectAllZhr(paramas)
if (res && res.code == 200) { if (res && res.code == 200) {
this.downLoading = false this.columObjXyr.loading = false
this.tableDataXyr = res.data.rows this.tableDataXyr = res.data.rows
this.pageObjXyr.total = res.data.total this.pageObjXyr.total = res.data.total
console.log(this.ruleForm, 12343543534); console.log(this.ruleForm, 12343543534);
......
...@@ -327,7 +327,7 @@ export default { ...@@ -327,7 +327,7 @@ export default {
name: "协作单位", name: "协作单位",
id: "xzdwdm", id: "xzdwdm",
props: "checkEmpty", props: "checkEmpty",
type: "codeTreeDialogs", type: "codeTreeDialog",
readonly: false, readonly: false,
value: "", value: "",
placeholder: "请选择", placeholder: "请选择",
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<template #btnGroup="scope"> <template #btnGroup="scope">
<el-button class="hbyp" <el-button class="hbyp"
type="text" type="text"
v-if="scope.scope.xzzt=='0'||scope.scope.xzzt=='1'" v-if="(scope.scope.xzzt=='0'||scope.scope.xzzt=='1')&&scope.scope.xxczryGmsfhm==userAuth.identitycard"
size="mini" size="mini"
@click="editBtn(scope.scope)">修改</el-button> @click="editBtn(scope.scope)">修改</el-button>
<el-button class="hbyp" <el-button class="hbyp"
...@@ -351,6 +351,7 @@ export default { ...@@ -351,6 +351,7 @@ export default {
params.append('page', this.pageObj.pageData.page) params.append('page', this.pageObj.pageData.page)
params.append('limit', this.pageObj.pageData.size) params.append('limit', this.pageObj.pageData.size)
params.append('gjzss', this.form.gjzss) params.append('gjzss', this.form.gjzss)
params.append('userId', this.userAuth.userId)
let res = await selectAll(params) let res = await selectAll(params)
if (res && res.code == 200) { if (res && res.code == 200) {
this.tableData = res.data.rows this.tableData = res.data.rows
......
...@@ -165,6 +165,7 @@ export default { ...@@ -165,6 +165,7 @@ export default {
params.set("identitycard", self.formLabelAlign.identitycard); params.set("identitycard", self.formLabelAlign.identitycard);
params.append("username", self.formLabelAlign.policemanid); params.append("username", self.formLabelAlign.policemanid);
params.append("unitname", self.unitname); params.append("unitname", self.unitname);
params.append("grade", 'S');
if (!self.xxzjbh) { if (!self.xxzjbh) {
self.addSubmit(params, loading); self.addSubmit(params, loading);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment