Skip to content

F
founder_vue
Commit d085f632 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents 901ad4e0 eb716714
Showing with 871 additions and 491 deletions
src/main.js
......@@ -12,6 +12,7 @@ import './plugins/axios'
import fHttp from './request/http.js'
import NetUtil from './netmgr/NetUtil'
import RegExpUtil from './utils/verify-data/RegExpUtil.js'
import ValueFormatUtil from './utils/ValueFormatUtil.js'
import App from './App.vue'
import router from './router'
import store from './store'
......@@ -44,6 +45,7 @@ import IconSvg from './utils/IconSvg.vue'
Vue.component('svg-icon', IconSvg)
moment.locale('zh-cn')
Vue.prototype.$moment = moment
window.moment = moment
// 引入上传组件
import uploader from 'vue-simple-uploader'
......@@ -87,6 +89,8 @@ window.user = UserUtil
window.ljkUtil = LjkUtil
window.fHttp = fHttp
window.fRegExp = RegExpUtil
Vue.prototype.$fFormatUtil = ValueFormatUtil
window.fFormatUtil = ValueFormatUtil
window.NetUtil = NetUtil
Vue.use(VueWechatTitle)
Vue.use(VueClipboard)
......
src/netmgr/cxyrd/cxyrd.js
......@@ -23,7 +23,7 @@ const _path = {
}
export default {
// 获取案件指纹
ajfinger(_parameter) {
ajfinger(_parameter) { A
return fHttp.postJson(_path.ajfinger, _parameter, HttpConfigUtil.closeLoadAndTip())
},
// 获取案件掌纹
......
src/request/http.js
......@@ -80,11 +80,11 @@ let initConfig = (config) => {
if (config[HttpConfig._TYPE.LOADING] !== false) {
showLoading(config[HttpConfig._TYPE.LOADING_TARGET]) // 如果设置了targer,使用设置的target,比如el-table
}
logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP)
if (config[HttpConfig._TYPE.TIP]) {
// logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP+'')
if (config[HttpConfig._TYPE.TIP] !== true) {
_IS_SHOW_TIP = config[HttpConfig._TYPE.TIP]
}
logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP)
// logger.info('_IS_SHOW_TIP', _IS_SHOW_TIP +'')
console.log('initConfig', config)
return config
}
......
src/utils/ValueFormatUtil.js 0 → 100644
export default {
// 时间格式化
dateTimeFormat (row, colnum) {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "---";
},
dateTimeFormat1 (row, colnum) {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD hh:mm:ss") : "---";
},
// 普通值非空格式化 空返回 '---'
valueFormat(row, colnum) {
let prop = colnum.property
return row[prop] ? row[prop] : '---'
},
// 普通值非空格式化 空返回 '0'
valueFormat0(row, colnum) {
let prop = colnum.property
return row[prop] ? row[prop] : '0'
},
}
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -1763,3 +1763,12 @@ export default {
// @import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/AllPersonnelBase/Index.vue
......@@ -19,3 +19,12 @@ export default {
<style lang="scss" scoped>
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/AllPersonnelBase/dclb.vue
......@@ -1219,3 +1219,12 @@ export default {
height: 56px !important;
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/AllPersonnelBase/gzlb.vue
......@@ -1984,3 +1984,12 @@ export default {
// @import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/AllPersonnelBase/modules/gz.vue
......@@ -326,3 +326,12 @@ export default {
border: 1px solid #EEEEEE;
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -963,7 +963,6 @@ export default {
/deep/.flexBox {
display: flex;
.el-checkbox {
margin-right: 24px;
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -1559,3 +1559,12 @@ const datas1 = [
}
// @import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/SystemManage/GroupManage.vue
......@@ -1956,3 +1956,12 @@ export default {
@import "./scss/boxShadow";
// @import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/SystemManage/GroupPermission.vue
......@@ -930,3 +930,12 @@ export default {
@import "scss/userpermission.scss";
@import "scss/group";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/SystemManage/PermissionManage.vue
......@@ -183,13 +183,14 @@
>
<template slot-scope="scope">
<div
v-if="scope.row.permissionNames && scope.row.permissionNames !== '/'"
v-for="(item, index) in scope.row.permissionNames &&
scope.row.permissionNames.split(',')"
:key="index"
>
:key="index">
{{ index > 0 ? "/" : "" }}
{{ item }}
</div>
<span v-else>{{ '---' }}</span>
</template>
</el-table-column>
<el-table-column prop="status" label="启用状态" width="auto">
......@@ -1151,3 +1152,12 @@ export default {
}
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/SystemManage/QueryPermission.vue
......@@ -964,3 +964,12 @@ export default {
// @import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/SystemManage/RoleManage.vue
......@@ -31,8 +31,7 @@
<div
@click.stop="copy(item.id)"
@mouseenter="$set(item, 'enter', true)"
@mouseleave="$set(item, 'enter', false)"
>
@mouseleave="$set(item, 'enter', false)">
<svg-icon
icon-class="copy"
v-show="fuzhi"
......@@ -93,23 +92,17 @@
<div class="autoPlay" ref="diyRoles">
<el-checkbox-group v-model="btnCheckList">
<div v-for="item in diyRoleList" :key="item.id" class="chooseItem">
<el-checkbox :label="item.id" class="checkChoose" v-if="delimgBoo"
>1</el-checkbox
>
<div
@click.stop="() => {}"
<el-checkbox :label="item.id" class="checkChoose" v-if="delimgBoo">1</el-checkbox>
<div @click.stop="() => {}"
:class="{
'diy-role-item': true,
active: item.id === diyRoleItemIndex,
delWidth: delimgBoo,
}"
>
delWidth: delimgBoo,}">
<div
v-show="!item.edit"
class="diy-edit-title"
:title="item.value"
@click="chooseDiyRoleItem(item)"
>
@click="chooseDiyRoleItem(item)">
{{ item.value }}
</div>
<el-input
......@@ -1022,6 +1015,7 @@ export default {
padding-right: 15px;
padding-left: 20px;
overflow: auto;
background: #30fd5301;
&::-webkit-scrollbar {
width: 10px; /*高宽分别对应横竖滚动条的尺寸*/
height: 10px;
......@@ -1098,3 +1092,12 @@ export default {
}
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/SystemManage/UserManage.vue
<template>
<el-container class="manage-page" direction="vertical">
<!-- 标题-->
......@@ -75,7 +74,8 @@
<div class="btn1 f-default-button" @click="batch">批量操作</div>
<div class="btns">
<el-checkbox v-model="checked" style="margin-right: 0.625rem"
>停用</el-checkbox
>停用
</el-checkbox
>
<div
class="btn1 f-default-button"
......@@ -93,7 +93,8 @@
margin-right: 0.25rem;
"
icon-class="ic_add"
/>新增用户
/>
新增用户
</div>
</div>
</div>
......@@ -117,7 +118,8 @@
color: multipleSelection.length > 0 ? '#055FE7' : '#C2C4C7',
}"
@click="toggleSelection()"
>清除</el-link
>清除
</el-link
>
</el-tag>
<div class="table-data">
......@@ -153,7 +155,7 @@
show-overflow-tooltip
>
<template slot-scope="scope">
{{ scope.row.policeNumber || "---" }}
{{ scope.row.policeNumber || '---' }}
</template>
</el-table-column>
<el-table-column
......@@ -163,7 +165,7 @@
:width="width3"
>
<template slot-scope="scope">
{{ scope.row.userGroupNames || "---" }}
{{ scope.row.userGroupNames || '---' }}
</template>
</el-table-column>
<el-table-column
......@@ -217,14 +219,14 @@
show-overflow-tooltip
>
<template slot-scope="scope">
<div
v-for="(item, index) in scope.row.permissionNames &&
scope.row.permissionNames.split(',')"
:key="index"
>
{{ index > 0 ? "/" : "" }}
<div v-if="scope.row.permissionNames && scope.row.permissionNames !== '/'">
<div v-for="(item, index) in scope.row.permissionNames && scope.row.permissionNames.split(',')"
:key="index">
{{ index > 0 && item ? '/' : '' }}
{{ item }}
</div>
</div>
<span v-else> {{ '---' }} </span>
</template>
</el-table-column>
<el-table-column prop="status" label="启用状态" align="center">
......@@ -233,10 +235,10 @@
<div v-if="scope.row.status === 1" class="circle-blue"></div>
{{
scope.row.status === 0
? "停用"
? '停用'
: scope.row.status === 1
? "启用"
: "无状态"
? '启用'
: '无状态'
}}
</template>
</el-table-column>
......@@ -410,7 +412,8 @@
class="add"
type="primary"
@click="submitForm(addFormParams)"
>提交</el-button
>提交
</el-button
>
<el-button class="cancel" @click="canceladd">取消</el-button>
</el-form-item>
......@@ -518,7 +521,8 @@
class="add"
type="primary"
@click="submitEditForm('editFormParams')"
>修改</el-button
>修改
</el-button
>
<el-button class="cancel" @click="canceledit">取消</el-button>
</el-form-item>
......@@ -532,11 +536,12 @@
* 用户管理
* @module UserManage
*/
import "@/icons/ic_add.svg";
import qs from "qs";
import Cascader from "@/components/Cascader.vue";
import Confirmation from "@/components/Confirmation.vue";
import SelectCode from "@/components/SelectCode.vue";
import '@/icons/ic_add.svg'
import qs from 'qs'
import Cascader from '@/components/Cascader.vue'
import Confirmation from '@/components/Confirmation.vue'
import SelectCode from '@/components/SelectCode.vue'
export default {
// name: "UserManage",
components: {
......@@ -545,134 +550,134 @@ export default {
SelectCode,
},
created() {
let w1 = 1920;
let w2 = window.innerWidth;
let w1 = 1920
let w2 = window.innerWidth
this.width1 = (this.width1 * w2) / w1;
this.width2 = (this.width2 * w2) / w1;
this.width3 = (this.width3 * w2) / w1;
this.width4 = (this.width4 * w2) / w1;
this.width5 = (this.width5 * w2) / w1;
this.sWidth = (this.sWidth * w2) / w1;
this.width1 = (this.width1 * w2) / w1
this.width2 = (this.width2 * w2) / w1
this.width3 = (this.width3 * w2) / w1
this.width4 = (this.width4 * w2) / w1
this.width5 = (this.width5 * w2) / w1
this.sWidth = (this.sWidth * w2) / w1
},
data() {
// 用户名校验
var validateUsername = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请输入用户名！"));
if (value.trim() === '') {
callback(new Error('请输入用户名！'))
} else {
if (/[\u4e00-\u9fa5]+/g.test(value.trim()) || value.trim().length > 8) {
callback(new Error("用户名不可为汉字字符，最长8位！"));
callback(new Error('用户名不可为汉字字符，最长8位！'))
} else {
callback();
callback()
}
}
}
};
// 证件号码
var patrn =
/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/;
/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/
var validateIdcard = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请输入证件号码！"));
if (value.trim() === '') {
callback(new Error('请输入证件号码！'))
} else {
if (!patrn.test(value.trim())) {
callback(new Error("请输入正确的证件号码！"));
callback(new Error('请输入正确的证件号码！'))
} else {
callback();
callback()
}
}
}
};
// 姓名校验
var validateTruename = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请输入姓名！"));
if (value.trim() === '') {
callback(new Error('请输入姓名！'))
} else {
if (!/[\u4e00-\u9fa5]+/g.test(value.trim())) {
callback(new Error("请输入汉字字符！"));
callback(new Error('请输入汉字字符！'))
} else {
callback();
callback()
}
}
}
};
// 手机号校验
var validateTelphone = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请输入联系电话！"));
if (value.trim() === '') {
callback(new Error('请输入联系电话！'))
} else {
if (
value.trim().length > 18 ||
!/^[-+]?(([0-9]+)([.]([0-9]+))?|([.]([0-9]+))?)$/.test(value.trim())
) {
callback(new Error("联系电话为18位的数字！"));
callback(new Error('联系电话为18位的数字！'))
} else {
callback();
callback()
}
}
}
};
// 单位代码校验
var validateUnitcode = (rule, value, callback) => {
if (value === "") {
callback(new Error("请选择单位代码！"));
if (value === '') {
callback(new Error('请选择单位代码！'))
} else {
callback();
callback()
}
}
};
// 单位名称校验
var validateUnitname = (rule, value, callback) => {
if (value === "") {
callback(new Error("请选择单位名称！"));
if (value === '') {
callback(new Error('请选择单位名称！'))
} else {
callback();
callback()
}
}
};
//警号校验
var validatePolicemanid = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请输入警号！"));
if (value.trim() === '') {
callback(new Error('请输入警号！'))
} else {
callback();
callback()
}
}
};
// 新增密码校验
var validatePass = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请输入密码！"));
if (value.trim() === '') {
callback(new Error('请输入密码！'))
} else {
if (value.trim().length > 8) {
callback(new Error("密码长度需在8位数以内！"));
callback(new Error('密码长度需在8位数以内！'))
} else {
callback();
callback()
}
}
}
};
// 新增确认密码校验
var validatePass2 = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请再次输入密码"));
if (value.trim() === '') {
callback(new Error('请再次输入密码'))
} else if (value.trim() !== this.addFormParams.password) {
callback(new Error("两次输入密码不一致!"));
callback(new Error('两次输入密码不一致!'))
} else {
callback();
callback()
}
}
};
// 新增确认密码校验
var validatePassEdit = (rule, value, callback) => {
if (value.trim() === "") {
callback(new Error("请再次输入密码"));
if (value.trim() === '') {
callback(new Error('请再次输入密码'))
} else if (value.trim() !== this.editFormParams.password) {
callback(new Error("两次输入密码不一致!"));
callback(new Error('两次输入密码不一致!'))
} else {
callback();
callback()
}
}
};
// 启用状态校验
var validateStatus = (rule, value, callback) => {
if (value === "") {
callback(new Error("请选择状态"));
if (value === '') {
callback(new Error('请选择状态'))
} else {
callback();
callback()
}
}
};
return {
loading: false,
width4: 350,
......@@ -680,105 +685,105 @@ export default {
width2: 100,
width5: 220,
width1: 100,
height: "33rem",
height: '33rem',
sWidth: 50,
//组件需要的配置
props: {
value: "code",
label: "key",
children: "childCodeDwXz",
value: 'code',
label: 'key',
children: 'childCodeDwXz',
checkStrictly: true,
emitPath: false,
},
// 新增对象
addFormParams: {
idCard: "",
identityCard: "",
username: "2233333",
phoneNumber: "13327454372",
password: "2222222",
okpassword: "2222222",
policeNumber: "222222",
unitName: "长沙",
unitCode: "",
name: "我当时大多数",
idCard: '',
identityCard: '',
username: '2233333',
phoneNumber: '13327454372',
password: '2222222',
okpassword: '2222222',
policeNumber: '222222',
unitName: '长沙',
unitCode: '',
name: '我当时大多数',
status: 1,
userGroupId: [],
roleId: [],
},
//修改对象
editFormParams: {
idCard: "", //身份证号
identityCard: "",
username: "", //用户名
name: "", //姓名
unitCode: "", //单位代码
policeNumber: "", //警号
phoneNumber: "", //联系电话
status: "", //启用状态
idCard: '', //身份证号
identityCard: '',
username: '', //用户名
name: '', //姓名
unitCode: '', //单位代码
policeNumber: '', //警号
phoneNumber: '', //联系电话
status: '', //启用状态
userGroupId: [], // 用户组
roleId: [], // 角色
},
addrules: {
//身份证
idCard: [
{ validator: validateIdcard, trigger: "blur", required: true },
{validator: validateIdcard, trigger: 'blur', required: true},
],
password: [
{ validator: validatePass, trigger: "blur", required: true },
{validator: validatePass, trigger: 'blur', required: true},
], //密码
okpassword: [
{ validator: validatePass2, trigger: "blur", required: true },
{validator: validatePass2, trigger: 'blur', required: true},
], // 确认密码
username: [
{ validator: validateUsername, trigger: "blur", required: true },
{validator: validateUsername, trigger: 'blur', required: true},
], //用户名
name: [
{ validator: validateTruename, trigger: "blur", required: true },
{validator: validateTruename, trigger: 'blur', required: true},
], //用户真实姓名
phoneNumber: [
{ validator: validateTelphone, trigger: "blur", required: true },
{validator: validateTelphone, trigger: 'blur', required: true},
], //用户电话
unitCode: [
{ validator: validateUnitcode, trigger: "change", required: true },
{validator: validateUnitcode, trigger: 'change', required: true},
], //单位代码
unitName: [
{ validator: validateUnitname, trigger: "blur", required: true },
{validator: validateUnitname, trigger: 'blur', required: true},
], //单位名称
userGroupId: [{ validator: validatePass, trigger: "blur" }], // 用户组
roleId: [{ validator: validatePass, trigger: "blur" }], // 角色
userGroupId: [{validator: validatePass, trigger: 'blur'}], // 用户组
roleId: [{validator: validatePass, trigger: 'blur'}], // 角色
status: [
{ validator: validateStatus, trigger: "blur", required: true },
{validator: validateStatus, trigger: 'blur', required: true},
], // 启用状态
},
editrules: {
idCard: [
{ validator: validateIdcard, trigger: "blur", required: true },
{validator: validateIdcard, trigger: 'blur', required: true},
],
username: [
{ validator: validateUsername, trigger: "blur", required: true },
{validator: validateUsername, trigger: 'blur', required: true},
], //用户名
name: [
{ validator: validateTruename, trigger: "blur", required: true },
{validator: validateTruename, trigger: 'blur', required: true},
], //用户真实姓名
unitCode: [
{ validator: validateUnitcode, trigger: "change", required: true },
{validator: validateUnitcode, trigger: 'change', required: true},
], //单位代码
phoneNumber: [
{ validator: validateTelphone, trigger: "blur", required: true },
{validator: validateTelphone, trigger: 'blur', required: true},
], //用户电话
userGroupId: [{ validator: validatePass, trigger: "blur" }], // 用户组
roleId: [{ validator: validatePass, trigger: "blur" }], // 角色
userGroupId: [{validator: validatePass, trigger: 'blur'}], // 用户组
roleId: [{validator: validatePass, trigger: 'blur'}], // 角色
status: [
{ validator: validateStatus, trigger: "blur", required: true },
{validator: validateStatus, trigger: 'blur', required: true},
], // 启用状态
},
// 搜索对象
searchParams: {
username: "",
name: "",
username: '',
name: '',
userGroupId: [],
unitCode: "",
unitCode: '',
roleId: [],
permissionId: [],
page: 1,
......@@ -807,66 +812,66 @@ export default {
checked: false,
key: 1,
// tableData: data1,
};
}
},
computed: {
//权限相关的数组
roleArr() {
return this.$store.state.layout.Menu;
return this.$store.state.layout.Menu
},
//计算分页
countPage() {
return Math.ceil(this.total / 10) > 0 ? Math.ceil(this.total / 10) : 1;
return Math.ceil(this.total / 10) > 0 ? Math.ceil(this.total / 10) : 1
},
//计算角色的宽度是动态的
newWidth() {
let w1 = 1920;
let w2 = window.innerWidth;
let map = this.tableData.map((i) => i.roleNames.split(","));
let num = 0;
let width;
let w1 = 1920
let w2 = window.innerWidth
let map = this.tableData.map((i) => i.roleNames.split(','))
let num = 0
let width
map.forEach((i) => {
if (i.length > num) num = i.length;
});
if (i.length > num) num = i.length
})
if (num <= 3) {
width = num * 150;
width = num * 150
if (num == 1) {
width += 100;
width += 100
} else if (num == 2) {
width += 50;
width += 50
} else if (num == 3) {
width = 480;
width = 480
}
} else if (num > 3) {
width = 500;
width = 500
}
width = (width * w2) / w1;
return width;
width = (width * w2) / w1
return width
},
// 计算总页数
Tpage() {
return Math.floor(this.page.count / this.page.total) + 1;
return Math.floor(this.page.count / this.page.total) + 1
},
//动态显示清空按钮(看看筛选条件用户输了没有)
newStr() {
let str = "";
console.log(this.searchParams);
let str = ''
console.log(this.searchParams)
for (let key in this.searchParams) {
if (
key != "page" &&
key != "roleId" &&
key != "userGroupId" &&
key != "permissionId" &&
key != "size"
key != 'page' &&
key != 'roleId' &&
key != 'userGroupId' &&
key != 'permissionId' &&
key != 'size'
) {
str += this.searchParams[key].trim();
str += this.searchParams[key].trim()
}
if (key == "userGroupId" || key == "roleId" || key == "permissionId") {
str += this.searchParams[key].join();
if (key == 'userGroupId' || key == 'roleId' || key == 'permissionId') {
str += this.searchParams[key].join()
}
}
return str == "" ? false : true;
return str == '' ? false : true
},
},
methods: {
......@@ -876,46 +881,46 @@ export default {
*/
submitForm(formName) {
//console.log(this.addFormParams, 22222222222);
let params = {};
let params = {}
for (let key in this.addFormParams) {
if (key == "roleId" || key == "userGroupId") {
if (key == 'roleId' || key == 'userGroupId') {
params[key] =
this.addFormParams[key] && this.addFormParams[key].join(",");
this.addFormParams[key] && this.addFormParams[key].join(',')
} else {
params[key] = this.addFormParams[key];
params[key] = this.addFormParams[key]
}
}
this.$refs.addFormParams.validate((valid) => {
//console.log(valid);
if (valid) {
this.$axios
.post("/security/users", params)
.post('/security/users', params)
.then((res) => {
if (res.data.code == 201) {
setTimeout(() => {
this.$message.success("添加成功");
}, 800);
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
this.search("yes");
this.$message.success('添加成功')
}, 800)
this.isShowAddUserDialog = false
this.isShowAddUserDialogBg = false
this.search('yes')
} else if (res.data.code == 400 || res.data.code == 500) {
setTimeout(() => {
this.$message.error(res.data.detail);
}, 500);
this.$message.error(res.data.detail)
}, 500)
} else if (res.data.code == 404) {
setTimeout(() => {
this.$message.error("服务不存在");
}, 500);
this.$message.error('服务不存在')
}, 500)
}
})
.catch((res) => {
//console.log(res);
});
})
} else {
//console.log("error submit!!");
return false;
return false
}
});
})
},
/**
* @function strArr
......@@ -924,24 +929,24 @@ export default {
* @returns {Object} 返回了一个对象，里面包含arr(裁剪后的角色数组),length(裁剪之前的角色个数)
*/
strArr(str) {
let arr = str.split(",");
let newArr = [];
let arr = str.split(',')
let newArr = []
if (arr.length > 3) {
newArr = arr.slice(0, 3);
newArr = arr.slice(0, 3)
} else {
newArr = arr;
newArr = arr
}
let obj = {
arr: newArr,
length: arr.length,
};
if (obj.length == 1 && obj.arr[0] == "") {
}
if (obj.length == 1 && obj.arr[0] == '') {
return {
arr: [""],
arr: [''],
length: 0,
};
}
} else {
return obj;
return obj
}
},
/**
......@@ -953,39 +958,39 @@ export default {
//console.log(valid);
if (valid) {
//配置字段
let params = {};
let params = {}
for (let key in this.editFormParams) {
if (key == "roleId" || key == "userGroupId") {
if (key == 'roleId' || key == 'userGroupId') {
params[key] =
this.editFormParams[key] && this.editFormParams[key].join();
this.editFormParams[key] && this.editFormParams[key].join()
} else {
params[key] = this.editFormParams[key];
params[key] = this.editFormParams[key]
}
}
//调用接口
this.$axios.put("/security/users", params).then((res) => {
this.$axios.put('/security/users', params).then((res) => {
if (res.data.code == 200) {
setTimeout(() => {
this.$message.success("修改成功");
}, 800);
this.isShowEditUserDialog = false;
this.isShowEditUserDialogBg = false;
this.search();
this.$message.success('修改成功')
}, 800)
this.isShowEditUserDialog = false
this.isShowEditUserDialogBg = false
this.search()
} else if (res.data.code == 400 || res.data.code == 500) {
setTimeout(() => {
this.$message.error(res.data.detail);
}, 500);
this.$message.error(res.data.detail)
}, 500)
} else if (res.data.code == 404) {
setTimeout(() => {
this.$message.error("服务不存在");
}, 500);
this.$message.error('服务不存在')
}, 500)
}
});
})
} else {
//console.log("error submit!!");
return false;
return false
}
});
})
},
/**
* @function resetForm
......@@ -993,7 +998,7 @@ export default {
* @example 重置对应的form表单
*/
resetForm(formName) {
this.$refs[formName].resetFields();
this.$refs[formName].resetFields()
},
/**
* @function clear
......@@ -1002,19 +1007,19 @@ export default {
clear() {
for (let key in this.searchParams) {
if (
key != "page" &&
key != "userGroupId" &&
key != "roleId" &&
key != "permissionId" &&
key != "size"
key != 'page' &&
key != 'userGroupId' &&
key != 'roleId' &&
key != 'permissionId' &&
key != 'size'
) {
this.$set(this.searchParams, key, "");
this.$set(this.searchParams, key, '')
}
if (key == "userGroupId" || key == "roleId" || key == "permissionId") {
this.$set(this.searchParams, key, []);
if (key == 'userGroupId' || key == 'roleId' || key == 'permissionId') {
this.$set(this.searchParams, key, [])
}
}
this.search("yes");
this.search('yes')
},
/**
* @function search
......@@ -1022,43 +1027,43 @@ export default {
* @example 筛选用户表格数据
*/
search(boo) {
let params = {};
let params = {}
//如果boo为true 则页数从第一页开始
if (boo) {
this.$set(this.searchParams, "page", 1);
this.$set(this.searchParams, "size", 10);
this.$set(this.searchParams, 'page', 1)
this.$set(this.searchParams, 'size', 10)
}
for (let key in this.searchParams) {
if (key == "userGroupId" || key == "roleId" || key == "permissionId") {
params[key] = this.searchParams[key].join();
if (key == 'userGroupId' || key == 'roleId' || key == 'permissionId') {
params[key] = this.searchParams[key].join()
} else {
params[key] = this.searchParams[key];
params[key] = this.searchParams[key]
}
}
this.$axios({
url: "/security/users/search",
method: "post",
url: '/security/users/search',
method: 'post',
data: JSON.stringify(params),
headers: {
"Content-Type": "application/json",
'Content-Type': 'application/json',
},
}).then((res) => {
if (res.data.code == 200) {
let result = res.data.detail;
this.tableData = result.users;
this.allTableData = result.users;
this.total = result.total;
this.key++;
let result = res.data.detail
this.tableData = result.users
this.allTableData = result.users
this.total = result.total
this.key++
}
});
})
},
/**
* @function offMultiple
* @example 取消批量操作状态，删除所有选中的用户
*/
offMultiple() {
this.selectBoo = false;
this.$refs.multipleTable.clearSelection();
this.selectBoo = false
this.$refs.multipleTable.clearSelection()
},
/**
* @function toggleSelection
......@@ -1068,10 +1073,10 @@ export default {
toggleSelection(rows) {
if (rows) {
rows.forEach((row) => {
this.$refs.multipleTable.toggleRowSelection(row);
});
this.$refs.multipleTable.toggleRowSelection(row)
})
} else {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.clearSelection()
}
//console.log(this.multipleSelection);
},
......@@ -1081,7 +1086,7 @@ export default {
* @example 将勾选的用户对象保存起来
*/
handleSelectionChange(val) {
this.multipleSelection = val;
this.multipleSelection = val
//console.info("选择的数据", this.multipleSelection);
},
/**
......@@ -1089,8 +1094,8 @@ export default {
* @example 点击批量操作后的方法
*/
batch() {
this.selectBoo = !this.selectBoo;
this.toggleSelection();
this.selectBoo = !this.selectBoo
this.toggleSelection()
},
/**
* @function handleCurrPageChange
......@@ -1098,8 +1103,8 @@ export default {
* @example 当期页发生变化
*/
handleCurrPageChange: function (val) {
this.searchParams.page = val;
this.search();
this.searchParams.page = val
this.search()
},
/**
* @function handleSizeChange
......@@ -1107,8 +1112,8 @@ export default {
* @example 每页展示数量发生变化
*/
handleSizeChange: function (val) {
this.searchParams.size = val;
this.search();
this.searchParams.size = val
this.search()
},
/**
* @function open
......@@ -1116,14 +1121,14 @@ export default {
*/
open() {
for (let key in this.addFormParams) {
if (key == "userGroupId" || key == "roleId") {
this.$set(this.addFormParams, key, []);
} else if (key != "status") {
this.$set(this.addFormParams, key, "");
if (key == 'userGroupId' || key == 'roleId') {
this.$set(this.addFormParams, key, [])
} else if (key != 'status') {
this.$set(this.addFormParams, key, '')
}
}
this.isShowAddUserDialog = true;
this.isShowAddUserDialogBg = true;
this.isShowAddUserDialog = true
this.isShowAddUserDialogBg = true
},
/**
* @function openedit
......@@ -1132,17 +1137,17 @@ export default {
*/
openedit(row) {
for (let key in this.editFormParams) {
if (key == "userGroupId" || key == "roleId") {
this.$set(this.addFormParams, key, []);
} else if (key != "status") {
this.$set(this.editFormParams, key, "");
if (key == 'userGroupId' || key == 'roleId') {
this.$set(this.addFormParams, key, [])
} else if (key != 'status') {
this.$set(this.editFormParams, key, '')
}
}
// editFormParams
this.isShowEditUserDialog = true;
this.isShowEditUserDialogBg = true;
this.isShowEditUserDialog = true
this.isShowEditUserDialogBg = true
//回显编辑时候的字段的内容
this.getPersonInfor(row.id);
this.getPersonInfor(row.id)
},
/**
* @function getPersonInfor
......@@ -1151,75 +1156,75 @@ export default {
*/
getPersonInfor(id) {
this.$axios
.get("/security/users/" + id, { loadingTarget: ".edit" })
.get('/security/users/' + id, {loadingTarget: '.edit'})
.then((res) => {
if (res.data) {
let result = res.data;
let result = res.data
for (let key in this.editFormParams) {
this.$set(this.editFormParams, key, result[key]);
this.$set(this.editFormParams, key, result[key])
}
this.$set(this.editFormParams, "id", id);
this.$set(this.editFormParams, 'id', id)
this.$set(
this.editFormParams,
"userGroupId",
(result["userGroupIds"] && result["userGroupIds"].split(",")) ||
'userGroupId',
(result['userGroupIds'] && result['userGroupIds'].split(',')) ||
[]
);
)
this.$set(
this.editFormParams,
"roleId",
(result["roleIds"] && result["roleIds"].split(",")) || []
);
'roleId',
(result['roleIds'] && result['roleIds'].split(',')) || []
)
}
});
})
},
/**
* @function canceladd
* @example 关闭新增弹窗
*/
canceladd() {
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
this.isShowAddUserDialog = false
this.isShowAddUserDialogBg = false
},
/**
* @function canceledit
* @example 关闭修改弹窗
*/
canceledit() {
this.isShowEditUserDialog = false;
this.isShowEditUserDialogBg = false;
this.isShowEditUserDialog = false
this.isShowEditUserDialogBg = false
},
/**
* @function delMore
* @example 批量删除用户
*/
delMore() {
let self = this;
let self = this
if (!this.selectBoo) {
this.selectBoo = true;
return;
this.selectBoo = true
return
}
if (this.multipleSelection.length <= 0) {
this.$message.error("请选择用户后操作");
return;
}
console.log(this.multipleSelection);
let ids = this.multipleSelection.map((i) => i.id);
ids = ids.join(",");
this.$confirm("此操作将永久删除用户, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
this.$message.error('请选择用户后操作')
return
}
console.log(this.multipleSelection)
let ids = this.multipleSelection.map((i) => i.id)
ids = ids.join(',')
this.$confirm('此操作将永久删除用户, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
self.del(ids);
self.del(ids)
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
type: 'info',
message: '已取消删除',
})
})
},
/**
* @function del
......@@ -1228,169 +1233,195 @@ export default {
*/
del(id) {
this.$axios({
method: "delete",
url: "/security/users/delete",
method: 'delete',
url: '/security/users/delete',
headers: {
"Content-Type": "application/x-www-form-urlencoded",
'Content-Type': 'application/x-www-form-urlencoded',
},
data: qs.stringify({
userId: id,
}),
}).then((res) => {
if (res.data.code == 200 && res.data.info == "success") {
this.search("yes");
if (res.data.code == 200 && res.data.info == 'success') {
this.search('yes')
setTimeout(() => {
this.$message.success("删除成功");
this.offMultiple();
}, 500);
this.$message.success('删除成功')
this.offMultiple()
}, 500)
} else {
this.$message.error(res.data.info);
this.$message.error(res.data.info)
}
});
})
// this.search();
},
},
//缓存进入时通过添加enter键搜索功能
activated() {
this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return;
this.search("yes");
});
this.$bus.on('enter', () => {
if (this.$store.state.loading.groundGlassBoo) return
this.search('yes')
})
},
deactivated() {
this.$bus.off("enter");
this.$bus.off('enter')
},
beforeDestroy() {
this.$bus.off("enter");
this.$bus.off('enter')
},
mounted() {
this.search("yes");
this.$bus.on("enter", () => {
if (this.$store.state.loading.groundGlassBoo) return;
this.search("yes");
});
this.search('yes')
this.$bus.on('enter', () => {
if (this.$store.state.loading.groundGlassBoo) return
this.search('yes')
})
//删除添加到body里面的弹框(毛玻璃问题)
this.$nextTick(() => {
document.body.appendChild(this.$refs.addUserDialog);
document.body.appendChild(this.$refs.isShowEditUserDialog);
});
document.body.appendChild(this.$refs.addUserDialog)
document.body.appendChild(this.$refs.isShowEditUserDialog)
})
},
watch: {
//点击取消停用表格筛选
checked(val) {
this.key++;
this.key++
if (val) {
this.tableData = this.allTableData.filter((i) => i.status == 0);
this.tableData = this.allTableData.filter((i) => i.status == 0)
} else {
this.tableData = this.allTableData;
this.tableData = this.allTableData
}
},
isShowAddUserDialog(val) {
this.$bus.emit("isBlur", val);
this.$bus.emit('isBlur', val)
},
isShowEditUserDialog(val) {
this.$bus.emit("isBlur", val);
this.$bus.emit('isBlur', val)
},
selectBoo: {
handler(newval) {
if (this.selectBoo) {
this.isShowTip = true;
this.isShowTip = true
} else {
this.isShowTip = false;
this.isShowTip = false
}
},
},
},
//当缓存结束删除弹框dom
destroyed() {
$(".addDialog").remove();
$(".editDialog").remove();
$('.addDialog').remove()
$('.editDialog').remove()
},
};
}
</script>
<style lang="css">
.el-tooltip__popper {
.el-tooltip__popper {
font-size: 14px;
max-width: 50%;
}
.el-tooltip__popper.is-dark {
}
.el-tooltip__popper.is-dark {
background: rgba(51, 51, 51, 0.9);
box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.1);
}
}
</style>
<style scoped lang="scss">
.delSelection /deep/ .el-table-column--selection .cell {
/*/deep/.el-table tbody tr:hover>td {*/
/* background-color: #ffffff*/
/*}，*/
/*/deep/.el-table__row:hover > td {*/
/* background-color: #ffffff !important;*/
/*}*/
/*/deep/.el-table__row--striped:hover > td {*/
/* background-color: #ffffff !important;*/
/*}*/
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
/deep/ .el-form-item {
}
/deep/ .el-form-item {
margin-bottom: 25px !important;
}
/deep/ .addbtns {
}
/deep/ .addbtns {
margin-bottom: 0 !important;
padding: 15px 0 !important;
}
.info {
}
.info {
margin-top: 0px !important;
}
/deep/ .is-indeterminate {
}
/deep/ .is-indeterminate {
.el-checkbox__inner {
background-color: #055fe7;
border-color: #055fe7;
}
}
// 去除table表格最底部边框
.el-table__row > td {
}
// 去除table表格最底部边框
.el-table__row > td {
border: none;
}
// 去除table表格最底部边框
.el-table::before {
}
// 去除table表格最底部边框
.el-table::before {
height: 0px;
}
}
/deep/.el-table .el-table__header-wrapper tr th {
/deep/ .el-table .el-table__header-wrapper tr th {
background-color: #ecf1f7 !important;
font-size: 14px !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
height: 48px !important;
padding: 0 !important;
}
/deep/.el-table .el-table__body tr.current-row > td {
background-color: #f2f7fe !important;
}
/deep/.el-table .el-table__body tr:hover > td {
background-color: #f2f7fe !important;
}
/deep/.el-table__row {
}
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
/deep/ .el-table__row {
height: 48px !important;
}
/deep/.el-table__row--level-1 {
}
/deep/ .el-table__row--level-1 {
.el-table__cell {
background-color: #f5f6f7 !important;
}
}
}
/deep/.el-table th > .cell {
/deep/ .el-table th > .cell {
font-family: HarmonyOS_Sans_SC_Medium;
}
}
/deep/.el-table .el-table__cell {
/deep/ .el-table .el-table__cell {
padding: 0 !important;
}
}
/deep/.el-table__body {
/deep/ .el-table__body {
width: 100% !important;
}
}
// el-table 左侧固定 样式统一
/deep/.el-table__fixed {
// el-table 左侧固定 样式统一
/deep/ .el-table__fixed {
height: 100% !important;
&::before {
height: 0;
}
}
/deep/.el-table__fixed-header-wrapper {
}
/deep/ .el-table__fixed-header-wrapper {
height: 48px !important;
.el-table__header {
width: 100% !important;
height: 48px !important;
......@@ -1401,33 +1432,39 @@ export default {
height: 3rem !important;
padding: 0 !important;
}
thead {
font-size: 0.875rem !important;
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c !important;
.cell {
font-weight: normal !important;
}
}
th {
border: none !important;
background-color: #ecf1f7 !important;
}
}
/deep/.hover-row {
}
/deep/ .hover-row {
.el-table__cell {
background-color: #f2f7fe !important;
}
}
}
/deep/.el-table__fixed-right {
/deep/ .el-table__fixed-right {
height: 100% !important;
&::before {
height: 0;
}
}
// 批量操作
.el-tag {
}
// 批量操作
.el-tag {
color: #055fe7 !important;
height: 32px;
box-sizing: border-box !important;
......@@ -1438,70 +1475,79 @@ export default {
margin-bottom: 16px;
display: flex;
align-items: center;
}
/deep/.el-link--inner {
}
/deep/ .el-link--inner {
color: rgb(5, 95, 231);
}
.icon-tanhao1 {
}
.icon-tanhao1 {
display: flex;
justify-content: center;
align-items: center;
}
// 表格高度 -- 展示下面的border
.split-line {
}
// 表格高度 -- 展示下面的border
.split-line {
height: 650px;
border-bottom: 1px solid #eee;
}
}
// 复选框
/deep/.el-checkbox__inner {
// 复选框
/deep/ .el-checkbox__inner {
cursor: pointer;
}
/deep/.el-checkbox__input {
}
/deep/ .el-checkbox__input {
line-height: 16px;
}
.search {
}
.search {
/deep/ .el-input__inner {
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.03);
border-radius: 4px;
border: none;
}
// 输入框选中样式
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
color: #055fe7;
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
}
// :focus-within能非常方便处理获取焦点状态。当元素本身或其后代元素获得焦点时，:focus-within伪类的元素就会有效著作权归作者所有。
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:focus-within {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:focus-within {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
color: #055fe7;
.el-range-input {
color: #055fe7;
}
}
/deep/.el-input.is-active .el-input__inner,
/deep/.el-input__inner:hover {
/deep/ .el-input.is-active .el-input__inner,
/deep/ .el-input__inner:hover {
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.08);
border-color: none;
}
}
/deep/.el-input__inner:hover {
}
/deep/ .el-input__inner:hover {
cursor: text;
}
@import "scss/user";
@import "./scss/dialog_table";
@import "./scss/boxShadow";
}
@import "scss/user";
@import "./scss/dialog_table";
@import "./scss/boxShadow";
</style>
src/views/SystemManage/UserPermission.vue
......@@ -781,4 +781,8 @@ export default {
}
}
@import "scss/userpermission.scss";
.manage-page .line {
height: 2rem !important;
}
</style>
src/views/SystemManage/scss/role.scss
......@@ -4,23 +4,28 @@
color: #666666 !important;
}
}
width: 100%;
padding: 24px;
display: flex;
flex-direction: row;
font-family: HarmonyOS_Sans_SC;
div {
display: inline-block;
}
.is-disabled.is-checked {
.el-checkbox__inner {
background-color: #b1b6c2 !important;
border-color: #b1b6c2 !important;
&::after {
border-color: #fff;
}
}
}
.sider {
//border: #03A9F4 1px solid;
//width: 240px;
......@@ -28,6 +33,7 @@
height: 100%;
//margin-right: 10px;
text-align: center;
.btns {
width: 200px;
height: 45px;
......@@ -35,6 +41,7 @@
flex-direction: row;
padding-top: 10px;
border-bottom: 1px solid #eeeeee;
.add {
width: 110px;
height: 32px;
......@@ -44,15 +51,18 @@
border-radius: 4px;
border: 1px solid #aeb5c2;
cursor: pointer;
&:hover {
border: #055fe7 1px solid;
color: #055fe7;
}
&:active {
border: #055fe7 1px solid;
color: #055fe7;
}
}
.img-btn {
width: 32px;
height: 32px;
......@@ -64,20 +74,24 @@
justify-content: center;
align-items: center;
cursor: pointer;
&:hover {
border-color: #377fec;
}
> img {
margin: 0 !important;
line-height: 32px;
}
}
}
.default-role {
width: 215px;
height: 366px;
display: flex;
flex-direction: column;
.default-role-item {
width: 190px;
height: 40px;
......@@ -89,35 +103,41 @@
border-radius: 4px;
margin-top: 10px;
cursor: pointer;
&:hover {
background: #055fe7;
color: #ffffff;
}
&.active {
background: #055fe7;
color: #ffffff;
}
}
}
.hr {
height: 1px;
width: 200px;
display: block;
background-color: #eeeeee;
}
.diy-roles {
//border: saddlebrown 1px solid;
width: 215px;
height: 420px;
box-sizing: border-box;
padding-left: 20px;
//background: #90ff00ff;
//display: flex;
//flex-direction: column;
overflow: scroll;
.diy-role-item {
float: right;
box-sizing: border-box;
padding-right: 40px;
//padding-right: 40px;
position: relative;
width: 190px;
height: 40px;
......@@ -127,13 +147,16 @@
color: #333333;
line-height: 40px;
margin-top: 10px;
margin-left: -22px;
//margin-right: -16px;
cursor: pointer;
overflow: hidden;
transform: translateX(-6px);
&.active {
border: 1px solid #055fe7;
color: #055fe7;
}
.diy-edit-title {
width: 146px;
padding-left: 10px;
......@@ -145,6 +168,7 @@
/*文字超出宽度则显示ellipsis省略号*/
text-overflow: ellipsis;
}
.diy-edit-btn {
width: 35px;
height: 25px;
......@@ -154,6 +178,7 @@
position: absolute;
right: 0;
top: 0;
i {
position: absolute;
top: 5px;
......@@ -163,6 +188,7 @@
color: #055FE7;
cursor: pointer;
}
.img {
width: 13px;
height: 14px;
......@@ -173,18 +199,21 @@
}
}
}
.main {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
.header {
height: 55px;
width: 100%;
display: flex;
align-items: center;
padding-bottom: 7px;
.btns {
width: 224px;
height: 48px;
......@@ -192,6 +221,7 @@
border-radius: 8px;
text-align: center;
margin: 0px auto;
.btn {
margin-top: 8px;
width: 104px;
......@@ -199,6 +229,7 @@
line-height: 32px;
color: #666666;
cursor: pointer;
&.active {
background: #ffffff;
color: #055fe7;
......@@ -207,6 +238,7 @@
}
}
}
.save {
.btn {
width: 72px;
......@@ -219,6 +251,7 @@
}
}
}
.role-info {
width: 100%;
background: #ffffff;
......@@ -226,111 +259,143 @@
border-radius: 10px;
display: flex;
flex-direction: row;
.menus {
width: 155px;
height: 100%;
border-right: 1px solid #eeeeee;
.div3 {
padding: 20px;
width: 100%;
height: 150px;
border-bottom: 1px solid #eeeeee;
&:first-of-type {
height: 130px;
}
&:nth-of-type(2) {
height: 165px;
height: 160px;
}
.el-checkbox {
margin: 10px 20px 0 20px;
&:not(:first-of-type) {
margin-top: 20px;
margin: 0px 0px 12px 0px;
&:last-of-type {
margin-bottom: 0px;
}
}
}
.div2 {
padding: 20px;
width: 100%;
height: 85px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 12px 20px 0 20px;
margin-bottom: 12px;
}
}
.div1 {
padding: 20px;
width: 100%;
height: 68px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 22px 20px 0 20px;
//margin: 22px 20px 0 20px;
margin-bottom: 12px;
}
}
// 未选中字体颜色
/deep/ .el-checkbox {
font-size: 14px;
color: #333333;
font-weight: 400;
}
/deep/ .el-checkbox__input .el-checkbox__inner:hover {
border-color: #055fe7;
}
// 选中样式
/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
/deep/ .el-checkbox__input.is-checked + .el-checkbox__label {
font-size: 14px;
font-weight: 400;
color: #333333;
}
/deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
.content {
width: 100%;
height: 725px;
.div3 {
padding: 20px;
width: 100%;
height: 150px;
&:first-of-type {
height: 130px;
}
&:nth-of-type(2) {
height: 165px;
height: 160px;
}
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
padding-top: 8px;
//padding-left: 30px;
//padding-top: 8px;
.line {
height: 40px;
height: 32px;
width: 220px;
}
}
.div2 {
padding: 20px;
width: 100%;
height: 85px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
.el-checkbox {
margin: 10px 20px 0 0px;
}
//padding-left: 30px;
//.el-checkbox {
// margin: 10px 20px 0 0px;
//}
.line {
height: 40px;
height: 32px;
width: 220px;
}
}
.div1 {
padding: 20px;
width: 100%;
height: 68px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
//padding-left: 30px;
.line {
height: 40px;
height: 32px;
width: 220px;
> .el-checkbox {
margin-left: 0 !important;
}
}
.el-checkbox {
margin: 22px 20px 0 25px;
}
//.el-checkbox {
// margin: 22px 20px 0 25px;
//}
}
// 未选中字体颜色
......@@ -342,15 +407,18 @@
font-weight: 400;
margin-right: 50px;
}
/deep/ .el-checkbox__input .el-checkbox__inner:hover {
border-color: #055fe7;
}
// 选中样式
/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
/deep/ .el-checkbox__input.is-checked + .el-checkbox__label {
font-size: 14px;
font-weight: 400;
color: #333333;
}
/deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
......@@ -358,15 +426,19 @@
}
}
}
.barLine {
width: 800px !important;
}
.barInLine {
width: 600px !important;
}
.w400 {
width: 400px !important;
}
.w450 {
width: 220px !important;
}
......
src/views/SystemManage/scss/userpermission.scss
......@@ -167,11 +167,12 @@
display: flex;
justify-content: flex-start;
align-items: center;
margin-left: 0px;
//border: 1px solid hotpink; width: auto;
.info-item {
display: flex;
align-items: center;
padding: 0 20px 0 20px;
padding: 0 20px 0 0px;
border-right: 1px solid #e6e6e8;
.info-title {
width: auto;
......@@ -355,6 +356,7 @@
width: 155px;
border-right: 1px solid #eeeeee;
.div3 {
padding: 20px;
width: 100%;
height: 165px;
&:first-of-type {
......@@ -365,26 +367,34 @@
}
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 10px 20px 0 20px;
&:not(:first-of-type) {
margin-top: 20px;
//margin: 10px 20px 0 20px;
//&:not(:first-of-type) {
// margin-top: 20px;
//}
margin: 0px 0px 12px 0px;
&:last-of-type {
margin-bottom: 0px;
}
}
}
.div2 {
padding: 20px;
width: 100%;
height: 85px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 12px 20px 0 20px;
//margin: 12px 20px 0 20px;
margin-bottom: 12px;
}
}
.div1 {
padding: 20px;
width: 100%;
height: 55px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 15px 20px 0 20px;
//margin: 15px 20px 0 20px;
margin-bottom: 12px;
}
}
// 未选中字体颜色
......@@ -410,6 +420,7 @@
.content {
width: 100%;
.div3 {
padding: 20px;
&:last-of-type {
height: 150px;
}
......@@ -420,9 +431,9 @@
width: 100%;
height: 165px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
padding-top: 8px;
.line {
//padding-left: 30px;
//padding-top: 8px;
/deep/.line{
width: 220px;
height: 30px;
}
......@@ -430,10 +441,11 @@
.div2 {
width: 100%;
height: 85px;
padding-left: 30px;
padding: 20px;
//padding-left: 30px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 10px 20px 0 25px;
//margin: 10px 20px 0 25px;
}
.line /deep/ {
width: 220px;
......@@ -444,12 +456,13 @@
}
}
.div1 {
padding: 20px;
width: 100%;
height: 55px;
padding-left: 30px;
//padding-left: 30px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 15px 20px 0 25px;
//margin: 15px 20px 0 25px;
}
.line /deep/ {
width: 220px;
......
src/views/SystemManage/systemLog.vue
......@@ -303,3 +303,12 @@ export default {
}
@import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/bzxxgl/bzxxfh.vue
......@@ -20,10 +20,10 @@
</el-select>
</el-form-item>
<el-form-item label="源条码号：" prop="ytmh" class="ytmh">
<el-input placeholder="请输入源条码号" v-model.trim="ruleForm.ytmh" maxlength="23" clearable @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
<el-input placeholder="请输入源条码号" v-model.trim="ruleForm.ytmh" maxlength="23" clearable show-word-limit @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
</el-form-item>
<el-form-item label="目标条码号：" prop="mbtmh" class="mbtmh">
<el-input placeholder="请输入目标条码号" v-model.trim="ruleForm.mbtmh" maxlength="23" clearable @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
<el-input placeholder="请输入目标条码号" v-model.trim="ruleForm.mbtmh" maxlength="23" clearable show-word-limit @clear="submitForm()" @keydown.enter.native="submitForm()"></el-input>
</el-form-item>
</div>
<div class="line1 line2">
......@@ -91,23 +91,23 @@
<el-table :height="height" ref="multipleTable" :data="tableDate" :row-key="getRowKeys" tooltip-effect="dark" style="width: 100%;" :class="{delSelection: !selectBoo}" class="bzxxfh-table" @selection-change="handleSelectionChange">
<el-table-column type="selection" :reserve-selection="true" :width="width33">
</el-table-column>
<el-table-column prop="ytmh" label="源条码号" :width="width1">
<el-table-column prop="ytmh" label="源条码号" :width="width1" :formatter="$fFormatUtil.valueFormat">
</el-table-column>
<el-table-column prop="mbtmh" label="目标条码号" :width="width1">
<el-table-column prop="mbtmh" label="目标条码号" :width="width1" :formatter="$fFormatUtil.valueFormat">
</el-table-column>
<el-table-column prop="yzw" label="源指位/序号" :width="width4">
<el-table-column prop="yzw" label="源指位/序号" :width="width4" :formatter="$fFormatUtil.valueFormat">
</el-table-column>
<el-table-column prop="mbzw" label="目标指位/序号" :width="width4">
<el-table-column prop="mbzw" label="目标指位/序号" :width="width4" :formatter="$fFormatUtil.valueFormat">
</el-table-column>
<el-table-column prop="bzdwGajgjgdmStr" label="比中单位" :width="width2">
<el-table-column prop="bzdwGajgjgdmStr" label="比中单位" :width="width2" :formatter="$fFormatUtil.valueFormat">
</el-table-column>
<el-table-column prop="bzrXm" label="比中人" :width="width3">
<el-table-column prop="bzrXm" label="比中人" :width="width3" :formatter="$fFormatUtil.valueFormat">
</el-table-column>
<el-table-column prop="bzsj" label="比中时间" :width="width4" :formatter="dateTimeFormat">
<el-table-column prop="bzsj" label="比中时间" :width="width4" :formatter="$fFormatUtil.dateTimeFormat">
</el-table-column>
<el-table-column prop="fhrXm" label="复核人" :width="width3">
<el-table-column prop="fhrXm" label="复核人" :width="width3" :formatter="$fFormatUtil.valueFormat">
</el-table-column>
<el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="dateTimeFormat">
<el-table-column prop="fhsj" label="复核时间" :width="width4" :formatter="$fFormatUtil.dateTimeFormat">
</el-table-column>
<el-table-column prop="reviewStatus" label="复核状态" :width="width5">
<template slot-scope="scope">
......@@ -198,7 +198,6 @@ export default {
personLogicIds: [],
caseLogicIds: []
},
rules: {},
selectBoo: false,// 是否批量操作
width33: 50,
width4: 120,
......@@ -234,7 +233,25 @@ export default {
// 人员逻辑库
personLogicIds: [],
// 案件逻辑库
caseLogicIds: []
caseLogicIds: [],
rules: {
ytmh: [
{required: false, message: '请输入条码号', trigger: 'change'},
{
pattern: fRegExp.SYS._TMH,
message: '格式不正确',
trigger: 'change'
}
],
mbtmh: [
{required: false, message: '请输入条码号', trigger: 'change'},
{
pattern: fRegExp.SYS._TMH,
message: '格式不正确',
trigger: 'change'
}
],
}
}
},
components: {
......@@ -542,11 +559,6 @@ export default {
this.currPage = page;
this.getData(page)
},
// 时间格式化
dateTimeFormat (row, colnum) {
let prop = colnum.property;
return row[prop] ? this.$moment(row[prop]).format("YYYY-MM-DD") : "---";
},
/**
* @description: 单选事件
* @param {*} val
......@@ -643,3 +655,12 @@ export default {
padding-left: 20px;
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/bzxxgl/bzxxsh.vue
......@@ -961,3 +961,12 @@ const initRuleFrom = {
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/bzxxgl/scss/bzxxfh.scss
......@@ -14,13 +14,12 @@ $tableHeight: var(--tableHeight, 33rem);
}
}
.bzxxfh-top {
margin: 24px 24px 16px 24px;
margin: 24px 20px 16px 24px;
//border-bottom: 1px solid #eeeeee;
padding: 16px 20px 10px 20px;
padding: 16px 0px 8px 20px;
background: #F6F8FA;
box-shadow: inset 0px 0px 3px 0px rgba(5, 95, 231, 0.2);
border-radius: 10px;
/deep/.el-form-item__label {
width: 70px !important;
padding: 0;
......@@ -72,11 +71,11 @@ $tableHeight: var(--tableHeight, 33rem);
}
.ytmh {
/deep/ .el-input {
width: 256px;
width: 290px;
height: 32px;
.el-input__inner {
height: 32px;
width: 256px;
width: 290px;
}
}
}
......@@ -89,11 +88,11 @@ $tableHeight: var(--tableHeight, 33rem);
margin-left: 90px !important;
}
/deep/ .el-input {
width: 256px;
width: 290px;
height: 32px;
.el-input__inner {
height: 32px;
width: 256px;
width: 290px;
}
}
}
......@@ -114,6 +113,13 @@ $tableHeight: var(--tableHeight, 33rem);
/deep/.el-form-item__label {
text-align: left;
}
.rdsj{
.el-input__inner {
height: 32px;
width: 290px;
margin-top: 2px;
}
}
}
.line3 {
.fhyh {
......@@ -155,6 +161,7 @@ $tableHeight: var(--tableHeight, 33rem);
}
}
.clear-btn {
transform: translateX(20px);
cursor: pointer;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
......@@ -162,6 +169,7 @@ $tableHeight: var(--tableHeight, 33rem);
margin-right: 8px;
}
.select-btn {
transform: translateX(20px);
cursor: pointer;
width: 72px;
height: 32px;
......@@ -499,6 +507,12 @@ $tableHeight: var(--tableHeight, 33rem);
}
}
}
/deep/.el-form-item__error {
padding-top: 0rem;
margin-top: 0rem;
}
.jcbzgx-dialog {
width: 300px;
height: 118px;
......
src/views/cxyrd/QueryConfirm.vue
......@@ -2407,3 +2407,12 @@ b {
padding-left: 20px;
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/drFPTX/Index.vue
......@@ -1961,3 +1961,12 @@ export default {
// @import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/drFPTX/RAList.vue
......@@ -2440,4 +2440,13 @@ export default {
}
// @import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/xtfkgl/AjXtljfkView.vue
......@@ -186,7 +186,7 @@ export default {
width4: 136, //启用状态
width5: 260, //逻辑库说明
width6: 120, // 操作
height: '42rem',
height: '43rem',
tableDate: [],
......@@ -569,3 +569,12 @@ export default {
@import "scss/xtfkgl_main";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/xtfkgl/RyXtljfkView.vue
......@@ -191,7 +191,7 @@ export default {
width4: 136, //启用状态
width5: 260, //逻辑库说明
width6: 120, // 操作
height: '42rem',
height: '43rem',
tableDate: [],
......@@ -574,3 +574,12 @@ export default {
@import "scss/xtfkgl_main";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/zljc/Index.vue
......@@ -160,6 +160,7 @@
prop="barcode"
label="人员编号"
:width="width1"
:formatter="$fFormatUtil.valueFormat"
show-overflow-tooltip
>
</el-table-column>
......@@ -167,12 +168,14 @@
prop="name"
label="姓名"
:width="width4"
:formatter="$fFormatUtil.valueFormat"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="codeDwName"
label="捺印单位"
:formatter="$fFormatUtil.valueFormat"
:width="width1"
show-overflow-tooltip
>
......@@ -180,12 +183,14 @@
<el-table-column
prop="collectDate"
label="捺印日期"
:width="width1"
:formatter="$fFormatUtil.dateTimeFormat"
:width="width4"
>
</el-table-column>
<el-table-column
prop="createTime"
label="分配时间"
:formatter="$fFormatUtil.dateTimeFormat1"
:width="width1"
>
</el-table-column>
......@@ -222,6 +227,7 @@
<el-table-column
prop="collectNumber"
label="补采次数"
:formatter="$fFormatUtil.valueFormat0"
:width="width4"
>
</el-table-column>
......@@ -341,7 +347,7 @@ export default {
selectBoo: false, // 是否批量操作
multipleSelection: [], // 表单选择项目
width33: 50,
width4: 120,
width4: 140,
width1: 220,
width2: 160,
width3: 110,
......@@ -963,3 +969,12 @@ $tableHeight: var(--tableHeight, 33rem);
}
@import "@/assets/css/globalBase.scss";
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/zljc/jcxq.vue
......@@ -458,7 +458,7 @@ export default {
};
</script>
<style lang="scss"scoped>
<style scoped lang="scss">
.p1 {
padding-top: 109px;
}
......@@ -499,21 +499,21 @@ export default {
border: none;
}
/deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
width: 129px;
width: 130px;
height: 32px;
background: #ddebff;
border-radius: 2px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
background-color: #055fe7;
color: #fff;
background-color: #DDEBFF;
color: #055FE7;
border: none;
&:hover {
background: #377fec;
}
&:active {
background: #044cb9;
/*background: #377fec;*/
}
/*&:active {*/
/* background: #044cb9;*/
/*}*/
}
}
.headRight {
......
src/views/zzwlr/htcj.vue
......@@ -539,3 +539,12 @@
color: #333333;
}
</style>
<style scoped lang="scss">
/deep/ .el-table .el-table__body tr.current-row > td {
background-color: transparent !important;
}
/deep/ .el-table .el-table__body tr:hover > td {
background-color: transparent !important;
}
</style>
src/views/zzwlr/xzry.scss
......@@ -164,6 +164,7 @@
/deep/.flexBox {
display: flex;
margin: 0px 18px;
.el-checkbox {
margin-right: 24px;
......
src/views/zzwlr/xzry.vue
......@@ -149,7 +149,7 @@
<div>人员逻辑分库</div>
</el-row>
<el-row class="flexBox">
<div style="margin: 0.9375rem 0"></div>
<div style="margin: 0.9375rem 0;"></div>
<el-checkbox-group v-model="checkedTargets" style="padding-right: 6.875rem">
<el-checkbox v-for="(value, key) in targets" :key="key" :label="value.code">{{ value.name }}</el-checkbox>
</el-checkbox-group>
......
vue.config.js
......@@ -113,13 +113,13 @@ module.exports = {
// target: "http://192.168.128.108:8099/", // 张 认定
// target: "http://192.168.128.101:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.111:8099", // 湖南-张呈光
// target: "http://192.168.128.111:8099", // 湖南-张呈光
// 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://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.102:8099", // 江
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.103:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -129,9 +129,9 @@ module.exports = {
"/security": {
// target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.111:8765/", // 张 认定
// target: "http://192.168.128.111:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://zwpt.xzclub.top:9333/",
target: "http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.109:8765",
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