Skip to content

F
founder_vue
Commit 95471242 by 米嘉伟
Options

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

parents 70777aab 27494ff3
Showing with 237 additions and 157 deletions
src/assets/img/zcedit/features1.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 64 (93537) - https://sketch.com -->
<title>编组 106</title>
<desc>Created with Sketch.</desc>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-106" transform="translate(-8.000000, -6.000000)">
<g id="特征点备份" fill="#FFFFFF" fill-opacity="0">
<rect id="矩形" x="0" y="0" width="34" height="34"></rect>
</g>
<g id="编组-13备份-6" transform="translate(5.000000, 3.000000)">
<path d="M17.1923882,8.19238816 C17.6753728,8.19238816 18.0894509,8.45085089 18.1763881,8.80687611 L18.1923882,8.9417637 L18.1923882,26.1923882 C18.1923882,26.1923882 16.1923882,26.1923882 16.1923882,26.1923882 L16.1923882,8.9417637 C16.1923882,8.52789504 16.6401034,8.19238816 17.1923882,8.19238816 Z" id="形状" fill="#FFAA00" fill-rule="nonzero" transform="translate(17.192388, 17.192388) rotate(-45.000000) translate(-17.192388, -17.192388) "></path>
<circle id="椭圆形" fill="#FFAA00" transform="translate(23.556349, 23.556349) rotate(-45.000000) translate(-23.556349, -23.556349) " cx="23.5563492" cy="23.5563492" r="1"></circle>
<path d="M3,8 C3,10.7614238 5.23857625,13 8,13 C10.7614237,13 13,10.7614238 13,8 C13,6.21367208 12.0470054,4.56303697 10.5,3.66987299 C8.95299463,2.776709 7.04700537,2.776709 5.5,3.66987299 C3.95299458,4.56303697 3,6.21367208 3,8 Z" id="路径" fill="#FFAA00" fill-rule="nonzero" transform="translate(8.000000, 8.000000) rotate(-45.000000) translate(-8.000000, -8.000000) "></path>
<path d="M6.36396103,5.86396103 C6.36396103,6.69238816 7.03553391,7.36396103 7.86396103,7.36396103 C8.69238816,7.36396103 9.36396103,6.69238816 9.36396103,5.86396103 C9.36396103,5.03553391 8.69238816,4.36396103 7.86396103,4.36396103 C7.03553391,4.36396103 6.36396103,5.03553391 6.36396103,5.86396103 Z" id="路径" fill="#FFFFFF" fill-rule="nonzero" transform="translate(7.863961, 5.863961) rotate(-45.000000) translate(-7.863961, -5.863961) "></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
src/components/ImageEd.scss
......@@ -1157,6 +1157,7 @@ div {
padding: 9px 0;
margin-right: 16px;
text-align: center;
font-size: 14px;
&:last-child {
margin-right: 0;
}
......
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-11-15 15:07:25
* @LastEditTime: 2021-11-29 14:44:21
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -357,8 +357,9 @@
<div class="lt_main_middle">
<div class="lt_main_header">
<div class="features features1" @click.stop="features1Change">
<img src="../assets/img/zcedit/features1.png" alt="" v-show="features1">
<img src="../assets/img/zcedit/features1_d.png" alt="" v-show="!features1">
<!-- <img src="../assets/img/zcedit/features1.png" alt="" v-show="features1">
<img src="../assets/img/zcedit/features1_d.png" alt="" v-show="!features1"> -->
<img src="../assets/img/zcedit/features1.svg" alt="">
</div>
<div class="features features2" @click.stop="features2Change">
<img src="../assets/img/zcedit/features2.png" alt="" v-show="features2">
......
src/components/SelectCode.vue
<!--
* @Author: your name
* @Date: 2021-11-25 10:15:01
* @LastEditTime: 2021-11-29 12:13:55
* @LastEditTime: 2021-11-29 14:17:01
* @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
......@@ -24,7 +24,7 @@
collapse-tags
@change="change"
>
<el-checkbox-group v-model="newForm[id]" @change="checkChange">
<el-checkbox-group v-model="newForm[id]">
<el-option
ref="option"
v-for="item in options"
......@@ -77,49 +77,22 @@ export default {
},
},
watch: {
// multiple: {
// handler(val) {
// if (val == true) {
// this.value = [];
// } else {
// this.value = "";
// }
// form: {
// handler(newForm) {
// setTimeout(() => {
// this.newForm = newForm;
// }, 20);
// },
// deep: true,
// immediate: true,
// },
form: {
handler(newForm) {
setTimeout(() => {
this.newForm = newForm;
}, 20);
},
deep: true,
immediate: true,
},
},
methods: {
change(val) {
let newVal = val;
if (!newVal) newVal = "";
// if (this.multiple) {
// if (newVal.length <= 0) {
// newVal = "";
// this.checkList = [];
// } else {
// this.checkList = newVal;
// }
// }
this.$set(this.newForm, this.id, newVal);
},
checkChange(val) {
// let newVal = val;
// this.value = val;
// if (newVal.length <= 0) {
// newVal = "";
// this.checkList = [];
// }
// this.$set(this.newForm, this.id, newVal);
},
getOptions() {
this.$axios.get(this.codeUrl).then((res) => {
if (
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-29 13:38:02
* @LastEditTime: 2021-11-29 13:43:54
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -73,7 +73,7 @@ _axios.interceptors.request.use(
// Add a response interceptor
_axios.interceptors.response.use(
function (response) {
console.log(response)
// console.log(response)
if (response.data.code == 401) {
if (resTimer) clearTimeout(resTimer)
resTimer = setTimeout(() => {
......
src/utils/requestLoading.js
/*
* @Author: your name
* @Date: 2021-11-26 16:37:59
* @LastEditTime: 2021-11-29 10:25:30
* @LastEditTime: 2021-11-29 13:46:31
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\utils\requestLoading.js
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-29 13:38:16
* @LastEditTime: 2021-11-29 14:53:52
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -3624,7 +3624,46 @@ export default {
self.newWidth = res.newWidth;
// 切换小图的图片路径
self.smallSrc = self.imageEditor.toDataURL();
// console.log(self.smallSrc);
console.log(self.smallSrc);
// 处理指位信息
let lr_finger = [];
let tj_lr_finger = "";
self.rightFinger.forEach(item => {
if (item.isSelected) {
lr_finger.push(item.code);
}
});
self.leftFinger.forEach(item => {
if (item.isSelected) {
lr_finger.push(item.code);
}
});
tj_lr_finger = lr_finger.join(",");
let tj_data = {
barcode: self.barcode,
hpseqno: self.tjxh,
mastoidlineColor: self.rtxys,
leftPart: self.ylbw,
corpseFinger: self.isSelected_stzw,
corpseNumber: self.stbh,
fingerPosition: tj_lr_finger,
bytess: self.smallSrc
}
console.log(tj_data);
self.$axios({
method: 'post',
url: '/api/upload/trait/case/image/import',
headers: {
"Content-Type": "application/json;charset=UTF-8"
},
data: JSON.stringify(tj_data)
}).then(res => {
console.log(res);
})
// 转8位bmp格式图片
/*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
......@@ -3820,7 +3859,7 @@ export default {
* @param {*}
* @return {*}
*/
saveToKuChange () {
async saveToKuChange () {
let self = this
if(this.bcrkActive) {
this.isSwk_flag = false;
......@@ -3828,7 +3867,7 @@ export default {
this.startEditImage = false;
// 裁剪
this.cutImage();
await this.cutImage();
// 修改层级
$(".rule_line").css("z-index", "9");
......@@ -3842,20 +3881,7 @@ export default {
// ************* 提交保存入库接口
// 处理指位信息
let lr_finger = [];
let tj_lr_finger = "";
this.rightFinger.forEach(item => {
if (item.isSelected) {
lr_finger.push(item.code);
}
});
this.leftFinger.forEach(item => {
if (item.isSelected) {
lr_finger.push(item.code);
}
});
tj_lr_finger = lr_finger.join(",");
// 转8位bmp格式图片
/*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
......@@ -3888,28 +3914,7 @@ export default {
console.log(imgSrc);
})*/
let tj_data = {
barcode: self.barcode,
hpseqno: self.tjxh,
mastoidlineColor: self.rtxys,
leftPart: self.ylbw,
corpseFinger: self.isSelected_stzw,
corpseNumber: self.stbh,
fingerPosition: tj_lr_finger,
bytes: self.smallSrc
}
console.log(tj_data);
this.$axios({
method: 'post',
url: '/api/upload/trait/case/image/import',
headers: {
"Content-Type": "application/json;charset=UTF-8"
},
data: JSON.stringify(tj_data)
}).then(res => {
console.log(res);
})
}
},
/**
......
src/views/Editor/modules/rydaxx.vue
......@@ -35,7 +35,7 @@
<div class="ayzzwjbxx-item">
<el-form-item label="采集信息原因：" prop="cjxxyy">
<SelectCode
codeUrl="cjxxyydm"
codeUrl="/api/code/cjxxyydm"
width="16.5"
:clearable="true"
:multiple="false"
......@@ -71,7 +71,7 @@
<div class="ayzzwjbxx-item">
<el-form-item label="性别：" prop="xbdm">
<SelectCode
codeUrl="sex"
codeUrl="/api/code/sex"
width="16.5"
:clearable="true"
:multiple="false"
......@@ -89,7 +89,7 @@
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="nationality"
codeUrl="/api/code/nationality"
width="16.5"
:clearable="true"
:multiple="false"
......@@ -102,7 +102,7 @@
<!-- <el-option label="汉" value="汉"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="nation"
codeUrl="/api/code/nation"
width="16.5"
:clearable="true"
:multiple="false"
......@@ -117,7 +117,7 @@
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="certificates"
codeUrl="/api/code/certificates"
width="16.5"
:clearable="true"
:multiple="false"
......@@ -135,7 +135,7 @@
<!-- <el-option label="中国" value="中国"></el-option>-->
<!-- </el-select>-->
<SelectCode
codeUrl="administrative"
codeUrl="/api/code/administrative"
width="16.5"
:clearable="true"
:multiple="false"
......@@ -150,7 +150,7 @@
<div class="ayzzwjbxx-item">
<el-form-item label="现住址行政区：" prop="xzzXzqhdm" class="select">
<SelectCode
codeUrl="administrative"
codeUrl="/api/code/administrative"
width="16.5"
:clearable="true"
:multiple="false"
......
src/views/Home.vue
......@@ -141,20 +141,19 @@
</div>
<el-dialog
title="提示"
class="jump-route"
append-to-body
:modal="false"
:close-on-click-modal="false"
@close="cancelJumpRoute"
:visible.sync="jumpRouteDialogVisible"
:show-close="false"
width="30%"
width="27.625rem"
:before-close="handleClose"
>
<span>当前页面有未保存的指位特征，是否确认跳转路由？</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmJumpRoute">确 定</el-button>
<el-button @click="cancelJumpRoute">取 消</el-button>
</span>
<div class="dialog-footer">
<button class="confirm-btn" @click="confirmJumpRoute">确 定</button>
<button class="cancel-btn" @click="cancelJumpRoute">取 消</button>
</div>
</el-dialog>
<div class="shadow" v-show="isCropper"></div>
......@@ -199,7 +198,6 @@ export default {
};
},
mounted() {
console.log(this.loading);
let self = this;
this.menuActive = this.$route.name;
......@@ -267,7 +265,6 @@ export default {
this.$store.commit("loading/setWillRoute", name);
this.routePath = name;
this.routeChangeType = "change";
console.log(this.willRoute);
} else {
if (name == "/Home/htzwcj") {
this.$router.push(name);
......@@ -379,7 +376,6 @@ export default {
this.$store.commit("loading/setWillRoute", name);
this.routePath = name;
this.routeChangeType = "del";
console.log(this.willRoute);
} else {
let routerObj = this.paths.find((i) => i.routeName == name);
if (routerObj) {
......@@ -449,7 +445,6 @@ export default {
this.$store.commit("loading/setWillRoute", index);
// this.menuActive = this.$route.name
this.routeChangeType = "leftMenu";
console.log(this.willRoute);
} else {
this.$router.push({ name: index });
}
......@@ -548,6 +543,78 @@ export default {
};
</script>
<style scoped lang="scss">
/deep/.dialog-footer {
margin-top: 26px;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
button {
margin-right: 24px;
}
}
/deep/.el-dialog__body {
display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
span {
width: 370px;
height: 22px;
font-size: 16px;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #333333;
line-height: 24px;
}
}
.el-dialog {
height: 169px;
background: #FFFFFF;
box-shadow: 0px 18px 28px 10px rgba(0, 21, 51, 0.08) !important;
border-radius: 6px;
.confirm-btn {
cursor: pointer;
outline: none;
width: 72px;
height: 40px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #AEB5C2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2E3846;
&:hover {
border: 1px solid #377FEC;
color: #377FEC;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
}
}
.cancel-btn {
cursor: pointer;
outline: none;
width: 72px;
height: 40px;
background: #055FE7;
border: 1px solid #055FE7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
&:hover {
background: #377fec;
border: 1px solid #377fec;
}
&:active {
background: #044cb9;
border: 1px solid #044cb9;
}
}
}
.v-modal {
background: none;
}
......
src/views/SystemManage/GroupManage.vue
......@@ -262,18 +262,22 @@
</el-form-item>
<el-form-item class="info-item" label="加入组用户:" prop="userId">
<el-input
placeholder="请选择组用户"
class="input-info"
v-model="addFormParams.userId"
></el-input>
<SelectCode
width="12.75"
:form="addFormParams"
id="userId"
codeUrl="/security/user-groups/userGroupMenu"
multiple
></SelectCode>
</el-form-item>
<el-form-item class="info-item" label="加入组角色:">
<el-input
placeholder="请选择组角色"
class="input-info"
v-model="addFormParams.roleId"
></el-input>
<SelectCode
width="12.75"
:form="addFormParams"
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="addFormParams.status">
......@@ -329,18 +333,22 @@
</el-form-item>
<el-form-item class="info-item" label="加入组用户:" prop="userId">
<el-input
placeholder="请选择组用户"
class="input-info"
v-model="editFormParams.userId"
></el-input>
<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="加入组角色:">
<el-input
placeholder="请选择组角色"
class="input-info"
v-model="editFormParams.roleId"
></el-input>
<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">
......@@ -580,11 +588,14 @@ import "@/icons/ic_add.svg";
import "@/icons/group-item.svg";
import Confirmation from "@/components/Confirmation.vue";
// import "@/assets/imp/police-badge.png";
import Cascader from "@/components/Cascader.vue";
import SelectCode from "@/components/SelectCode.vue";
export default {
name: "GroupManage",
components: {
Confirmation,
SelectCode,
Cascader,
},
created() {
let w1 = 1920;
......@@ -682,15 +693,15 @@ export default {
addFormParams: {
name: "", // 组名称
describe: "", // 用户组描述
userId: "", // 加入组用户
roleId: "", // 加入组角色
userId: [], // 加入组用户
roleId: [], // 加入组角色
status: 1, // 0 未激活 1 已激活
},
editFormParams: {
name: "", // 组名称
describe: "", // 用户组描述
userId: "", // 加入组用户
roleId: "", // 加入组角色
userId: [], // 加入组用户
roleId: [], // 加入组角色
status: 1, // 0 未激活 1 已激活
},
addrules: {
......@@ -888,9 +899,9 @@ export default {
this.isShowAddUserDialogBg = true;
this.addFormParams.name = "";
this.addFormParams.describe = "";
this.addFormParams.userId = "";
this.addFormParams.userId = [];
this.addFormParams.status = 1;
this.addFormParams.roleId = "";
this.addFormParams.roleId = [];
},
// 关闭新增弹窗
canceladd() {
......@@ -901,7 +912,9 @@ export default {
openedit(row) {
this.checkItem = row;
for (let key in this.editFormParams) {
this.$set(this.editFormParams, key, row[key]);
if (key != "roleId" && key != "userId") {
this.$set(this.editFormParams, key, row[key]);
}
}
this.$set(this.editFormParams, "id", row["id"]);
this.isShowEditGroupDialog = true;
......
src/views/SystemManage/UserManage.vue
......@@ -21,28 +21,27 @@
</div>
<div class="search-item">
<div class="label">用户组：</div>
<el-input
class="search-info"
v-model="searchParams.userGroupId"
placeholder="请输入用户组名"
/>
<SelectCode
width="9.6875"
:form="searchParams"
id="userGroupId"
codeUrl="/security/user-groups/userGroupMenu"
multiple
></SelectCode>
</div>
<div class="search-item">
<div class="label">单位：</div>
<Cascader :form="searchParams" id="unitCode" width="9.6875"></Cascader>
<!-- <el-input
class="search-info"
v-model="searchParams.unitCode"
placeholder="请输入单位代码"
/> -->
</div>
<div class="search-item">
<div class="label">角色：</div>
<el-input
class="search-info"
v-model="searchParams.roleId"
placeholder="请输入角色"
/>
<SelectCode
width="9.6875"
:form="searchParams"
id="roleId"
codeUrl="/security/roles/roleMenu"
multiple
></SelectCode>
</div>
<div class="search-item">
<div class="label">权限：</div>
......@@ -601,8 +600,8 @@ export default {
unitCode: "",
name: "我当时大多数",
status: 1,
userGroupId: null,
roleId: null,
userGroupId: [],
roleId: [],
},
editFormParams: {
username: "", //用户名
......@@ -611,8 +610,8 @@ export default {
policeNumber: "", //警号
phoneNumber: "", //联系电话
status: "", //启用状态
userGroupId: "", // 用户组
roleId: "", // 角色
userGroupId: [], // 用户组
roleId: [], // 角色
},
addrules: {
password: [
......@@ -730,7 +729,7 @@ export default {
newStr() {
let str = "";
for (let key in this.searchParams) {
if (key != "page") {
if (key != "page" && key != "roleId" && key != "userGroupId") {
str += this.searchParams[key].trim();
}
}
......@@ -888,7 +887,9 @@ export default {
// 打开新增弹窗
open() {
for (let key in this.addFormParams) {
if (key != "status") {
if (key == "userGroupId" || key == "roleId") {
this.$set(this.addFormParams, key, []);
} else if (key != "status") {
this.$set(this.addFormParams, key, "");
}
}
......@@ -898,7 +899,9 @@ export default {
// 打开编辑弹窗
openedit(row) {
for (let key in this.editFormParams) {
if (key != "status") {
if (key == "userGroupId" || key == "roleId") {
this.$set(this.addFormParams, key, []);
} else if (key != "status") {
this.$set(this.editFormParams, key, "");
}
}
......@@ -909,11 +912,9 @@ export default {
},
// 人员信息
getPersonInfor(id) {
// this.loading = true;
this.$axios
.get("/security/users/" + id, { loadingTarget: ".edit" })
.then((res) => {
// this.loading = false;
if (res.data) {
let result = res.data;
for (let key in this.editFormParams) {
......@@ -923,14 +924,13 @@ export default {
this.$set(
this.editFormParams,
"userGroupId",
result["userGroupIds"] && result["roleIds"].split(",")
result["userGroupIds"] && result["userGroupIds"].split(",")
);
this.$set(
this.editFormParams,
"roleId",
result["roleIds"] && result["roleIds"].split(",")
);
console.log(this.editFormParams, 1111111111);
}
});
},
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-29 13:43:55
* @LastEditTime: 2021-11-29 14:44:50
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -92,13 +92,13 @@ module.exports = {
// 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.166:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
target: "http://www.meetfood.cn:2390/", // 湖南-线上
// 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