Skip to content

F
founder_vue
Commit 1c192a8c by dupengfei
Options

修改首次进入页面 不加载数据问题

parent 8d3898fe
Showing with 223 additions and 103 deletions
package-lock.json
......@@ -1913,6 +1913,7 @@
"thread-loader": "^2.1.3",
"url-loader": "^2.2.0",
"vue-loader": "^15.9.2",
"vue-loader-v16": "npm:vue-loader@^16.0.0-beta.7",
"vue-style-loader": "^4.1.2",
"webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.8.0",
......@@ -3866,9 +3867,9 @@
}
},
"base64-arraybuffer": {
"version": "0.2.0",
"resolved": "https://registry.npm.taobao.org/base64-arraybuffer/download/base64-arraybuffer-0.2.0.tgz",
"integrity": "sha1-S5RPrAGRqlkHr+LYyZnMxXzoD0U="
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
},
"base64-js": {
"version": "1.3.1",
......@@ -3911,6 +3912,15 @@
"resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz?cache=0&sync_timestamp=1593261249239&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbinary-extensions%2Fdownload%2Fbinary-extensions-1.13.1.tgz",
"integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U="
},
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"optional": true,
"requires": {
"file-uri-to-path": "1.0.0"
}
},
"block-stream": {
"version": "0.0.9",
"resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
......@@ -4510,6 +4520,7 @@
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"optional": true,
"requires": {
"bindings": "^1.5.0",
"nan": "^2.12.1"
}
}
......@@ -5570,11 +5581,11 @@
}
},
"css-line-break": {
"version": "1.1.1",
"resolved": "https://registry.npm.taobao.org/css-line-break/download/css-line-break-1.1.1.tgz",
"integrity": "sha1-1em90peEAJnrBQPHMQ/TSSegJu8=",
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
"integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
"requires": {
"base64-arraybuffer": "^0.2.0"
"utrie": "^1.0.2"
}
},
"css-loader": {
......@@ -7222,6 +7233,12 @@
"resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
},
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"optional": true
},
"filesize": {
"version": "3.6.1",
"resolved": "https://registry.npm.taobao.org/filesize/download/filesize-3.6.1.tgz",
......@@ -7973,11 +7990,12 @@
}
},
"html2canvas": {
"version": "1.0.0-rc.7",
"resolved": "https://registry.npm.taobao.org/html2canvas/download/html2canvas-1.0.0-rc.7.tgz",
"integrity": "sha1-cMFZzg5jlUqRFpUxiU0IrVYnrJg=",
"version": "1.4.1",
"resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
"integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
"requires": {
"css-line-break": "1.1.1"
"css-line-break": "^2.1.0",
"text-segmentation": "^1.0.3"
}
},
"htmlparser2": {
......@@ -9555,6 +9573,11 @@
"minimist": "^1.2.5"
}
},
"moment": {
"version": "2.29.4",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
},
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
......@@ -12200,8 +12223,8 @@
},
"relation-graph": {
"version": "1.1.0",
"resolved": "https://registry.nlark.com/relation-graph/download/relation-graph-1.1.0.tgz",
"integrity": "sha1-T6R80v12YwXk6ZYnwfRk5+mM0KY=",
"resolved": "https://registry.npmmirror.com/relation-graph/-/relation-graph-1.1.0.tgz",
"integrity": "sha512-bPBjFOStki5kJqVDkcoTVg1pEg8tztsHk2XLjyc7i16RQFoZcAU0SJRwlAtG9ClLVNWlBYACxOS1lap9Ri3i6A==",
"requires": {
"html2canvas": "^1.0.0-rc.5",
"screenfull": "^4.2.0",
......@@ -12665,8 +12688,8 @@
},
"screenfull": {
"version": "4.2.1",
"resolved": "https://registry.npm.taobao.org/screenfull/download/screenfull-4.2.1.tgz?cache=0&sync_timestamp=1608796473351&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fscreenfull%2Fdownload%2Fscreenfull-4.2.1.tgz",
"integrity": "sha1-MkW3vHPSt8mhW9jKr2ll23y8fwQ="
"resolved": "https://registry.npmmirror.com/screenfull/-/screenfull-4.2.1.tgz",
"integrity": "sha512-PLSp6f5XdhvjCCCO8OjavRfzkSGL3Qmdm7P82bxyU8HDDDBhDV3UckRaYcRa/NDNTYt8YBpzjoLWHUAejmOjLg=="
},
"script-loader": {
"version": "0.7.2",
......@@ -13788,6 +13811,14 @@
}
}
},
"text-segmentation": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
"integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
"requires": {
"utrie": "^1.0.2"
}
},
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz",
......@@ -14387,6 +14418,14 @@
"resolved": "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz",
"integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
},
"utrie": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
"integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
"requires": {
"base64-arraybuffer": "^1.0.2"
}
},
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.4.0.tgz?cache=0&sync_timestamp=1601826526166&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuuid%2Fdownload%2Fuuid-3.4.0.tgz",
......@@ -14537,6 +14576,63 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-photo-preview": {
"version": "1.1.3",
"resolved": "https://registry.npm.taobao.org/vue-photo-preview/download/vue-photo-preview-1.1.3.tgz",
......
src/components/qxda_compontents.vue
......@@ -311,7 +311,7 @@ export default {
json["timeEnd"] = self.cxSj[1];
}
} else {
if(this.pageBs == 'tzGx' || this.pageBs == 'ryXwgj'){
if(this.pageBs == 'tzGx' || this.pageBs == 'ryXwgj' || this.pageBs == 'sjda' || this.pageBs == 'carda'){
return
}
}
......
src/router/index.js
......@@ -63,13 +63,23 @@ const router = new VueRouter({
next();
});*/
router.beforeEach((to, from, next)=>{
if (to.path != 'login'){
request.getYhxx("").then(res => {
if (res.success === true) {
sessionStorage.setItem("userInfo",JSON.stringify(res.data.rows));
}
})
}
next();
})
router.afterEach((to) => {
if(to.path!='/login'&&to.path!='/dwcxIndex'){
if(to.path!='/dwqsajIndex'){
request.getYhxx("").then(res => {
if (res.success === true) {
Watermark.set(res.data.rows.trueName==null?'':res.data.rows.trueName,res.data.rows.identitycard==null?'':res.data.rows.identitycard,res.data.rows.unitname==null?'':res.data.rows.unitname,res.data.rows.policemanid==null?'':res.data.rows.policemanid,res.data.rows.ip==null?'':res.data.rows.ip)
sessionStorage.setItem("userInfo",JSON.stringify(res.data.rows));
}
});
}
......
src/views/ryda/carda.vue
......@@ -202,6 +202,7 @@
:cxUrl="mycarCxUrl"
:cxType="mycarCxType"
:cxSj="cxSj"
:pageBs="pageBs"
></table-component>
</div>
</div>
......@@ -254,6 +255,7 @@ export default {
name: "carda",
data() {
return {
pageBs: 'carda',
form: {},
formData: [
{
......@@ -467,12 +469,12 @@ export default {
carLsFormThead: [
{
label: "姓名",
width: "450",
width: "400",
prop: "xm",
},
{
label: "证件号码",
width: "450",
width: "400",
prop: "zjhm",
},
],
......@@ -487,12 +489,12 @@ export default {
carwzFormThead: [
{
label: "姓名",
width: "450",
width: "400",
prop: "xm",
},
{
label: "证件号码",
width: "450",
width: "400",
prop: "zjhm",
},
],
......@@ -569,9 +571,9 @@ export default {
pageNumber: 1,
pageSize: 10,
//请求人姓名
qqyhm : JSON.parse(sessionStorage.getItem("userInfo")).trueName,
qqrsfzh : JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
qqip : JSON.parse(sessionStorage.getItem("userInfo")).ip
qqyhm : '',
qqrsfzh : '',
qqip : ''
},
mycarCxUrl: "/meiya/getMyClGjXxx",
mycarCxType: "thjl",
......@@ -678,24 +680,37 @@ export default {
],
},
trueName:'',
identitycard:'',
ipAddress: ''
};
},
created() {
requestUserInfo.getYhxx("").then((res)=>{
if (res.success === true){
let qqyhm = res.data.rows.trueName;
let qqip = res.data.rows.ip;
let qqrsfzh = res.data.rows.identitycard;
this.mycarQueryData.qqyhm = qqyhm;
this.mycarQueryData.qqip = qqip;
this.mycarQueryData.qqrsfzh = qqrsfzh;
this.trueName = qqyhm;
this.identitycard = qqrsfzh;
this.ipAddress = qqip;
}
})
},
mounted() {
this.initData();
//this.initData();
this.getClXx();
this.getClJbxx();
this.defaultDate();
},
methods: {
initData(){
requestUserInfo.getYhxx("").then((res) => {
if (res.success === true){
sessionStorage.setItem("userInfo",JSON.stringify(res.data.rows));
}
})
},
defaultDate(){
const end = new Date();
const start = new Date();
......@@ -740,15 +755,15 @@ export default {
getClJbxx() {
let self = this;
let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
let json = {};
//查询证件好
json["cphm"] = self.$route.query["cphm"];
//请求人姓名
json["qqyhm"] = userInfo.trueName;
json["qqrsfzh"] = userInfo.identitycard;
json["qqip"] = userInfo.ip;
json["qqyhm"] = this.trueName;
json["qqrsfzh"] = this.identitycard;
json["qqip"] = this.ip;
self.postCarJbxx(JSON.stringify(json)).then((res) => {
if (res.success === true) {
......
src/views/ryda/ryGl.vue
......@@ -639,12 +639,25 @@ export default {
loadingSj: false,
trueName:'',
identitycard:'',
ipAddress: ''
};
},
created() {
requestUserInfo.getYhxx("").then((res)=>{
if (res.success === true){
this.trueName = res.data.rows.trueName;
this.identitycard = res.data.rows.ip;
this.ipAddress = res.data.rows.identitycard;
}
})
},
mounted() {
if (this.$route.query["zjhm"]) {
sessionStorage.setItem("zjhm", this.$route.query["zjhm"]);
this.initData();
}
this.getRyxx();
......@@ -659,28 +672,17 @@ export default {
},
methods: {
initData(){
requestUserInfo.getYhxx("").then((res) => {
if (res.success === true){
sessionStorage.setItem("userInfo",JSON.stringify(res.data.rows));
}
})
},
//职业 常用地址
getPersonBasicData(){
this.initData();
let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
let json = {};
//查询证件好
json["zjhm"] = this.$route.query["zjhm"];
//请求人姓名
json["qqyhm"] = userInfo.trueName;
json["qqrsfzh"] = userInfo.identitycard;
json["qqip"] = userInfo.ip;
json["qqyhm"] = this.trueName;
json["qqrsfzh"] = this.identitycard;
json["qqip"] = this.ip;
this.loadingZy = true;
request({
......@@ -714,9 +716,6 @@ export default {
//手机号 驾照号
getXsgxSjhm(){
this.initData()
let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
let json = {};
//查询证件好
......@@ -725,9 +724,9 @@ export default {
json["type"] = "01";
//请求人姓名
json["qqyhm"] = userInfo.trueName;
json["qqrsfzh"] = userInfo.identitycard;
json["qqip"] = userInfo.ip;
json["qqyhm"] = this.trueName;
json["qqrsfzh"] = this.identitycard;
json["qqip"] = this.ip;
this.loadingSj = true;
request({
url: url.rzURL + "/meiya/getMyXsGxxx",
......@@ -761,17 +760,15 @@ export default {
//驾照号
getXsgxJzhm(){
let userInfo = JSON.parse(sessionStorage.getItem("userInfo"));
let json = {};
//查询证件好
json["value"] = this.$route.query["zjhm"];
json["type"] = "01";
//请求人姓名
json["qqyhm"] = userInfo.trueName;
json["qqrsfzh"] = userInfo.identitycard;
json["qqip"] = userInfo.ip;
json["qqyhm"] = this.trueName;
json["qqrsfzh"] = this.identitycard;
json["qqip"] = this.ip;
this.loadingJz = true;
request({
......
src/views/ryda/sjda.vue
......@@ -149,7 +149,7 @@
</div>
<div class="sjda_dzgj_title_right">
<el-date-picker
v-model="cxSj"
v-model="cxSjGj"
type="datetimerange"
:picker-options="pickerOptions"
range-separator="至"
......@@ -400,9 +400,9 @@ export default {
mySjQueryData: {
value: this.$route.query["sjhm"],
type: '01',
qqyhm : JSON.parse(sessionStorage.getItem("userInfo")).trueName,
qqrsfzh : JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
qqip : JSON.parse(sessionStorage.getItem("userInfo")).ip
qqyhm : '',
qqrsfzh : '',
qqip : ''
},
mySjCxUrl: "/meiya/getMySmGxxx",
mySjCxType: "mySjh",
......@@ -522,9 +522,9 @@ export default {
pageNumber: 1,
pageSize: 10,
//请求人姓名
qqyhm : JSON.parse(sessionStorage.getItem("userInfo")).trueName,
qqrsfzh : JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
qqip : JSON.parse(sessionStorage.getItem("userInfo")).ip
qqyhm : '',
qqrsfzh : '',
qqip : ''
},
wlkdCxUrl: "/meiya/getMyJdFxxx",
wlkdCxType: "wlkd",
......@@ -601,9 +601,9 @@ export default {
pageNumber: 1,
pageSize: 10,
//请求人姓名
qqyhm : JSON.parse(sessionStorage.getItem("userInfo")).trueName,
qqrsfzh : JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
qqip : JSON.parse(sessionStorage.getItem("userInfo")).ip
qqyhm : '',
qqrsfzh : '',
qqip : ''
},
tlgxCxUrl: "/meiya/getMyTlGxXx",
tlgxCxType: "tlgx",
......@@ -618,6 +618,7 @@ export default {
map: null,
cxSj: [],
cxSj2: [],
cxSjGj: [],
pickerOptions: {
shortcuts: [
{
......@@ -720,44 +721,45 @@ export default {
},
trueName:'',
idcard:'',
ipadd: ''
identitycard:'',
ipAddress: ''
};
},
created() {
requestUserInfo.getYhxx("").then((res)=>{
if (res.success === true){
let qqyhm = res.data.rows.trueName;
let qqip = res.data.rows.ip;
let qqrsfzh = res.data.rows.identitycard;
this.mySjQueryData.qqyhm = qqyhm;
this.mySjQueryData.qqip = qqip;
this.mySjQueryData.qqrsfzh = qqrsfzh;
this.wlkdQueryData.qqyhm = qqyhm;
this.wlkdQueryData.qqip = qqip;
this.wlkdQueryData.qqrsfzh = qqrsfzh;
this.tlgxQueryData.qqyhm = qqyhm;
this.tlgxQueryData.qqip = qqip;
this.tlgxQueryData.qqrsfzh = qqrsfzh;
}
})
},
mounted() {
//this.initData();
// this.getData();
// this.getDataTwo();
//this.getsjXx();
//this.getPhoneTrack();
//this.getPhoneLastStation();
//this.defaultDate();
this.work();
this.getsjXx();
this.getPhoneTrack();
this.getPhoneLastStation();
this.defaultDate();
//this.work();
},
methods: {
async work(){
await this.initData();
// this.getData();
// this.getDataTwo();
await this.getsjXx();
await this.getPhoneTrack();
await this.getPhoneLastStation();
await this.defaultDate();
},
initData(){
requestUserInfo.getYhxx("").then((res) => {
if (res.success === true){
sessionStorage.setItem("userInfo",JSON.stringify(res.data.rows));
}
})
},
defaultDate(){
const end = new Date();
const start = new Date();
......@@ -836,10 +838,10 @@ export default {
var json = {};
json["objectValue"] = self.$route.query["sjhm"];
json["objectType"] = "sjhm";
json["cxSj"] = self.cxSj
json["cxSj"] = self.cxSjGj
? `${window.util.timeStampTurnTime(
self.cxSj[0]
)} ${window.util.timeStampTurnTime(self.cxSj[1])}`
self.cxSjGj[0]
)} ${window.util.timeStampTurnTime(self.cxSjGj[1])}`
: "";
var parms = { id: "map", PositionUi: "right-top", ShowDisplay: false };
var opMap = new OpMap();
......@@ -1307,7 +1309,7 @@ export default {
},
},
watch: {
cxSj: {
cxSjGj: {
handler() {
this.getPhoneTrack();
},
......
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