Skip to content

F
founder_vue
Commit e31bee98 by zhangzhijie
Options

Merge remote-tracking branch 'origin/dev_xzxt_huNan' into dev_xzxt_huNan 

# Conflicts:
#	src/views/ryda/carda.vue
parents 18fb84e7 c1f6209d
Showing with 47 additions and 36 deletions
src/api/base.js
......@@ -9,8 +9,8 @@ let base = {
// ztptURL: "http://26.120.5.129:8006", //通辽
ztptURL: "http://26.3.13.120:8088",
codeUrl: "",
BaseURL: "/apiAjzbGaw", //"/apiAjzbGaw", //基础查询页得ip apiAjzb
rzURL: "/apiXzxtGaw", // "/apiXzxtGaw", //刑专二期得(日志)ip
BaseURL: "/apiAjzb", //"/apiAjzbGaw", //基础查询页得ip apiAjzb
rzURL: "/apiAjzb", // "/apiXzxtGaw", //刑专二期得(日志)ip
ydjwURL: "/apiYdjw", //移动警务终端版本管理
qgcxURL: '/apiQgCx', // 全国查询
cadaURL:'/cadaURL',
......
src/components/qxda_compontents.vue
......@@ -85,7 +85,7 @@
<span v-if="page == 'jq'" style="font-size: 15px; font-weight: 800">
{{ jbcjbxxThear }}
</span>
<span> ({{ tableData ? tableData.length : 0 }})</span>
<span> ({{ dataLength}})</span>
</div>
<!--表格-->
<el-table
......@@ -220,7 +220,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage1"
:page-size="page_size1"
:page-size="page_size"
layout="prev, pager, next"
:total="dataLength"
>
......@@ -264,7 +264,6 @@ export default {
formThead: this.DefaultAjFormThead,
currentPage1: 1,
page_size: 5,
page_size1: 2,
queryData: this.propQueryData,
tableLoading: false,
tableData: [],
......@@ -391,12 +390,10 @@ export default {
return arr;
},
handleSizeChange(val) {
debugger;
this.page_size = val;
this.doQuery("yes");
},
handleCurrentChange(val) {
debugger;
this.currentPage1 = val;
this.doQuery("yes");
},
......@@ -445,7 +442,6 @@ export default {
? parseInt(res.data.total)
: parseInt(res.data.result.total);
self.phoneInfo = res.data.phoneInfo;
debugger;
}
// self.closeLoading();
} else {
......@@ -464,8 +460,7 @@ export default {
});
} else {
json.page = this.currentPage1;
if (self.cxSj && self.fj == "queryFj") {
debugger;
if (self.cxSj && self.fj == "queryFj") {
json["startDate"] =
self.cxSj != "" && self.cxSj != null
? `${window.util.timeStampTurnTime(self.cxSj[0])}`
......@@ -497,7 +492,6 @@ export default {
self.tableData = res.data.rows;
self.dataLength = parseInt(res.data.total);
self.phoneInfo = res.data.phoneInfo;
debugger;
self.tableLoading = false;
// self.closeLoading();
} else {
......@@ -524,7 +518,6 @@ export default {
? parseInt(res.data.total)
: parseInt(res.data.result.total);
self.phoneInfo = res.data.phoneInfo;
debugger;
self.tableLoading = false;
// self.closeLoading();
} else {
......
src/views/ryda/carDa/carDaAsj.vue
......@@ -248,7 +248,6 @@ export default {
};
},
created() {
debugger;
console.log(this.value);
},
methods: {
......@@ -307,7 +306,6 @@ export default {
this.$refs.tree.filter(val);
},
value(val) {
debugger;
// var aDate, oDate1, oDate2, iDays;
// aDate = val[0].split("-");
// oDate1 = new Date(aDate[1] + "," + aDate[2] + "," + aDate[0]);
......
src/views/ryda/carDa/carDadj.vue
......@@ -449,7 +449,6 @@ export default {
},
'showDj': {
handler(nerVal) {
debugger
if (nerVal == true) {
this.$refs.rightContent.doQuery('yes')
}
......@@ -458,7 +457,6 @@ export default {
deep: true,
},
value(val) {
debugger;
// var aDate, oDate1, oDate2, iDays;
// aDate = val[0].split("-");
// oDate1 = new Date(aDate[1] + "," + aDate[2] + "," + aDate[0]);
......
src/views/ryda/carDa/carDagj.vue
......@@ -199,7 +199,6 @@ export default {
};
},
created() {
debugger;
console.log(this.value);
},
methods: {
......@@ -373,7 +372,6 @@ export default {
this.$refs.tree.filter(val);
},
value(val) {
debugger;
var aDate, oDate1, oDate2, iDays;
var kssj = val[0].substring(0, 10);
var jssj = val[1].substring(0, 10);
......
src/views/ryda/carDa/car_compontents.vue
......@@ -110,7 +110,7 @@
:width="columnTitle.width"
>
<template slot-scope="scope">
<div class="color2" v-html="scope.row[index]"></div>
<div class="color2" v-html="scope.row[columnTitle.prop]"></div>
</template>
</el-table-column>
<el-table-column
......@@ -221,7 +221,6 @@ export default {
};
},
created() {
debugger
// this.doQuery(this.doYes);
},
methods: {
......@@ -238,7 +237,7 @@ export default {
this.$emit("details", scope);
},
wpXqzp(scope) {
this.$emit('wpXqzp',scope)
this.$emit("wpXqzp", scope);
},
orderBy(column) {
let self = this,
......@@ -337,12 +336,10 @@ export default {
return arr;
},
handleSizeChange(val) {
debugger;
this.page_size = val;
this.doQuery("yes");
},
handleCurrentChange(val) {
debugger;
this.currentPage1 = val;
this.doQuery("yes");
},
......@@ -367,7 +364,6 @@ export default {
}
},
doQuery(flag) {
debugger
let self = this,
json = {};
this.tableLoading = true;
......@@ -381,9 +377,7 @@ export default {
if (res.code === 200) {
self.tableLoading = false;
if (self.cxType == "cljbxxDj") {
let array = [];
array.push(res.data.result.rows);
self.tableData = array;
self.tableData.push(res.data.result.rows);
} else {
self.tableData = res.data.rows
? res.data.rows
......@@ -392,9 +386,8 @@ export default {
? parseInt(res.data.total)
: parseInt(res.data.result.total);
self.phoneInfo = res.data.phoneInfo;
debugger;
}
// self.closeLoading();
console.log('11111',self.tableData);
} else {
/*self.$message({
type: "error",
......@@ -410,7 +403,6 @@ export default {
} else {
json.page = this.currentPage1;
if (self.cxSj && self.fj == "queryFj") {
debugger;
json["startDate"] =
self.cxSj != "" && self.cxSj != null
? `${window.util.timeStampTurnTime(self.cxSj[0])}`
......@@ -442,7 +434,7 @@ export default {
self.tableData = res.data.rows;
self.dataLength = parseInt(res.data.total);
self.phoneInfo = res.data.phoneInfo;
debugger;
self.tableLoading = false;
// self.closeLoading();
} else {
......@@ -469,7 +461,7 @@ export default {
? parseInt(res.data.total)
: parseInt(res.data.result.total);
self.phoneInfo = res.data.phoneInfo;
debugger;
self.tableLoading = false;
// self.closeLoading();
} else {
......
src/views/ryda/ryGl.vue
......@@ -1415,10 +1415,7 @@ export default {
if (this.$route.query["zjhm"]) {
sessionStorage.setItem("zjhm", this.$route.query["zjhm"]);
}
this.getRyxx();
this.postgetJjpgLwxxList();
this.postgetJjpgCxfsList();
this.showSeeksGraph();
this.loginByZjhm();
self.propQueryField.forEach((val) => {
if (val.type == "code" || val.type == "codeTreeDialog") {
if (val.codeOptions.length == 0) {
......@@ -2625,6 +2622,41 @@ export default {
onLineClick(lineObject, $event) {
console.log("onLineClick:", lineObject);
},
postLoginByZjhm(zjhm) {
return request({
url: url.rzURL + "/loginByZjhm?zjhm=" + zjhm,
// data: JSON.parse(zjhm),
method: "POST",
});
},
loginByZjhm() {
if (this.$route.query["idcard"]) {
let zjhm = this.$route.query["idcard"];
console.log(zjhm);
this.postLoginByZjhm(zjhm).then((res) => {
if (res.code == 200) {
this.$router.push({
path: "/rydaIndex/ryGL",
query: { zjhm: sessionStorage.getItem("zjhm") },
});
debugger;
this.getRyxx();
this.postgetJjpgLwxxList();
this.postgetJjpgCxfsList();
this.showSeeksGraph();
// this.initMap();
} else {
this.$message.error("登录失败");
}
});
} else {
this.getRyxx();
this.postgetJjpgLwxxList();
this.postgetJjpgCxfsList();
this.showSeeksGraph();
// this.initMap();
}
},
},
// watch: {
// ldList (val) {
......
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