Commit d2d6269c by yuhao

修改运控

parent 637941be
......@@ -759,57 +759,57 @@ export default {
let self = this,
tHeader = [],
filterVal = [];
// if (self.tableDataLength > 5000) {
// self.$message({
// type: "error",
// message: "最多只能导出5000条",
// });
// } else {
self.formData.limit = 5000;
const loading = this.$loading({
lock: true,
text: "正在导出...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
let json = {};
for (let i in self.formData) {
if (i != "cxSj") {
json[i] = self.formData[i];
} else {
json[i] =
self.formData[i] != "" && self.formData[i] != null
? self.formData[i].join(" - ")
: "";
if (self.tableDataLength > 5000) {
self.$message({
type: "error",
message: "最多只能导出5000条,请重新选择查询条件,进行导出!",
});
} else {
self.formData.limit = 5000;
const loading = this.$loading({
lock: true,
text: "正在导出...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
let json = {};
for (let i in self.formData) {
if (i != "cxSj") {
json[i] = self.formData[i];
} else {
json[i] =
self.formData[i] != "" && self.formData[i] != null
? self.formData[i].join(" - ")
: "";
}
}
tHeader = [];
filterVal = [];
self.propdefaultFormThead.forEach((val) => {
tHeader.push(val.label);
filterVal.push(val.prop);
});
self.doQueryRequest(JSON.stringify(json)).then((res) => {
if (res.success === true) {
require.ensure([], () => {
const {
export_json_to_excel,
} = require("../vendor/Export2Excel");
const list = res.data.rows;
const data = self.formatJson(filterVal, list);
export_json_to_excel(tHeader, data, self.excelHeader);
});
loading.close();
} else {
loading.close();
self.$message({
type: "error",
message: "查询失败",
});
}
self.tableLoadingEmit = false;
});
}
tHeader = [];
filterVal = [];
self.propdefaultFormThead.forEach((val) => {
tHeader.push(val.label);
filterVal.push(val.prop);
});
self.doQueryRequest(JSON.stringify(json)).then((res) => {
if (res.success === true) {
require.ensure([], () => {
const {
export_json_to_excel,
} = require("../vendor/Export2Excel");
const list = res.data.rows;
const data = self.formatJson(filterVal, list);
export_json_to_excel(tHeader, data, self.excelHeader);
});
loading.close();
} else {
loading.close();
self.$message({
type: "error",
message: "查询失败",
});
}
self.tableLoadingEmit = false;
});
// }
},
handleCurrentChange (val) {
this.currentPage1 = val;
......
......@@ -12232,7 +12232,7 @@ let rzcxPropLeftMenu2 = [
let rzcxcxHeader = '登录日志'
let rzcxcxFormData = {
cxSj: [`${get3month.last} 00:00:00`, `${get3month.now} 00:00:00`],
unitcode: '',
// unitcode: '',
userName: '',
limit: 10,
page: 1
......@@ -12349,17 +12349,17 @@ let rzcxCxQueryField = [
]
}
},
{
name: '单位代码',
id: 'unitcode',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
value: '',
placeholder: '',
codeOptions: [],
codeTree: 'CODE_UNIT',
col: '3'
}
// {
// name: '单位代码',
// id: 'unitcode',
// type: 'codeTreeDialog', //字典弹框
// props: [], //字典弹框需要的字段
// value: '',
// placeholder: '',
// codeOptions: [],
// codeTree: 'CODE_UNIT',
// col: '3'
// }
]
let rzcxCxDefaultFormThead = [
{
......@@ -12526,17 +12526,17 @@ let rzcxGnCxQueryField = [
]
}
},
{
name: '单位代码',
id: 'unitcode',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
value: '',
placeholder: '',
codeOptions: [],
codeTree: 'CODE_UNIT',
col: '3'
},
// {
// name: '单位代码',
// id: 'unitcode',
// type: 'codeTreeDialog', //字典弹框
// props: [], //字典弹框需要的字段
// value: '',
// placeholder: '',
// codeOptions: [],
// codeTree: 'CODE_UNIT',
// col: '3'
// },
{
name: '姓名',
id: 'userName',
......@@ -12711,17 +12711,17 @@ let rzcxSyqkCxQueryField = [
col: '3',
hidden: 'YH'
},
{
name: '单位代码',
id: 'unitCode',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
value: '',
placeholder: '',
codeOptions: [],
codeTree: 'CODE_UNIT',
col: '3'
},
// {
// name: '单位代码',
// id: 'unitCode',
// type: 'codeTreeDialog', //字典弹框
// props: [], //字典弹框需要的字段
// value: '',
// placeholder: '',
// codeOptions: [],
// codeTree: 'CODE_UNIT',
// col: '3'
// },
{
name: '警号',
id: 'policeId',
......@@ -13665,17 +13665,17 @@ let gnfwcxQueryField = [
]
}
},
{
name: '单位代码',
id: 'unitcode',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
value: '',
placeholder: '',
codeOptions: [],
codeTree: 'CODE_UNIT',
col: '3'
},
// {
// name: '单位代码',
// id: 'unitcode',
// type: 'codeTreeDialog', //字典弹框
// props: [], //字典弹框需要的字段
// value: '',
// placeholder: '',
// codeOptions: [],
// codeTree: 'CODE_UNIT',
// col: '3'
// },
{
name: '用户姓名',
id: 'username',
......
......@@ -6116,7 +6116,7 @@ let rzcxPropLeftMenu = [
id: 'ydsbgl',
label: '移动设备管理',
index: '9-1'
},{
}, {
id: 'yyrzgl',
label: '应用日志管理',
index: '9-2'
......@@ -6250,17 +6250,17 @@ let rzcxCxQueryField = [
]
}
},
{
name: '单位代码',
id: 'unitcode',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
value: '',
placeholder: '',
codeOptions: [],
codeTree: 'CODE_UNIT',
col: '3'
}
// {
// name: '单位代码',
// id: 'unitcode',
// type: 'codeTreeDialog', //字典弹框
// props: [], //字典弹框需要的字段
// value: '',
// placeholder: '',
// codeOptions: [],
// codeTree: 'CODE_UNIT',
// col: '3'
// }
]
let rzcxCxDefaultFormThead = [
{
......@@ -6427,17 +6427,17 @@ let rzcxGnCxQueryField = [
]
}
},
{
name: '单位代码',
id: 'unitcode',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
value: '',
placeholder: '',
codeOptions: [],
codeTree: 'CODE_UNIT',
col: '3'
},
// {
// name: '单位代码',
// id: 'unitcode',
// type: 'codeTreeDialog', //字典弹框
// props: [], //字典弹框需要的字段
// value: '',
// placeholder: '',
// codeOptions: [],
// codeTree: 'CODE_UNIT',
// col: '3'
// },
{
name: '姓名',
id: 'userName',
......@@ -7562,17 +7562,17 @@ let gnfwcxQueryField = [
]
}
},
{
name: '单位代码',
id: 'unitcode',
type: 'codeTreeDialog', //字典弹框
props: [], //字典弹框需要的字段
value: '',
placeholder: '',
codeOptions: [],
codeTree: 'CODE_UNIT',
col: '3'
},
// {
// name: '单位代码',
// id: 'unitcode',
// type: 'codeTreeDialog', //字典弹框
// props: [], //字典弹框需要的字段
// value: '',
// placeholder: '',
// codeOptions: [],
// codeTree: 'CODE_UNIT',
// col: '3'
// },
{
name: '用户姓名',
id: 'username',
......
<template>
<div class="login-container">
<el-form
:model="ruleForm2"
:rules="rules2"
status-icon
ref="ruleForm2"
label-position="left"
label-width="0px"
class="demo-ruleForm login-page"
>
<el-form :model="ruleForm2"
:rules="rules2"
status-icon
ref="ruleForm2"
label-position="left"
label-width="0px"
class="demo-ruleForm login-page">
<h3 class="title">系统登录</h3>
<el-form-item prop="username">
<el-input
type="text"
v-model="ruleForm2.username"
auto-complete="off"
placeholder="用户名"
></el-input>
<el-input type="text"
v-model="ruleForm2.username"
auto-complete="off"
placeholder="用户名"></el-input>
</el-form-item>
<el-form-item prop="password">
<el-input
type="password"
v-model="ruleForm2.password"
auto-complete="off"
placeholder="密码"
></el-input>
<el-input type="password"
v-model="ruleForm2.password"
auto-complete="off"
placeholder="密码"></el-input>
</el-form-item>
<el-form-item style="width:100%;">
<el-button
type="primary"
style="width:100%;"
@click="handleSubmit"
:loading="logining"
>登录</el-button
>
<el-button type="primary"
style="width:100%;"
@click="handleSubmit"
:loading="logining">登录</el-button>
</el-form-item>
</el-form>
</div>
......@@ -42,7 +33,7 @@
<script>
import request from "@/api/interface/dictionaryCode.js";
export default {
data() {
data () {
return {
logining: false,
ruleForm2: {
......@@ -57,13 +48,13 @@ export default {
};
},
methods: {
handleSubmit() {
handleSubmit () {
let self = this;
self.$refs.ruleForm2.validate(valid => {
if (valid) {
self.logining = true;
request.login(self.ruleForm2.username,self.ruleForm2.password).then(res => {
if (res.code == 20000) {
request.login(self.ruleForm2.username, self.ruleForm2.password).then(res => {
if (res.code == 200) {
sessionStorage.setItem("user", self.ruleForm2.username);
sessionStorage.setItem("password", self.ruleForm2.password);
self.$router.push({ path: "/home" });
......
......@@ -491,7 +491,7 @@ export default {
if (self.tableDataLength > 5000) {
self.$message({
type: "error",
message: "最多只能导出5000条"
message: "最多只能导出5000条,请重新选择查询条件,进行导出!"
});
loading.close();
} else {
......@@ -526,7 +526,7 @@ export default {
if (self.tableDataLengthDw > 5000) {
self.$message({
type: "error",
message: "最多只能导出5000条"
message: "最多只能导出5000条,请重新选择查询条件,进行导出!"
});
loading.close();
} else {
......@@ -562,7 +562,7 @@ export default {
if (self.tableDataLengthDwXz > 5000) {
self.$message({
type: "error",
message: "最多只能导出5000条"
message: "最多只能导出5000条,请重新选择查询条件,进行导出!"
});
loading.close();
} 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