Commit 2a5f851c by maxiaohan

登录

parent 380ffcca
......@@ -450,7 +450,7 @@ export default {
{ value: "-1", name: "无效", type: "querystates" },
{ value: "-2", name: "同步特征", type: "querystates" }
],
expanded: false // 展开标志
expanded: false // 展开标志
// arr: []
};
},
......@@ -462,7 +462,7 @@ export default {
);
//挑选被选中的对象
this.key = this.key + 1; //为了保证table 每次都会重渲,这样做体验感更好,如果不为table设置key值的话,用户一旦选中了复选框选项,就是在原来table基础上添加删除每一列,页面就有跳动的感觉,体验感不好
},
}
},
computed: {
// 计算总页数
......@@ -670,7 +670,7 @@ export default {
// 展开或关闭行
hadnlExpandChange(row, expanded) {
// 获取展开标志
this.expanded = expanded
this.expanded = expanded;
// 获取下标
var i = this.list.findIndex(table => table.queryId === row.queryId);
// var i = this.tableData.findIndex(table => table.id === row.id);
......@@ -679,7 +679,7 @@ export default {
this.list[i] = {
qid: row.qid,
children: row.children,
queryId: row.queryId,
queryId: row.queryId
};
this.$forceUpdate();
console.info("展开时row数据", this.list[i]);
......@@ -806,11 +806,6 @@ export default {
},
mounted() {
this.search();
// setTimeout(() => {
// [...document.querySelectorAll(".el-icon-arrow-right")].forEach(item => {
// item.classList = "el-icon-plus";
// });
// }, 200);
}
};
// 用户ID 下拉的数据
......@@ -1417,7 +1412,7 @@ b {
height: 11px;
/* border: black 1px solid; */
margin: 0;
background-image: url('../../assets/img/confirm/expend.png');
background-image: url("../../assets/img/confirm/expend.png");
background-position: center;
background-size: 11px;
background-repeat: no-repeat;
......@@ -1425,7 +1420,7 @@ b {
.el-table__expand-icon.el-table__expand-icon--expanded {
width: 11px;
height: 11px;
background-image: url('../../assets/img/confirm/shrink.png');
background-image: url("../../assets/img/confirm/shrink.png");
background-position: center;
background-size: 11px;
background-repeat: no-repeat;
......
......@@ -7,6 +7,7 @@
<source :src="barcgroundUrl" type="video/mp4" />
浏览器不支持 video 标签,建议升级浏览器。
</video>
<!-- todo 视频加载切换为图片加载 -->
<!-- 考虑视频加载失败 图片背景效果 -->
<div class="poster hidden" v-if="!vedioCanPlay">
<img :style="fixStyle" :src="barcgroundImgUrl" alt="" />
......@@ -24,7 +25,7 @@
<div class=" middle margin_top25_bottom10">
<el-button
class="magin_left_right30"
autofocus="true"
:autofocus="true"
type="text"
@click="changeLoginType(1)"
>帐号密码登录
......
......@@ -5,7 +5,7 @@
class="width100 margin_top25_bottom10"
type="text"
placeholder="请输入用户名"
v-model="userInfo.username"
v-model="userInfo.userName"
>
<i slot="prefix" style="display: flex;align-items: center;">
<img
......@@ -18,7 +18,7 @@
<el-input
class=" width100 margin_top25_bottom10"
placeholder="请输入密码"
v-model="userInfo.password"
v-model="userInfo.passWord"
>
<i slot="prefix">
<img
......@@ -39,6 +39,7 @@
</template>
<script>
import qs from "qs";
export default {
name: "AccountsLogin",
props: ["loginType"],
......@@ -58,21 +59,43 @@ export default {
data() {
return {
isShow: false,
userInfo: { username: "xxs", password: "123456" },
userInfo: { userName: "admin", passWord: "123456" },
usernameUrl: require("../../../assets/img/login/user.png"),
passwordUrl: require("../../../assets/img/login/password.png")
};
},
methods: {
// 登录
login() {
login(userinfo) {
console.info(this.userInfo);
// todo 登录请求
if (this.userInfo.username && this.userInfo.password) {
this.$router.push("/Home/Home");
}
this.$axios
.post("/login/myLoginForm?" + qs.stringify(userinfo))
.then(res => {
console.info(res);
if (res.data.code === "200") {
this.$message.success(userinfo.userName + "登录成功!");
this.$router.push("/Home/Home");
}
});
// "/myLoginForm?userName=" +
// userinfo.userName +
// "&passWord=" +
// userinfo.passWord,
// qs.stringify(userinfo)
// , true, {
// headers: { "content-type": "application/x-www-form-urlencoded" }
// }
// )
// .then(res => {
// console.info(res);
// });
// if (this.userInfo.username && this.userInfo.password) {
// this.$router.push("/Home/Home");
// }
// this.$store
// .dispatch("user/login", this.userInfo)
// .dispatch("/myLoginForm", this.userInfo)
// .then(res => {
// if (res.code >= 0) {
// this.$message({
......@@ -92,7 +115,6 @@ export default {
// this.$message.error(err.message);
// this.getCaptcha();
// });
// x;
}
},
mounted() {
......
......@@ -83,14 +83,23 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
target: "http://192.168.128.118:8099", // 湖南-张
// target: "http://192.168.128.118:8099", // 湖南-张
// target: "http://192.168.128.104:8099", // 湖南-马
target: "http://47.92.226.24:3004/", // 登录
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
ws: true,
changeOrigin: true,
pathRewrite: {
"^/api": "/api"
}
},
"/login": {
target: "http://47.92.226.24:3004/", // 登录
ws: true,
changeOrigin: true,
pathRewrite: {
"^/login": ""
}
}
// 阿里
// "/api": {
......
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