xymp
/
frontend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
master
fanluyan 2 years ago
parent c1e662b471
commit 54d963551d
5 changed files with 153 additions and 159 deletions
Show Stats Download Patch File Download Diff File

17
src/utils/api/index.js
Unescape Escape View File

@ -1,5 +1,20 @@
import request from "../request"; import request from "../request";
//获取登录
export function loginJoggle(data) {
return request({
url: "/api/login",
method: "post",
data,
});
}
//声光报警
export function alarmMarkJoggle(data) {
return request({
url: "/api/alarmMark",
method: "post",
data,
});
}
//实时监控页面 //实时监控页面
//获取线路树状结构 //获取线路树状结构
export function getdyTreeListJoggle(data) { export function getdyTreeListJoggle(data) {

62
src/views/Login.vue
Unescape Escape View File

@ -34,7 +34,7 @@
<el-button slot="prepend" icon="el-icon-lock"></el-button> <el-button slot="prepend" icon="el-icon-lock"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="verificationCode" class="verifyItem"> <!-- <el-form-item prop="verificationCode" class="verifyItem">
<el-input <el-input
v-model="userInfo.verificationCode" v-model="userInfo.verificationCode"
placeholder="请输入验证码" placeholder="请输入验证码"
@ -43,10 +43,10 @@
</el-input> </el-input>
<div @click="refreshCode" class="verifyBox"> <div @click="refreshCode" class="verifyBox">
<!--验证码组件-->
<s-identify :identifyCode="identifyCode"></s-identify> <s-identify :identifyCode="identifyCode"></s-identify>
</div> </div>
</el-form-item> </el-form-item> -->
<div class="login-btn"> <div class="login-btn">
<el-button type="primary" @click="submitForm()">登录</el-button> <el-button type="primary" @click="submitForm()">登录</el-button>
@ -61,36 +61,34 @@
<script> <script>
import { mapMutations } from "vuex"; import { mapMutations } from "vuex";
import { login } from "@/utils/api/index"; import { loginJoggle } from "@/utils/api/index";
import SIdentify from "./components/SIdentify"; //import SIdentify from "./components/SIdentify";
export default { export default {
components: { components: {
SIdentify, //SIdentify,
}, },
data: function () { data: function () {
return { return {
userInfo: { userInfo: {
username: "xytest", username: "",
password: "123456", password: "",
verificationCode: "", //verificationCode: "",
}, },
rules: { rules: {
username: [ username: [
{ required: true, message: "请输入用户名", trigger: "blur" }, { required: true, message: "请输入用户名", trigger: "blur" },
], ],
password: [{ required: true, message: "请输入密码", trigger: "blur" }], password: [{ required: true, message: "请输入密码", trigger: "blur" }],
verificationCode: [ // verificationCode: [
{ required: true, message: "验证码不能为空", trigger: "blur" }, // { required: true, message: "验证码不能为空", trigger: "blur" },
], // ],
}, },
token: "", token: "",
identifyCode: "", // identifyCode: "",
identifyCodes: "1234567890abcdefjhijklinopqrsduvwxyz", // identifyCodes: "1234567890abcdefjhijklinopqrsduvwxyz",
}; };
}, },
computed: { computed: {},
...mapMutations(["setColorTheme"]),
},
methods: { methods: {
submitForm() { submitForm() {
this.$refs.loginForm.validate((valid) => { this.$refs.loginForm.validate((valid) => {
@ -112,25 +110,25 @@ export default {
}, },
getLogin() {}, getLogin() {},
// 刷新验证码 // 刷新验证码
refreshCode() { // refreshCode() {
this.identifyCode = ""; // this.identifyCode = "";
this.makeCode(this.identifyCodes, 4); // this.makeCode(this.identifyCodes, 4);
}, // },
makeCode(o, l) { // makeCode(o, l) {
for (let i = 0; i < l; i++) { // for (let i = 0; i < l; i++) {
this.identifyCode += // this.identifyCode +=
this.identifyCodes[this.randomNum(0, this.identifyCodes.length)]; // this.identifyCodes[this.randomNum(0, this.identifyCodes.length)];
} // }
}, // },
randomNum(min, max) { // randomNum(min, max) {
return Math.floor(Math.random() * (max - min) + min); // return Math.floor(Math.random() * (max - min) + min);
}, // },
}, },
created() {}, created() {},
mounted() { mounted() {
// 初始化验证码 // 初始化验证码
this.identifyCode = ""; // this.identifyCode = "";
this.makeCode(this.identifyCodes, 4); // this.makeCode(this.identifyCodes, 4);
}, },
}; };
</script> </script>

128
src/views/devicePhotoSchedule/components/setdevice.vue
Unescape Escape View File

@ -38,6 +38,7 @@
ref="tree" ref="tree"
node-key="id" node-key="id"
:default-expand-all="true" :default-expand-all="true"
@check="getCheckedNodes"
> >
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ data.name }}</span> <span>{{ data.name }}</span>
@ -79,6 +80,7 @@ export default {
children: "list", children: "list",
label: "name", label: "name",
}, },
termidArr: [],
ruleid: "", ruleid: "",
parmsList: [], //选中的通道 parmsList: [], //选中的通道
multipleSelection: [], multipleSelection: [],
@ -90,6 +92,8 @@ export default {
//全选 //全选
checkAll: true, checkAll: true,
isIndeterminate: true, //全选设置默认选中 isIndeterminate: true, //全选设置默认选中
timer: null,
termidArrNum: -1,
}; };
}, },
mounted() {}, mounted() {},
@ -106,7 +110,6 @@ export default {
getScheduleRulelAccessList({}) getScheduleRulelAccessList({})
.then((res) => { .then((res) => {
this.listnr = res.data.list; this.listnr = res.data.list;
this.aisleList = res.data.channellist; this.aisleList = res.data.channellist;
}) })
.catch((err) => {}); .catch((err) => {});
@ -132,42 +135,36 @@ export default {
handleCheckBox() { handleCheckBox() {
console.log(this.zzListCheck); console.log(this.zzListCheck);
}, },
//遍历数据
eachTreeData(data, callback, childKey) {
if (!childKey) childKey = "children";
data.forEach((d) => {
if (callback(d) !== false && d[childKey])
this.eachTreeData(d[childKey], callback, childKey);
});
},
//给树的每一个节点 添加一个唯一值key，并算出默认选中的节点key数组
addKeyToList(data) {
let key = 0;
this.eachTreeData(data, (d) => {
d.key = key++;
});
},
//获取所选值 //获取所选值
getCheckedNodes() { getCheckedNodes() {
this.parmsList = []; this.parmsList = [];
const checkedNodes = this.$refs.tree.getCheckedNodes(false, true); //若节点可被选择，则返回目前被选中的节点所组成的数组 const checkedNodes = this.$refs.tree.getCheckedNodes(false, true); //若节点可被选择，则返回目前被选中的节点所组成的数组
//const checkedParam = []; //定义选中的数组 //const checkedParam = []; //定义选中的数组
let index = -1; let index = -1;
// console.log(checkedNodes); console.log(checkedNodes);
if (checkedNodes.length !== 0) { if (checkedNodes.length !== 0) {
checkedNodes.forEach((item) => { checkedNodes.forEach((item) => {
// 父节点结构的情况 判断是否有list子节点，如果有定义数组结构 if (item.list == undefined) {
if (item.list !== undefined) { console.log("1111111111111");
index++; console.log(item);
this.parmsList[index] = { this.termidArr.push(item.id);
//name: item.name,
termid: item.id,
channelidlist: [],
};
} else {
//如果没有list 把子节点id push到 定义的数组channelidlist中
this.parmsList[index].channelidlist.push(item.id);
} }
// 父节点结构的情况 判断是否有list子节点，如果有定义数组结构
// if (item.list !== undefined) {
// index++;
// this.parmsList[index] = {
// //name: item.name,
// termid: item.id,
// channelidlist: [],
// };
// console.log(item);
// } else {
// console.log("aaaaaaaaaaaaaa");
// //如果没有list 把子节点id push到 定义的数组channelidlist中
// this.parmsList[index].channelidlist.push(item.id);
// }
//通过bsManufacturer 判断是否是 线路 获取线路id //通过bsManufacturer 判断是否是 线路 获取线路id
// if (item.bsManufacturer !== undefined) { // if (item.bsManufacturer !== undefined) {
// this.ruleid = item.id; // this.ruleid = item.id;
@ -181,60 +178,57 @@ export default {
.filter((item) => item.channelidlist.length !== 0) .filter((item) => item.channelidlist.length !== 0)
.map((item) => { .map((item) => {
return { return {
termid: item.termid, termid: this.termidArr[0],
channelidlist: item.channelidlist, channelidlist: [this.checkedAisle],
}; };
}); });
this.termidArr = Array.from(new Set(this.termidArr));
console.log(this.termidArr);
console.log(this.parmsList); console.log(this.parmsList);
return this.parmsList; return this.parmsList;
}, },
// 保存确定操作 // 保存确定操作
submitForm() { submitForm() {
console.log(this.zzListCheck); console.log(this.termidArr);
console.log(this.checkedAisle); this.timer = window.setInterval(() => {
let checkzzList = []; this.termidArrNum++;
for (let i = 0; i < this.zzListCheck.length; i++) { console.log(this.termidArrNum);
console.log(this.zzListCheck[i]); if (this.termidArrNum < this.termidArr.length) {
checkzzList.push({ this.sureSum();
termid: this.zzListCheck[i], } else {
channelidlist: [this.checkedAisle], this.$message.success("添加成功");
}); this.isShow = false;
} this.$parent.deviceList();
console.log(checkzzList); clearTimeout(this.timer);
if (this.zzListCheck.length == 0) { }
this.$message.error("请选择通道"); }, 1000);
} else { },
setScheduleRulel({ //时间表
scheduleid: this.selid, sureSum() {
list: checkzzList, setScheduleRulel({
list: [
{
termid: this.termidArr[this.termidArrNum],
channelidlist: [this.checkedAisle],
},
],
scheduleid: this.selid,
})
.then((res) => {
// this.$message.success("添加成功");
}) })
.then((res) => { .catch((err) => {
this.isShow = false; this.$message.error("添加失败");
this.$message.success("添加成功"); });
this.$parent.deviceList();
})
.catch((err) => {
this.$message.error("添加失败");
});
}
// if (this.parmsList.length == 0)
// return this.$message.error("通道不能为空");
// setScheduleRulel({ list: this.parmsList, ruleid: this.selid })
// .then((res) => {
// this.isShow = false;
// this.$message.success("添加成功");
// this.$parent.deviceList();
// })
// .catch((err) => {
// this.$message.error("添加失败");
// });
}, },
display() { display() {
this.isShow = true; this.isShow = true;
}, },
hide() { hide() {
this.isShow = false; this.isShow = false;
clearTimeout(this.timer);
}, },
}, },
}; };

81
src/views/realTimeMonitor/components/setschedule.vue
Unescape Escape View File

@ -31,11 +31,11 @@
> --> > -->
</div> </div>
<div class="flexno bt30" v-if="this.shedulenr.length !== 0"> <div class="flexno bt30" v-if="this.shedulenr.length !== 0">
<div class="timehead"> <!-- <div class="timehead">
<label>时间表规则:</label> <label>时间表规则:</label>
<p>ssssssssssss</p> <p>ssssssssssss</p>
</div> </div> -->
<div class="timeShow"> <div class="timeShow" v-loading="loading">
<div class="leftTime"> <div class="leftTime">
<div class="w8">时间表:</div> <div class="w8">时间表:</div>
<div class="w80 flexonly" v-loading="timeloading"> <div class="w80 flexonly" v-loading="timeloading">
@ -48,7 +48,7 @@
> >
</div> </div>
</div> </div>
<div class="rightTime"> <!-- <div class="rightTime">
<div class="w8">装置时间表:</div> <div class="w8">装置时间表:</div>
<div class="w80 flexonly" v-loading="timeloading"> <div class="w80 flexonly" v-loading="timeloading">
<el-tag <el-tag
@ -59,7 +59,7 @@
>{{ val }}</el-tag >{{ val }}</el-tag
> >
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div class="flexno bt30" v-else>暂无设置时间表</div> <div class="flexno bt30" v-else>暂无设置时间表</div>
@ -246,7 +246,9 @@ export default {
timeloading: false, timeloading: false,
}; };
}, },
mounted() {}, mounted() {
console.log(this.selaccess);
},
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event); console.log(tab, event);
@ -260,7 +262,22 @@ export default {
this.accesslist = res.data.list; this.accesslist = res.data.list;
console.log(this.accesslist); console.log(this.accesslist);
this.selaccess = res.data.list[0].channelid; this.selaccess = res.data.list[0].channelid;
this.inquireRealbtn(); //this.inquireRealbtn();
console.log(this.selaccess);
this.loading = true;
getSchedulenr({
channelid: this.selaccess,
terminalid: this.selfacilityId,
})
.then((res) => {
this.$message.success("查询成功");
// this.shedulenr = res.data.list.join("; ")
this.shedulenr = res.data.list;
this.loading = false;
})
.catch((err) => {
this.$message.error("查询失败");
});
}) })
.catch((err) => {}); .catch((err) => {});
}, },
@ -285,56 +302,6 @@ export default {
//查询时间表 //查询时间表
//查询真是时间时间表 //查询真是时间时间表
inquirebtn() {
console.log(this.selaccess, this.selfacilityId, this.newcmdzzid);
this.timeloading = true;
selectPhotoTimeGetJoggle({
channel: this.selaccess,
termId: this.selfacilityId,
cmdId: this.newcmdzzid,
})
.then((res) => {
this.$message.success("查询成功");
console.log(this.shedulenr);
this.newrequestId = res.data.requestId;
this.searchRealtime();
})
.catch((err) => {
this.$message.error("查询失败");
});
},
searchRealtime() {
selectPhotoTimeJoggle({
channel: this.selaccess,
termId: this.selfacilityId,
cmdId: this.newcmdzzid,
requestId: this.newrequestId,
}).then((res) => {
console.log(res);
if (res.data.isNew == true && this.timernum < 10) {
clearInterval(this.timer);
this.timer = null;
this.inquirebtn();
this.timernum = 0;
} else if (res.data.isNew == false && this.timernum > 10) {
this.i = 0;
clearInterval(this.timer);
this.timer = null;
this.$message({
message: "时间表查询无响应，请稍后再试！",
type: "warning",
});
}
// if (res.data.isNew == true) {
// this.shedulenr = res.data.list;
// this.$message({
// message: "装置信息已更新",
// type: "success",
// });
// clearInterval(this.timer);
// }
});
},
//获取线路列表数据 //获取线路列表数据
deviceList() { deviceList() {

24
src/views/realTimeMonitor/index.vue
Unescape Escape View File

@ -152,7 +152,7 @@
<el-dropdown-item command="close">关闭GPS</el-dropdown-item> <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> --> </el-dropdown> -->
<el-button type="primary" v-debounce="handleShowErr" <el-button type="primary" @click.native.stop="handleWarn()"
>声光报警</el-button >声光报警</el-button
> >
<!-- <el-button type="primary" @click="handlehistoryPic" <!-- <el-button type="primary" @click="handlehistoryPic"
@ -175,6 +175,7 @@ import {
getTerminalPhotoListJoggle, getTerminalPhotoListJoggle,
getLatestPhotoJoggle, getLatestPhotoJoggle,
getReturnedPhotoJoggle, getReturnedPhotoJoggle,
alarmMarkJoggle,
} from "@/utils/api/index"; } from "@/utils/api/index";
import { mapState } from "vuex"; import { mapState } from "vuex";
import carouselChart from "../components/carouselChart.vue"; import carouselChart from "../components/carouselChart.vue";
@ -433,7 +434,26 @@ export default {
this.$refs.setschedule_ref.getSingleAccess(this.channelId, this.cmdid); this.$refs.setschedule_ref.getSingleAccess(this.channelId, this.cmdid);
this.$refs.setschedule_ref.deviceList(); this.$refs.setschedule_ref.deviceList();
}, },
handleWarn() {
console.log("声光报警");
console.log(this.newTermId);
alarmMarkJoggle({ termid: this.newTermId })
.then((res) => {
console.log(res);
if (res.code == 200) {
this.$message({
message: "声光报警操作成功",
type: "success",
});
}
})
.catch((err) => {
this.$message({
message: "声光报警操作失败",
type: "error",
});
});
},
handleShowErr() { handleShowErr() {
this.$message({ this.$message({
message: "该功能暂未开发,敬请期待", message: "该功能暂未开发,敬请期待",

Write Preview
Loading…
Cancel
Save