Skip to content

F
founder_vue
Commit e30afd53 by 张超军
Options

用户管理bug恢复

parent c3b73290
Showing with 70 additions and 49 deletions
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2022-02-21 11:42:22
* @LastEditTime: 2022-02-21 17:34:05
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
-->
......@@ -2387,14 +2387,14 @@ export default {
self.initStatus()
if (sourceImage == 'xxx') {
// 暂无图片
imageEditor.loadImageFromURL("data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(sourceImage), "SampleImage").then().catch(err => { })
imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage").then().catch(err => { })
self.zwtp_source = true
return;
} else {
self.zwtp_source = false
}
self.sourceImage = sourceImage;
imageEditor.loadImageFromURL("data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(sourceImage), "SampleImage", { erasable: false }).then(function (sizeValue) {
imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage", { erasable: false }).then(function (sizeValue) {
// 更新newHeight和newWidth
self.newHeight_source = sizeValue.newHeight;
self.newWidth_source = sizeValue.newWidth;
......@@ -2475,14 +2475,14 @@ export default {
self.targetDelTime = ''
self.initStatus()
if (targetImage == 'xxx') {
imageEditor2.loadImageFromURL("data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(targetImage), "SampleImage").then().catch(err => { })
imageEditor2.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then().catch(err => { })
self.zwtp_target = true
return;
} else {
self.zwtp_target = false
}
self.targetImage = targetImage;
imageEditor2.loadImageFromURL("data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(targetImage), "SampleImage").then(function (sizeValue) {
imageEditor2.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then(function (sizeValue) {
imageEditor2.clearUndoStack();
imageEditor2.clearRedoStack();
// 更新newHeight和newWidth
......@@ -4709,7 +4709,7 @@ export default {
self.lines = []
self.path = []
self.initStatus()
self.imageEditor.loadImageFromURL("data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(self.sourceImage), "SampleImage", { erasable: false }).then(function (sizeValue) {
self.imageEditor.loadImageFromURL("data:image/jpeg;base64," + self.sourceImage, "SampleImage", { erasable: false }).then(function (sizeValue) {
// 更新newHeight和newWidth
self.newHeight_source = sizeValue.newHeight;
self.newWidth_source = sizeValue.newWidth;
......@@ -4774,7 +4774,7 @@ export default {
self.targetDelTime = ''
self.initStatus()
self.imageEditor2.loadImageFromURL("data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(self.targetImage), "SampleImage").then(function (sizeValue) {
self.imageEditor2.loadImageFromURL("data:image/jpeg;base64," + self.targetImage, "SampleImage").then(function (sizeValue) {
self.imageEditor2.clearUndoStack();
self.imageEditor2.clearRedoStack();
// 更新newHeight和newWidth
......
src/utils/requestLoading.js
......@@ -64,7 +64,7 @@ let toHideLoading = function (loadingTarget) {
timer = setTimeout(() => {
store.commit('loading/setSmallLoading', false)
store.commit('loading/setLoadingSd', false)
}, 500);
}, 200);
};
// let toHideLoading = utils.debounce((loadingTarget) => {
// // loading.close();
......
src/views/Editor/modules/ajdaxx.vue
......@@ -278,7 +278,7 @@
</el-form-item>
</div>
</div>
<div class="horizontal-line"></div>
<!-- <div class="horizontal-line"></div>
<div class="title">
<div class="line"></div>
<span class="name">操作记录列表</span>
......@@ -318,7 +318,7 @@
>
</el-table-column>
</el-table>
</div>
</div> -->
</div>
<div class="horizontal-line"></div>
<div class="form-footer">
......@@ -665,7 +665,7 @@ export default {
//监听页面滚动
this.$nextTick(() => {
document.querySelector('.el-drawer__body').addEventListener("scroll", (e) => {
if (e.target.scrollTop > 400) {
if (e.target.scrollTop > 50) {
$('.arrow-down-img').css('transform', 'rotate(180deg)');
} else {
$('.arrow-down-img').css('transform', 'rotate(0deg)');
......
src/views/Editor/modules/ajzwbjLeft.vue
......@@ -31,7 +31,7 @@
<div class="finger-number">{{(item.code) &lt; 10 ? ('0'+(item.code)) : (item.code)}}</div>
<div class="finger-pic">
<!-- <img src="../../../assets/img/finger.png" /> -->
<img :src="'data:image/jpeg;base64,'+$fFormatUtil.imgSrcFormat(item.image)" alt="">
<img :src="'data:image/jpeg;base64,'+item.image" alt="">
</div>
</div>
</div>
......
src/views/Editor/modules/imageEd.vue
......@@ -1252,7 +1252,7 @@ export default {
self.sourceImage = sourceImage;
imageEditor
.loadImageFromURL(
"data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(sourceImage),
"data:image/jpeg;base64," + sourceImage,
"SampleImage"
)
.then(function (sizeValue) {
......@@ -3907,7 +3907,7 @@ export default {
if (this.isShowSourcePrivew) {
// 转换canvas为base64图片贴到缩略图中
setTimeout(() => {
let dataURL = "data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(self.sourceImage); //this.imageEditor.toDataURL();
let dataURL = "data:image/jpeg;base64," + self.sourceImage; //this.imageEditor.toDataURL();
//console.log(dataURL);
this.previewSource = dataURL;
// 缩略图的缩略框大小
......
src/views/Editor/modules/imageEd2.vue
......@@ -1665,7 +1665,7 @@ export default {
self.sourceImage = sourceImage;
imageEditor
.loadImageFromURL(
"data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(sourceImage),
"data:image/jpeg;base64," + sourceImage,
"SampleImage"
)
.then(function(sizeValue) {
......
src/views/Editor/modules/imageEdAJ.vue
......@@ -1975,7 +1975,7 @@ export default {
self.sourceImage = sourceImage;
imageEditor
.loadImageFromURL(
"data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(sourceImage),
"data:image/jpeg;base64," + sourceImage,
"SampleImage"
)
.then(function (sizeValue) {
......@@ -3741,7 +3741,7 @@ export default {
self.sourceImage = sourceImage;
imageEditor
.loadImageFromURL(
"data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(sourceImage),
"data:image/jpeg;base64," + sourceImage,
"SampleImage"
)
.then(function (sizeValue) {
......@@ -8143,7 +8143,7 @@ export default {
if (this.isShowSourcePrivew) {
// 转换canvas为base64图片贴到缩略图中
setTimeout(() => {
let dataURL = "data:image/jpeg;base64," + $fFormatUtil.imgSrcFormat(self.sourceImage);
let dataURL = "data:image/jpeg;base64," + self.sourceImage;
console.log(dataURL);
this.previewSource = dataURL;
// 缩略图样式和尺寸
......
src/views/Editor/modules/rydaxx.scss
......@@ -43,7 +43,7 @@
.content {
margin-top: 50px;
// overflow: auto;
height: 1700px;
height: 1400px;
.ayzzwjbxx {
padding: 24px 32px;
......@@ -469,7 +469,7 @@
.ajdaxx-drawer {
.content {
height: 1400px;
height: 1060px;
}
}
......
src/views/Editor/modules/rydaxx.vue
......@@ -392,8 +392,8 @@
</el-form-item>
</div>
</div>
<div class="horizontal-line"></div>
<div class="title">
<!-- <div class="horizontal-line"></div> -->
<!-- <div class="title">
<div class="line"></div>
<span class="name">操作记录列表</span>
</div>
......@@ -432,7 +432,7 @@
>
</el-table-column>
</el-table>
</div>
</div> -->
</div>
<div class="horizontal-line"></div>
<div class="form-footer">
......
src/views/SystemManage/UserManage.vue
......@@ -8,9 +8,9 @@
<el-input
class="search-info"
v-model="searchParams.username"
maxlength="8"
clearable
placeholder="请输入用户名"
clearable
:maxlength="8"
></el-input>
</div>
<div class="search-item">
......@@ -18,9 +18,9 @@
<el-input
class="search-info"
v-model="searchParams.name"
maxlength="50"
clearable
placeholder="请输入姓名"
clearable
:maxlength="50"
/>
</div>
<div class="search-item">
......@@ -75,12 +75,15 @@
</div>
<div class="split-line">
<div class="operation">
<div class="btn1 f-default-button" @click="batch">批量操作</div>
<div class="operation-left">
<div class="btn1 f-default-button" @click="batch">批量操作</div>
<el-checkbox v-model="checked" style="margin-left: 0.625rem">停用</el-checkbox>
</div>
<div class="btns">
<el-checkbox v-model="checked" style="margin-right: 0.625rem"
<!-- <el-checkbox v-model="checked" style="margin-right: 0.625rem"
>停用
</el-checkbox
>
> -->
<div
class="btn1 f-default-button"
@click="delMore()"
......@@ -327,8 +330,8 @@
maxlength="8"
show-word-limit
class="input-info"
clearable
v-model="addFormParams.username"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="姓名:" prop="name">
......@@ -337,8 +340,8 @@
class="input-info"
maxlength="50"
show-word-limit
clearable
v-model="addFormParams.name"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="身份证号:" prop="idCard">
......@@ -347,8 +350,8 @@
class="input-info"
maxlength="18"
show-word-limit
clearable
v-model="addFormParams.idCard"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="所属单位:" prop="unitCode">
......@@ -362,10 +365,9 @@
<el-input
placeholder="请输入用户警号"
class="input-info"
maxlength="7"
show-word-limit
v-model="addFormParams.policeNumber"
clearable
v-model="addFormParams.policeNumber"></el-input>
></el-input>
</el-form-item>
<el-form-item class="info-item" label="加入用户组:">
<SelectCode
......@@ -388,9 +390,9 @@
placeholder="请输入密码"
type="password"
class="input-info"
clearable
maxlength="8"
v-model="addFormParams.password"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="确认密码:" prop="okpassword">
......@@ -398,9 +400,9 @@
placeholder="请确认密码"
type="password"
maxlength="8"
clearable
class="input-info"
v-model="addFormParams.okpassword"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="联系电话:" prop="phoneNumber">
......@@ -408,9 +410,9 @@
placeholder="请输入联系电话"
class="input-info"
maxlength="18"
clearable
show-word-limit
v-model="addFormParams.phoneNumber"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
......@@ -463,6 +465,7 @@
maxlength="8"
show-word-limit
v-model="editFormParams.username"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="姓名:" prop="name">
......@@ -470,9 +473,9 @@
placeholder="请输入姓名"
class="input-info"
maxlength="50"
clearable
show-word-limit
v-model="editFormParams.name"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="身份证号:" prop="idCard">
......@@ -481,8 +484,8 @@
class="input-info"
maxlength="18"
show-word-limit
clearable
v-model="editFormParams.idCard"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="所属单位:" prop="unitCode">
......@@ -496,10 +499,8 @@
<el-input
placeholder="请输入用户警号"
class="input-info"
maxlength="7"
show-word-limit
clearable
v-model="editFormParams.policeNumber"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="加入用户组:">
......@@ -523,9 +524,9 @@
placeholder="请输入联系电话"
class="input-info"
maxlength="18"
clearable
show-word-limit
v-model="editFormParams.phoneNumber"
clearable
></el-input>
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
......@@ -1046,6 +1047,7 @@ export default {
*/
search(boo) {
let params = {}
console.log(this.searchParams);
//如果boo为true 则页数从第一页开始
if (boo) {
this.$set(this.searchParams, 'page', 1)
......@@ -1058,6 +1060,9 @@ export default {
params[key] = this.searchParams[key]
}
}
// 清空多选
this.multipleSelection = []
console.log(params);
this.$axios({
url: '/security/users/search',
method: 'post',
......@@ -1307,6 +1312,7 @@ export default {
watch: {
//点击取消停用表格筛选
checked(val) {
this.multipleSelection = []
this.key++
if (val) {
this.tableData = this.allTableData.filter((i) => i.status == 0)
......@@ -1570,6 +1576,9 @@ export default {
/deep/ .el-input__inner:hover {
cursor: text;
}
/deep/.el-input__icon {
line-height: 32px;
}
@import "scss/user";
@import "./scss/dialog_table";
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -851,7 +851,7 @@ export default {
} else {
self.fingerShowType = 'pain'
}
if (self.finger != null) {
if (self.finger != null && self.finger.image) {
if (self.finger.code <= 5) {
self.changeStyleRightR(0, self.finger);
} else if (self.finger.code > 5 && self.finger.code <= 10) {
......@@ -861,6 +861,9 @@ export default {
} else if (self.finger.code > 15 && self.finger.code <= 20) {
self.changeStyleLeftL(0, self.finger);
}
} else {
self.$bus.emit('changImageEdit', 'xxx')
self.$bus.emit('changImageEditTarget', 'xxx')
}
} else {
// 未删除
......@@ -1076,7 +1079,7 @@ export default {
} else {
self.fingerShowType = 'pain'
}
if (self.finger != null) {
if (self.finger != null && self.finger.image) {
if (self.finger.code <= 5) {
self.changeStyleRightR(0, self.finger);
} else if (self.finger.code > 5 && self.finger.code <= 10) {
......@@ -1086,6 +1089,9 @@ export default {
} else if (self.finger.code > 15 && self.finger.code <= 20) {
self.changeStyleLeftL(0, self.finger);
}
} else {
self.$bus.emit('changImageEdit', 'xxx')
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
......
src/views/rgrd/modules/TLSrc.vue
......@@ -1033,7 +1033,7 @@ export default {
} else {
self.fingerShowType = "pain";
}
if (self.finger != null) {
if (self.finger != null && self.finger.image) {
if (self.finger.code <= 5) {
self.changeStyleRightR(0, self.finger);
} else if (self.finger.code > 5 && self.finger.code <= 10) {
......@@ -1043,6 +1043,9 @@ export default {
} else if (self.finger.code > 15 && self.finger.code <= 20) {
self.changeStyleLeftL(0, self.finger);
}
} else {
self.$bus.emit('changImageEdit', 'xxx')
self.$bus.emit('changImageEditTarget', 'xxx')
}
} else {
// 未删除
......@@ -1239,7 +1242,7 @@ export default {
} else {
self.fingerShowType = "pain";
}
if (self.finger != null) {
if (self.finger != null && self.finger.image) {
if (self.finger.code <= 5) {
self.changeStyleRightR(0, self.finger);
} else if (self.finger.code > 5 && self.finger.code <= 10) {
......@@ -1249,6 +1252,9 @@ export default {
} else if (self.finger.code > 15 && self.finger.code <= 20) {
self.changeStyleLeftL(0, self.finger);
}
} else {
self.$bus.emit('changImageEdit', 'xxx')
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
......
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