Skip to content

F
founder_vue
Commit baa6ff76 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 197d828f 28d46b91
Showing with 172 additions and 60 deletions
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-29 13:42:22
* @LastEditTime: 2021-11-30 11:11:01
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -14,7 +14,17 @@
<script>
import zoom from "./utils/autosize";
export default {};
export default {
created() {
var lett = this;
document.onkeydown = function (e) {
var key = window.event.keyCode;
if (key == 13) {
lett.$bus.emit("enter");
}
};
},
};
</script>
<style lang="scss">
......
src/components/Cascader.vue
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-11-26 14:05:08
* @LastEditTime: 2021-11-30 13:45:59
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
......@@ -72,6 +72,9 @@ export default {
}));
}
},
offOption() {
this.$refs.cascader.dropDownVisible = false;
},
},
mounted() {
let self = this;
......
src/components/SelectCode.vue
<!--
* @Author: your name
* @Date: 2021-11-25 10:15:01
* @LastEditTime: 2021-11-29 14:17:01
* @LastEditTime: 2021-11-30 13:44:55
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\SelectCode.vue
......@@ -11,6 +11,7 @@
<el-select
v-model="newForm[id]"
filterable
ref="select"
:class="{ multiple: multiple }"
popper-class="popperClass"
:multiple="multiple"
......@@ -103,6 +104,9 @@ export default {
}
});
},
offOption() {
this.$refs.select.blur();
},
},
mounted() {
this.getOptions();
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 09:16:35
* @LastEditTime: 2021-11-30 13:24:54
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -76,7 +76,6 @@ _axios.interceptors.request.use(
// Add a response interceptor
_axios.interceptors.response.use(
function (response) {
// console.log(response)
if (response.data.code == 401) {
if (resTimer) clearTimeout(resTimer)
resTimer = setTimeout(() => {
......@@ -88,7 +87,7 @@ _axios.interceptors.response.use(
router.replace("/Login");
}).catch(() => {
});
}, 200);
}, 500);
}
if (response.config.loading !== false) {
hideLoading(response.config.loadingTarget);
......
src/views/SystemManage/GroupManage.vue
......@@ -331,25 +331,6 @@
v-model="editFormParams.describe"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="加入组用户:" prop="userId">
<SelectCode
width="12.75"
:form="editFormParams"
id="userId"
codeUrl="/security/user-groups/userGroupMenu"
multiple
></SelectCode>
</el-form-item>
<el-form-item class="info-item" label="加入组角色:">
<SelectCode
width="12.75"
:form="editFormParams"
id="roleId"
codeUrl="/security/roles/roleMenu"
multiple
></SelectCode>
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="radio-info" v-model="editFormParams.status">
<el-radio :label="1" class="qiyong">启用</el-radio>
......@@ -633,7 +614,7 @@ export default {
};
// 用户名ID
var validateUserId = (rule, value, callback) => {
if (value === "") {
if (value === "" || value.length == 0) {
callback(new Error("请选择加入用户组的用户！"));
} else {
callback();
......@@ -723,7 +704,7 @@ export default {
{ validator: validateGroupname, trigger: "blur", required: true },
], //组名称
userId: [
{ validator: validateUserId, trigger: "blur", required: true },
{ validator: validateUserId, trigger: "change", required: true },
], // 用户名ID
roleId: [
{ validator: validateRoleId, trigger: "blur", required: true },
......@@ -993,8 +974,17 @@ export default {
submitForm(formName) {
this.$refs.addFormParams.validate((valid) => {
if (valid) {
let params = {};
for (let key in this.addFormParams) {
if (key == "roleId" || key == "userId") {
params[key] =
this.addFormParams[key] && this.addFormParams[key].join(",");
} else {
params[key] = this.addFormParams[key];
}
}
this.$axios
.post("/security/user-groups", this.addFormParams)
.post("/security/user-groups", params)
.then((res) => {
if (res.data.code == 201) {
setTimeout(() => {
......@@ -1024,26 +1014,33 @@ export default {
this.$refs.editFormParams.validate((valid) => {
//console.info(valid);
if (valid) {
this.$axios
.put("/security/user-groups", this.editFormParams)
.then((res) => {
if (res.data.code == 200) {
setTimeout(() => {
this.$message.success("修改成功");
}, 800);
this.isShowEditGroupDialog = false;
this.isShowEditGroupDialogBg = false;
this.search();
} else if (res.data.code == 400 || res.data.code == 500) {
setTimeout(() => {
this.$message.error(res.data.detail);
}, 500);
} else if (res.data.code == 404) {
setTimeout(() => {
this.$message.error("服务不存在");
}, 500);
}
});
let params = {};
for (let key in this.editFormParams) {
if (key == "roleId" || key == "userId") {
params[key] =
this.editFormParams[key] && this.editFormParams[key].join(",");
} else {
params[key] = this.editFormParams[key];
}
}
this.$axios.put("/security/user-groups", params).then((res) => {
if (res.data.code == 200) {
setTimeout(() => {
this.$message.success("修改成功");
}, 800);
this.isShowEditGroupDialog = false;
this.isShowEditGroupDialogBg = false;
this.search();
} else if (res.data.code == 400 || res.data.code == 500) {
setTimeout(() => {
this.$message.error(res.data.detail);
}, 500);
} else if (res.data.code == 404) {
setTimeout(() => {
this.$message.error("服务不存在");
}, 500);
}
});
} else {
return false;
}
......@@ -1072,8 +1069,22 @@ export default {
});
},
},
activated() {
this.$bus.on("enter", () => {
this.search();
});
},
deactivated() {
this.$bus.off("enter");
},
beforeDestroy() {
this.$bus.off("enter");
},
mounted() {
this.search();
this.$bus.on("enter", () => {
this.search();
});
this.$nextTick(() => {
document.body.appendChild(this.$refs.isShowEditGroupDialog);
document.body.appendChild(this.$refs.isShowAddUserDialog);
......@@ -1126,6 +1137,12 @@ export default {
width: 100% !important;
}
}
/deep/ .is-indeterminate {
.el-checkbox__inner {
background-color: #055fe7;
border-color: #055fe7;
}
}
</style>
<style scoped lang="scss">
.delSelection /deep/ .el-table-column--selection .cell {
......
src/views/SystemManage/PermissionManage.vue
......@@ -792,7 +792,29 @@ export default {
.catch((failResponse) => {});
},
},
activated() {
this.$bus.on("enter", () => {
if (this.isUser) {
this.searchUser();
} else {
this.searchGroup();
}
});
},
deactivated() {
this.$bus.off("enter");
},
beforeDestroy() {
this.$bus.off("enter");
},
mounted() {
this.$bus.on("enter", () => {
if (this.isUser) {
this.searchUser();
} else {
this.searchGroup();
}
});
this.isUser = true;
if (this.isUser) {
this.searchUser();
......
src/views/SystemManage/UserManage.vue
......@@ -740,11 +740,20 @@ export default {
// 新增
submitForm(formName) {
//console.log(this.addFormParams, 22222222222);
let params = {};
for (let key in this.addFormParams) {
if (key == "roleId" || key == "userGroupId") {
params[key] =
this.addFormParams[key] && this.addFormParams[key].join(",");
} else {
params[key] = this.addFormParams[key];
}
}
this.$refs.addFormParams.validate((valid) => {
//console.log(valid);
if (valid) {
this.$axios
.post("/security/users", this.addFormParams)
.post("/security/users", params)
.then((res) => {
if (res.data.code == 201) {
setTimeout(() => {
......@@ -998,8 +1007,22 @@ export default {
this.search();
},
},
activated() {
this.$bus.on("enter", () => {
this.search();
});
},
deactivated() {
this.$bus.off("enter");
},
beforeDestroy() {
this.$bus.off("enter");
},
mounted() {
this.search();
this.$bus.on("enter", () => {
this.search();
});
this.$nextTick(() => {
document.body.appendChild(this.$refs.addUserDialog);
document.body.appendChild(this.$refs.isShowEditUserDialog);
......@@ -1109,7 +1132,12 @@ const data1 = [
.info {
margin-top: 0px !important;
}
/deep/ .is-indeterminate {
.el-checkbox__inner {
background-color: #055fe7;
border-color: #055fe7;
}
}
@import "scss/user";
@import "./scss/dialog_table";
</style>
src/views/SystemManage/UserPermission.vue
......@@ -93,7 +93,7 @@
</div>
</div>
<div class="save">
<div @click="redact" class="editText">
<div @click="redact" class="editText" v-if="editBoo">
<i class="el-icon-edit"></i>
<span>编辑</span>
</div>
......@@ -428,6 +428,7 @@ export default {
userPermissions: [], //用户权限
countArr: [], //三个权限的总和
checkMap: {}, //判断层叠以及是否选中
editBoo: false
};
},
methods: {
......@@ -446,6 +447,7 @@ export default {
},
// 保存
save() {
this.editBoo = true
if (this.isSave) {
return;
}
......
src/views/SystemManage/scss/group.scss
......@@ -13,8 +13,15 @@
}
}
}
.groupEditDialog /deep/{
height: 20rem !important;
width: 39.6rem !important;
.el-form-item__label{
width: 6rem!important;
}
}
.el-checkbox /deep/ {
.el-checkbox__label{
.el-checkbox__label {
color: #666666 !important;
}
.is-checked {
......
src/views/cxyrd/QueryConfirm.vue
......@@ -34,10 +34,10 @@
</el-select>
</div>
<div class="display_style">
<span>查询ID：</span>
<span>任务号/查询ID：</span>
<el-input
class="el_input"
placeholder="请输入查询ID"
placeholder="请输入任务号/查询ID"
v-model="reqParam.contrastCustomSearchReq.qqid"
></el-input>
</div>
......@@ -276,7 +276,7 @@
height
width="auto"
></el-table-column>
<el-table-column prop="" label="查询ID" :width="cxyrdWidth1">
<el-table-column prop="" label="任务号/查询ID" :width="cxyrdWidth1">
<template slot-scope="scope">
<svg-icon
style="
......@@ -594,7 +594,6 @@ export default {
// //console.log(item);
self.$set(item, "width", (item.width * w2) / w1);
});
//console.log(content);
},
watch: {
selectBoo: {
......@@ -1040,6 +1039,7 @@ export default {
},
// 自定义展示列 多选框
changeCheckbox() {
this.tableKey++;
// //console.info("默认", this.defaultTableProps);
// //console.info("table", this.tableProps);
// //console.info("选中", this.checkedProps);
......@@ -1153,7 +1153,21 @@ export default {
//console.log(this.selectionData);
},
},
activated() {
this.$bus.on("enter", () => {
this.search();
});
},
deactivated() {
this.$bus.off("enter");
},
beforeDestroy() {
this.$bus.off("enter");
},
mounted() {
this.$bus.on("enter", () => {
this.search();
});
//console.log(this.$moment, 222222222222);
// //console.log(window.innerHeight);
// //console.log(window.innerWidth);
......@@ -1676,6 +1690,10 @@ b {
</style>
<style lang="scss">
.el-table__expand-icon {
.el-icon-arrow-right {
cursor: pointer !important;
}
cursor: pointer !important;
position: absolute;
right: 45px;
cursor: pointer;
......
src/views/login/Login1.vue
......@@ -131,12 +131,15 @@ export default {
() => {
setTimeout(() => {
this.loginShow = true;
}, 10);
}, 50);
}
);
},
},
created() {},
beforeDestroy() {
self.player.dispose();
},
mounted() {
let self = this;
this.loginType.accountStatus = true;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 09:37:40
* @LastEditTime: 2021-11-30 13:52:04
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -107,7 +107,6 @@ module.exports = {
}
},
"/login": {
// target: "http://192.168.128.108:8764/", // 登录
target: "http://www.meetfood.cn:2390/", // 登录
ws: true,
changeOrigin: true,
......
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