Commit f1c227b7 by 张超军

合并

parents 8526f62e 3fe80b73
This source diff could not be displayed because it is too large. You can view the blob instead.
<template>
<div>
<transition name="fade">
<div @touchend="end" @touchstart="start" @touchmove="move" class="swiper">
<div
@click="chooseItem(item, index)"
v-for="(item, index) in imgs"
:style="config5[index]"
:key="item.cover"
>
<img :src="item.cover" style="width: 100%; height: 100%" />
</div>
</div>
</transition>
<h1 @click="prev">上一个</h1>
<h1 @click="next">下一个</h1>
<h1>当前:{{ centerInfo.id }}</h1>
<h1
@click="chooseItem(item, index)"
v-for="(item, index) in imgs"
:key="item.cover"
class="swperNum"
>
{{ index }}
</h1>
</div>
</template>
<script>
export default {
name: "zt",
data() {
return {
loading: true,
currentIndex: 3, //当前中间imgs数组中index
centerInfo: "", // 当前中间信息
startX: "",
endX: "",
imgs: [
{
id: "莱因哈特1",
index: 0,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "安娜2",
index: 1,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "卢西奥3",
index: 2,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "DVA4",
index: 3,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "莫伊拉5",
index: 4,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "裂空6",
index: 5,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "麦克雷7",
index: 6,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "士兵76 8",
index: 7,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "狂鼠9",
index: 8,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "死神 10",
index: 9,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "禅雅塔 11",
index: 10,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
{
id: "黑百合 12",
index: 11,
cover:
"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2F945cad7c7105d352aa3c513c94846bb0c2f1a61342067-OWFZcE_fw658&refer=http%3A%2F%2Fhbimg.b0.upaiyun.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1639222834&t=e54dd111b99d115d33f09f237530dcbf",
},
],
previous: 0,
config5: [
{
id: "-A",
position: "absolute",
width: "22%",
height: "72%",
top: "19.2%",
left: "20%",
opacity: 0,
zIndex: 0,
transition: ".4s",
},
{
id: "A",
position: "absolute",
width: "22%",
height: "72%",
top: "19.2%",
left: "17%",
opacity: 1,
zIndex: 1,
transition: ".4s",
},
{
id: "B",
position: "absolute",
width: "28%",
height: "82%",
top: "14%",
left: "22%",
opacity: 1,
zIndex: 2,
transition: ".4s",
},
{
id: "center",
position: "absolute",
width: "45%",
height: "100%",
top: "0px",
left: "50%",
marginLeft: "-22.5%",
opacity: 1,
zIndex: 4,
transition: ".4s",
},
{
id: "D",
position: "absolute",
width: "28%",
height: "82%",
top: "14%",
left: "50%",
opacity: 1,
zIndex: 2,
transition: ".4s",
},
{
id: "E",
position: "absolute",
width: "22%",
height: "72%",
top: "19.2%",
left: "60%",
opacity: 1,
zIndex: 1,
transition: ".4s",
},
{
id: "E+",
position: "absolute",
width: "22%",
height: "72%",
top: "19.2%",
left: "60%",
opacity: 0,
zIndex: 0,
transition: ".4s",
},
],
};
},
methods: {
// 获取数据
async getData() {
this.$nextTick(() => {
this.loading = false;
});
},
bianhua(num) {
this.currentIndex = num - 1;
if (this.currentIndex > this.imgs.length - 1) {
this.currentIndex = 0;
}
this.centerCard();
this.centerIndex("next");
},
// 滑动上一个
prev(index) {
// this.imgs.unshift(this.imgs.pop());
this.config5.push(this.config5.shift());
this.currentIndex = this.currentIndex - 1;
if (this.currentIndex < 0) {
this.currentIndex = this.imgs.length - 1;
}
this.centerCard();
this.centerIndex("prev");
},
// 滑动下一个
next() {
// this.imgs.push(this.imgs.shift());
this.config5.unshift(this.config5.pop());
this.currentIndex = this.currentIndex + 1;
if (this.currentIndex > this.imgs.length - 1) {
this.currentIndex = 0;
}
this.centerCard();
this.centerIndex("next");
// console.log(this.currentIndex);
},
// 开始移动端滑动屏幕
start(event) {
this.startX = event.changedTouches[0].clientX;
this.startY = event.changedTouches[0].clientY;
},
// 连续滑动
move(event) {
this.endY = event.changedTouches[0].clientY;
this.endX = event.changedTouches[0].clientX;
this.stopDefault(event);
// 如果是滑动,注解(223行到231行)这段。如果是连续滑动,放开(223行到231行)注解
this.interval = this.endX - this.startX;
if (this.interval > 40) {
this.startX = this.endX;
this.prev();
}
if (this.interval < -40) {
this.startX = this.endX;
this.next();
}
},
// 滑动
end(event) {
// 如果是滑动,放开(236行到238行)的注解。如果是连续滑动,注解(236行到238行)
// this.endY = event.changedTouches[0].clientY;
// this.endX = event.changedTouches[0].clientX;
// this.formatSwiper();
},
formatSwiper() {
if (this.startX > this.endX) {
console.log("左边滑动");
if (this.startX > this.endX + 40) {
this.next();
}
} else {
console.log("右边滑动");
if (this.endX > this.startX + 40) {
this.prev();
}
}
},
// 阻止touchmove的横向默认事件(ios快捷操作会关闭页面)
stopDefault(event) {
let differenceY = this.endY - this.startY;
let differenceX = this.endX - this.startX;
if (Math.abs(differenceX) > Math.abs(differenceY)) {
event.preventDefault();
}
},
// 当前imgs在位置上的index(并非img数组的index)
centerIndex(val) {
if (val == "prev") {
for (let val of this.imgs) {
if (val.index == this.imgs.length - 1) {
val.index = 0;
} else {
val.index = val.index + 1;
}
}
} else {
for (let val of this.imgs) {
if (val.index == 0) {
val.index = this.imgs.length - 1;
} else {
val.index = val.index - 1;
}
}
}
},
// 点击
chooseItem(item, index) {
let cycles = item.index;
if (item.index < 3) {
for (let i = 0; i < 3 - cycles; i++) {
console.log(item.index);
this.prev();
}
} else if (item.index > 3) {
for (let i = -1; i < item.index - 3; i++) {
this.next();
}
} else if (item.index == 3) {
console.log("投票");
}
},
// 计算中间卡片信息
centerCard() {
this.centerInfo = this.imgs[this.currentIndex];
this.$emit("centerInfo", this.centerInfo);
},
addCardStyle() {
if (this.imgs.length > 7) {
let addtime = this.imgs.length - 7;
for (let i = 0; i < addtime; i++) {
console.log("add");
this.config5.push({
id: "center",
position: "absolute",
width: "45%",
height: "100%",
top: "0px",
left: "50%",
marginLeft: "-22.5%",
opacity: 0,
transition: ".1s",
});
}
}
},
},
created() {
this.getData();
this.centerCard(); // 获取中间卡片信息
this.addCardStyle(); // 加入样式位置的index
},
};
</script>
<style lang="scss" scoped>
.swiper {
width: 100%;
border: 1px red solid;
height: 400px;
position: relative;
overflow: hidden;
div {
opacity: 0;
}
}
</style>
\ No newline at end of file
......@@ -223,6 +223,9 @@
placeholder="请选择提取时间"
v-model="ruleForm.tqsj"
style="width: 100%;"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker>
</el-form-item>
</el-col>
......@@ -358,6 +361,13 @@ export default {
}
},
methods: {
disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
submitForm (formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
......
......@@ -6,7 +6,7 @@
top="1.25rem"
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:close-on-click-modal="false"
>
<el-form
:label-position="labelPosition"
......@@ -24,10 +24,7 @@
<!-- 二 -->
<el-row>
<el-col :span="12">
<el-form-item
label="人员编号:"
prop="ysxtAsjxgrybh"
>
<el-form-item label="人员编号:" prop="ysxtAsjxgrybh">
<el-input
v-model.trim="ruleForm.ysxtAsjxgrybh"
placeholder="请输入人员编号"
......@@ -38,10 +35,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="警综人员编号:"
prop="jzrybh"
>
<el-form-item label="警综人员编号:" prop="jzrybh">
<el-input
v-model.trim="ruleForm.jzrybh"
placeholder="请输入警综人员编号"
......@@ -55,10 +49,7 @@
<!-- 三 -->
<el-row>
<el-col :span="12">
<el-form-item
label="案事件相关人员编号:"
prop="asjxgrybh"
>
<el-form-item label="案事件相关人员编号:" prop="asjxgrybh">
<el-input
v-model.trim="ruleForm.asjxgrybh"
placeholder="请输入案事件相关人员编号"
......@@ -69,10 +60,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="指掌纹卡编号:"
prop="zzhwkbh"
>
<el-form-item label="指掌纹卡编号:" prop="zzhwkbh">
<el-input
v-model.trim="ruleForm.zzhwkbh"
placeholder="请输入指掌纹卡编号"
......@@ -86,27 +74,17 @@
<!-- 四 -->
<el-row>
<el-col :span="12">
<el-form-item
label="采集信息原因:"
prop="cjxxyydm"
>
<el-form-item label="采集信息原因:" prop="cjxxyydm">
<el-select
v-model="ruleForm.cjxxyydm"
placeholder="根据代码自动匹配"
>
<el-option
label="1"
value="1"
></el-option>
<el-option
label="2"
value="2"
></el-option>
<el-option label="1" value="1"></el-option>
<el-option label="2" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col>
<el-col :span="12"> </el-col>
</el-row>
<el-divider></el-divider>
<!-- 五 -->
......@@ -117,10 +95,7 @@
<!-- 六 -->
<el-row>
<el-col :span="12">
<el-form-item
label="姓名:"
prop="xm"
>
<el-form-item label="姓名:" prop="xm">
<el-input
v-model.trim="ruleForm.xm"
placeholder="请输入姓名"
......@@ -145,35 +120,23 @@
<!-- 七 -->
<el-row>
<el-col :span="12">
<el-form-item
label="性别:"
prop="xbdm"
>
<el-select
v-model="ruleForm.xbdm"
placeholder="请选择性别"
>
<el-option
label="男"
value="1"
></el-option>
<el-option
label="女"
value="0"
></el-option>
<el-form-item label="性别:" prop="xbdm">
<el-select v-model="ruleForm.xbdm" placeholder="请选择性别">
<el-option label="男" value="1"></el-option>
<el-option label="女" value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="出生日期:"
prop="csrq"
>
<el-form-item label="出生日期:" prop="csrq">
<el-date-picker
type="date"
placeholder="请选择出生日期"
v-model="ruleForm.csrq"
style="width: 100%;"
style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker>
</el-form-item>
</el-col>
......@@ -181,42 +144,18 @@
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item
label="国籍:"
prop="gjdm"
>
<el-select
v-model="ruleForm.gjdm"
placeholder="请选择国籍"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
<el-form-item label="国籍:" prop="gjdm">
<el-select v-model="ruleForm.gjdm" placeholder="请选择国籍">
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="民族:"
prop="mzdm"
>
<el-select
v-model="ruleForm.mzdm"
placeholder="请选择民族"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
<el-form-item label="民族:" prop="mzdm">
<el-select v-model="ruleForm.mzdm" placeholder="请选择民族">
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -224,30 +163,15 @@
<!-- 九 -->
<el-row>
<el-col :span="12">
<el-form-item
label="证件类型:"
prop="cyzjdm"
>
<el-select
v-model="ruleForm.cyzjdm"
placeholder="请选择证件类型"
>
<el-option
label="户口"
value="1"
></el-option>
<el-option
label="身份证"
value="2"
></el-option>
<el-form-item label="证件类型:" prop="cyzjdm">
<el-select v-model="ruleForm.cyzjdm" placeholder="请选择证件类型">
<el-option label="户口" value="1"></el-option>
<el-option label="身份证" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="证件号码:"
prop="zjhm"
>
<el-form-item label="证件号码:" prop="zjhm">
<el-input
v-model.trim="ruleForm.zjhm"
placeholder="请输入证件号码"
......@@ -260,30 +184,18 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
label="户籍地行政区:"
prop="hjdzXzqhdm"
>
<el-form-item label="户籍地行政区:" prop="hjdzXzqhdm">
<el-select
v-model="ruleForm.hjdzXzqhdm"
placeholder="请选择户籍地行政区"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="户籍地址:"
prop="hjdzDzmc"
>
<el-form-item label="户籍地址:" prop="hjdzDzmc">
<el-input
v-model="ruleForm.hjdzDzmc"
placeholder="请输入户籍地址"
......@@ -296,30 +208,18 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
label="现住址行政区:"
prop="xzzXzqhdm"
>
<el-form-item label="现住址行政区:" prop="xzzXzqhdm">
<el-select
v-model="ruleForm.xzzXzqhdm"
placeholder="请选择现住址行政区"
>
<el-option
label="区域一"
value="1"
></el-option>
<el-option
label="区域二"
value="2"
></el-option>
<el-option label="区域一" value="1"></el-option>
<el-option label="区域二" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="现住址:"
prop="xzzDzmc"
>
<el-form-item label="现住址:" prop="xzzDzmc">
<el-input
v-model.trim="ruleForm.xzzDzmc"
placeholder="请输入现住址"
......@@ -357,17 +257,16 @@
:indeterminate="isIndeterminate"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox>
<div style="margin: 15px 0;"></div>
>全选</el-checkbox
>
<div style="margin: 15px 0"></div>
<el-checkbox-group
v-model="checkedTargets"
@change="handleCheckedTargetsChange"
>
<el-checkbox
v-for="city in targets"
:label="city"
:key="city"
>{{city}}</el-checkbox>
<el-checkbox v-for="city in targets" :label="city" :key="city">{{
city
}}</el-checkbox>
</el-checkbox-group>
</el-row>
<el-divider></el-divider>
......@@ -379,10 +278,7 @@
<!-- 七 -->
<el-row>
<el-col :span="12">
<el-form-item
label="捺印单位:"
prop="nydwGajgmc"
>
<el-form-item label="捺印单位:" prop="nydwGajgmc">
<el-input
v-model="ruleForm.nydwGajgmc"
placeholder="请输入捺印单位名称"
......@@ -394,10 +290,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="捺印人姓名:"
prop="nyryXm"
>
<el-form-item label="捺印人姓名:" prop="nyryXm">
<el-input
v-model="ruleForm.nyryXm"
placeholder="请输入捺印人姓名"
......@@ -411,23 +304,20 @@
<!-- 八 -->
<el-row>
<el-col :span="12">
<el-form-item
label="捺印时间:"
prop="nysj"
>
<el-form-item label="捺印时间:" prop="nysj">
<el-date-picker
type="datetime"
placeholder="请输入捺印时间"
v-model="ruleForm.nysj"
style="width: 100%;"
style="width: 100%"
:picker-options="{
disabledDate: disabledDate,
}"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="捺印人身份证号:"
prop="nyryGmsfhm"
>
<el-form-item label="捺印人身份证号:" prop="nyryGmsfhm">
<el-input
v-model="ruleForm.nyryGmsfhm"
placeholder="请输入捺印人身份证号"
......@@ -441,15 +331,10 @@
<!-- 九 -->
<el-row>
<el-col :span="12">
<el-form-item>
</el-form-item>
<el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="捺印人联系电话:"
prop="nyryLxdh"
>
<el-form-item label="捺印人联系电话:" prop="nyryLxdh">
<el-input
v-model="ruleForm.nyryLxdh"
placeholder="请输入捺印人联系电话"
......@@ -460,164 +345,171 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider></el-divider>
<!-- 十 -->
<span
slot="footer"
class="dialog-footer"
>
<span slot="footer" class="dialog-footer">
<el-button @click="submitForm('ruleForm')">提交并新增指掌纹</el-button>
<el-button
@click="resetForm('ruleForm')"
type="primary"
>取 消</el-button>
<el-button @click="resetForm('ruleForm')" type="primary">取 消</el-button>
</span>
</el-dialog>
</template>
<script>
const targetOptions = ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库'];
const targetOptions = [
"本地案件库",
"比中案件库",
"已破案件库",
"重大案件库",
"B类案件库",
"C类案件库",
"勘查案件库",
"协查案件库",
];
export default {
name: "xzry",
props: {
isShowXzry: {
type: [Number, String, Boolean],
default: false
}
default: false,
},
},
data () {
data() {
return {
dialogVisible: false, // 弹窗状态
labelPosition: 'left',// 数据项对齐方式
labelPosition: "left", // 数据项对齐方式
checkAll: false, // 目标逻辑库
checkedTargets: [], // 选定的目标逻辑库
checkedTargets: [], // 选定的目标逻辑库
targets: targetOptions, // 目标逻辑库
isIndeterminate: false, // 目标逻辑库不确定状态
isIndeterminate: false, // 目标逻辑库不确定状态
ruleForm: {
ysxtAsjxgrybh: '', // 人员编号
jzrybh: '', // 警综人员编号
asjxgrybh: '', // 案事件相关人员编号号
zzhwkbh: '', // 现场掌指纹卡编号
cjxxyydm: '', // 采集信息原因
ysxtAsjxgrybh: "", // 人员编号
jzrybh: "", // 警综人员编号
asjxgrybh: "", // 案事件相关人员编号号
zzhwkbh: "", // 现场掌指纹卡编号
cjxxyydm: "", // 采集信息原因
xm: '',// 姓名
bmch: '',// 别名
xbdm: '',// 性别
csrq: '', // 出生日期
gjdm: '', // 国籍
mzdm: '', // 民族
cyzjdm: '', // 证件类型
zjhm: '', // 证件号码
hjdzXzqhdm: '',// 户籍地行政区
hjdzDzmc: '',// 户籍地址
xzzXzqhdm: '',// 现住址行政区
xzzDzmc: '',// 现住址
bz: "",// 备注
xm: "", // 姓名
bmch: "", // 别名
xbdm: "", // 性别
csrq: "", // 出生日期
gjdm: "", // 国籍
mzdm: "", // 民族
cyzjdm: "", // 证件类型
zjhm: "", // 证件号码
hjdzXzqhdm: "", // 户籍地行政区
hjdzDzmc: "", // 户籍地址
xzzXzqhdm: "", // 现住址行政区
xzzDzmc: "", // 现住址
bz: "", // 备注
nydwGajgmc: '',// 捺印单位
nyryXm: '',// 捺印人姓名
nysj: '',// 捺印时间
nyryGmsfhm: '',// 捺印人身份证号
nyryLxdh: '',// 捺印人电话
nydwGajgmc: "", // 捺印单位
nyryXm: "", // 捺印人姓名
nysj: "", // 捺印时间
nyryGmsfhm: "", // 捺印人身份证号
nyryLxdh: "", // 捺印人电话
ifidcard: "是",// 是否采集二代身份证
zwbdxtlxms: '1', // 指纹比对描述
nydwGajgjgdm: '1',// 捺印单位代码
ifidcard: "是", // 是否采集二代身份证
zwbdxtlxms: "1", // 指纹比对描述
nydwGajgjgdm: "1", // 捺印单位代码
},
rules: {
ysxtAsjxgrybh: [
{ required: true, message: '请输入人员条码号', trigger: 'blur' },
{ required: true, message: "请输入人员条码号", trigger: "blur" },
],
jzrybh: [
{ required: true, message: '请输入警综人员编号', trigger: 'blur' },
{ required: true, message: "请输入警综人员编号", trigger: "blur" },
],
asjxgrybh: [
{ required: true, message: '请输入案事件人员号', trigger: 'blur' },
{ required: true, message: "请输入案事件人员号", trigger: "blur" },
],
zzhwkbh: [
{ required: true, message: '请输入掌指纹卡编号', trigger: 'blur' },
{ required: true, message: "请输入掌指纹卡编号", trigger: "blur" },
],
cjxxyydm: [
{ required: true, message: '请选择采集信息原因', trigger: 'blur' },
{ required: true, message: "请选择采集信息原因", trigger: "blur" },
],
xm: [
{ required: true, message: '请输入姓名', trigger: 'blur' },
],
xbdm: [
{ required: true, message: '请选择性别', trigger: 'blur' },
],
xm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
xbdm: [{ required: true, message: "请选择性别", trigger: "blur" }],
csrq: [
{ type: 'date', required: true, message: '请选择出生日期', trigger: 'change' }
],
gjdm: [
{ required: true, message: '请选择国籍', trigger: 'blur' },
],
mzdm: [
{ required: true, message: '请选择民族', trigger: 'blur' },
{
type: "date",
required: true,
message: "请选择出生日期",
trigger: "change",
},
],
gjdm: [{ required: true, message: "请选择国籍", trigger: "blur" }],
mzdm: [{ required: true, message: "请选择民族", trigger: "blur" }],
cyzjdm: [
{ required: true, message: '请选择证件类型', trigger: 'blur' },
],
zjhm: [
{ required: true, message: '请输入证件号码', trigger: 'blur' },
{ required: true, message: "请选择证件类型", trigger: "blur" },
],
zjhm: [{ required: true, message: "请输入证件号码", trigger: "blur" }],
hjdzXzqhdm: [
{ required: true, message: '请选择户籍地行政区', trigger: 'blur' },
{ required: true, message: "请选择户籍地行政区", trigger: "blur" },
],
hjdzDzmc: [
{ required: true, message: '请输入户籍地址', trigger: 'blur' },
{ required: true, message: "请输入户籍地址", trigger: "blur" },
],
xzzXzqhdm: [
{ required: true, message: '请选现住地行政区', trigger: 'blur' },
{ required: true, message: "请选现住地行政区", trigger: "blur" },
],
xzzDzmc: [
{ required: true, message: '请输入现住地址', trigger: 'blur' },
{ required: true, message: "请输入现住地址", trigger: "blur" },
],
nydwGajgmc: [
{ required: true, message: '请输入捺印单位', trigger: 'blur' },
{ required: true, message: "请输入捺印单位", trigger: "blur" },
],
nyryXm: [
{ required: true, message: '请输入捺印人员姓名', trigger: 'change' }
{ required: true, message: "请输入捺印人员姓名", trigger: "change" },
],
nysj: [
{ type: 'date', required: true, message: '请选择捺印时间', trigger: 'change' }
{
type: "date",
required: true,
message: "请选择捺印时间",
trigger: "change",
},
],
nyryGmsfhm: [
{ required: true, message: '请输入捺印人身份证号', trigger: 'blur' },
{ required: true, message: "请输入捺印人身份证号", trigger: "blur" },
],
nyryLxdh: [
{ required: true, message: '请输入捺印人联系电话', trigger: 'blur' }
{ required: true, message: "请输入捺印人联系电话", trigger: "blur" },
],
}
},
};
},
mounted () {
mounted() {
this.dialogVisible = this.isShowXzry;
},
watch: {
isShowXzry (newVal, oldVal) {
isShowXzry(newVal, oldVal) {
this.dialogVisible = newVal;
},
dialogVisible (val) {
this.$emit('closeXzry', this.dialogVisible);
}
dialogVisible(val) {
this.$emit("closeXzry", this.dialogVisible);
},
},
methods: {
submitForm (formName) {
disabledDate(a) {
if (a.getTime() > new Date().getTime()) {
return true;
} else {
return false;
}
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let reqParam = {
personDo: ""
}
reqParam.personDo = this.ruleForm
personDo: "",
};
reqParam.personDo = this.ruleForm;
this.$axios
.post("/api/personstore/personadd", reqParam)
.then(response => {
.then((response) => {
if (response.data.code === 0) {
this.$message.success("新增成功");
this.dialogVisible = false;
......@@ -630,24 +522,25 @@ export default {
}
});
},
resetForm (formName) {
resetForm(formName) {
this.$refs[formName].resetFields();
this.dialogVisible = false
this.dialogVisible = false;
},
handleClose (done) {
handleClose(done) {
this.dialogVisible = false;
this.$refs[formName].resetFields();
},
handleCheckAllChange (val) {
handleCheckAllChange(val) {
this.checkedTargets = val ? targetOptions : [];
this.isIndeterminate = false;
},
handleCheckedTargetsChange (value) {
handleCheckedTargetsChange(value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.targets.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.targets.length;
}
}
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.targets.length;
},
},
};
</script>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -48,7 +48,6 @@
</div>
<div class="operation">
<div class="btn1" @click="batch">批量操作</div>
<div @click="addgroup" class="clear-btn">addgroup</div>
<div class="btns">
<div class="btn1" @click="delMore()">删除</div>
<div class="add" @click="open">
......@@ -87,10 +86,10 @@
>
<el-table-column type="selection" height width="auto" v-if="isSelected">
</el-table-column>
<el-table-column prop="groupname" label="用户组" :width="width1">
<el-table-column prop="name" label="用户组" :width="width1">
</el-table-column>
<el-table-column
prop="rolename"
prop="roleNames"
label="组角色"
:width="width2"
show-overflow-tooltip
......@@ -98,8 +97,8 @@
<template slot-scope="scope">
<div
class="tags"
v-for="item in scope.row.rolename &&
scope.row.rolename.split(',')"
v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')"
>
{{ item }}
</div>
......@@ -112,14 +111,14 @@
</div>
</template>
</el-table-column>
<el-table-column prop="username" label="组成员" :width="width3">
<el-table-column prop="userCount" label="组成员" :width="width3">
<template slot-scope="scope">
<div class="group-item">
<svg-icon
style="width: 1rem;height: .8125rem;margin-bottom: -0.0625rem;"
icon-class="group-item"
/>
{{ scope.row.username.split(",").length }}
{{ scope.row.userCount }}
</div>
<!-- <div class="set-btn">-->
<!-- 用户设置-->
......@@ -135,12 +134,12 @@
</el-table-column>
<el-table-column prop="status" label="启用状态" :width="width3">
<template slot-scope="scope">
<div v-if="scope.row.status === '0'" class="circle-red"></div>
<div v-if="scope.row.status === '1'" class="circle-blue"></div>
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
{{
scope.row.status === "0"
scope.row.status === 0
? "停用"
: scope.row.status === "1"
: scope.row.status === 1
? "启用"
: "无状态"
}}
......@@ -204,18 +203,18 @@
:rules="addrules"
ref="addFormParams"
>
<el-form-item class="info-item" label="组名称:" prop="groupname">
<el-form-item class="info-item" label="组名称:" prop="name">
<el-input
placeholder="请输入用户名"
class="input-info"
v-model="addFormParams.groupname"
v-model="addFormParams.name"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="组描述:">
<el-input
placeholder="请输入组描述"
class="input-info"
v-model="addFormParams.groupdesc"
v-model="addFormParams.describe"
></el-input>
</el-form-item>
......@@ -235,8 +234,8 @@
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="radio-info" v-model="addFormParams.status">
<el-radio :label="'1'">启用</el-radio>
<el-radio :label="'0'">停用</el-radio>
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="addbtns">
......@@ -272,18 +271,18 @@
:rules="addrules"
ref="editFormParams"
>
<el-form-item class="info-item" label="组名称:" prop="groupname">
<el-form-item class="info-item" label="组名称:" prop="name">
<el-input
placeholder="请输入用户名"
class="input-info"
v-model="editFormParams.groupname"
v-model="editFormParams.name"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="组描述:">
<el-input
placeholder="请输入组描述"
class="input-info"
v-model="editFormParams.groupdesc"
v-model="editFormParams.describe"
></el-input>
</el-form-item>
......@@ -303,8 +302,8 @@
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="radio-info" v-model="editFormParams.status">
<el-radio :label="'1'">启用</el-radio>
<el-radio :label="'0'">停用</el-radio>
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="addbtns">
......@@ -539,27 +538,24 @@ export default {
// usergroup.append('total', "每页显示的数据条数");//必填
},
tableData: [],
addFormParams: {
groupname: "", // 组名称
groupdesc: "", // 用户组描述
name: "", // 组名称
describe: "", // 用户组描述
userId: "", // 加入组用户
username: "",
roleId: "", // 加入组角色
rolename: "",
status: "1" // 0 未激活 1 已激活
status: 1 // 0 未激活 1 已激活
},
editFormParams: {
id: "",
groupname: "", // 组名称
groupdesc: "", // 用户组描述
name: "", // 组名称
describe: "", // 用户组描述
userId: "", // 加入组用户
username: "",
roleId: "", // 加入组角色
rolename: "",
status: "1" // 0 未激活 1 已激活
status: 1 // 0 未激活 1 已激活
},
addrules: {
groupname: [
name: [
{ validator: validateGroupname, trigger: "blur", required: true }
], //组名称
userId: [
......@@ -594,18 +590,6 @@ export default {
}
},
methods: {
addgroup() {
var group = {
userId: 39898889,
status: -17476821,
describe: "sit laborum Excepteur officia",
name: "ullamco esse",
roleId: -70041648
};
this.$axios.post("/system/user-groups", group).then(res => {
console.info(res);
});
},
clear() {
this.searchParams.page.page = 1; //必填
this.searchParams.page.total = 20; //必填
......@@ -694,13 +678,11 @@ export default {
open() {
this.isShowAddUserDialog = true;
this.isShowAddUserDialogBg = true;
this.addFormParams.groupname = "";
this.addFormParams.groupdesc = "";
this.addFormParams.name = "";
this.addFormParams.describe = "";
this.addFormParams.userId = "";
this.addFormParams.username = "";
this.addFormParams.status = "1";
this.addFormParams.status = 1;
this.addFormParams.roleId = "";
this.addFormParams.rolename = "";
},
// 关闭新增弹窗
canceladd() {
......@@ -762,25 +744,16 @@ export default {
this.$refs.addFormParams.validate(valid => {
console.info(valid);
if (valid) {
var usergroup = new URLSearchParams();
usergroup.append("groupname", this.addFormParams.groupname);
usergroup.append("groupdesc", this.addFormParams.groupdesc);
usergroup.append("userId", this.addFormParams.userId);
usergroup.append("username", this.addFormParams.username);
usergroup.append("roleId", this.addFormParams.roleId); // roleId(多个角色id之间用逗号隔开),
usergroup.append("rolename", this.addFormParams.rolename); // roleId(多个角色id之间用逗号隔开),
usergroup.append("status", this.addFormParams.status); // status(激活状态:0未激活;1已激活)
this.$axios
.post("/login/usergroup/saveusergroup", usergroup)
.post("/system/user-groups", this.addFormParams)
.then(res => {
if (res.data.message === "用户组名已存在,请修改用户组名!") {
this.$message.error(res.data.message);
} else {
this.search();
this.isShowAddUserDialog = false;
console.info(res);
if (res.data === "成功") {
this.isShowAddUserDialogBg = false;
this.$message.success(res.data.message);
this.isShowAddUserDialog = false;
this.$message.success(res.data);
}
this.search();
})
.catch(failResponse => {});
} else {
......@@ -853,27 +826,11 @@ export default {
},
// 搜索
search() {
console.info("用户组筛选条件=====>", this.searchParams);
var usergroup = new URLSearchParams();
usergroup.append("page", this.searchParams.page.page); //必填
usergroup.append("total", this.searchParams.page.total); //必填
usergroup.append("groupname", this.searchParams.groupname);
usergroup.append("username", this.searchParams.username);
usergroup.append("truename", this.searchParams.truename);
usergroup.append("unitcode", this.searchParams.unitcode);
usergroup.append("rolename", this.searchParams.rolename);
// todo 多条件筛选
this.$axios
.post("/login/usergroup/queryUserGroupList", usergroup)
.then(res => {
console.log(res.data);
this.tableData = res.data.data;
this.searchParams.page.total = res.data.total;
this.searchParams.page.page = res.data.page;
this.searchParams.page.count = res.data.count;
this.$message.success(res.message);
})
.catch(failResponse => {});
console.info("搜索用户列表");
this.$axios.get("/system/user-groups").then(res => {
console.info(res);
this.tableData = res.data;
});
}
},
mounted() {
......
......@@ -83,32 +83,28 @@
:width="userWidths.width1"
>
</el-table-column>
<el-table-column
prop="truename"
label="姓名"
:width="userWidths.width1"
>
<el-table-column prop="name" label="姓名" :width="userWidths.width1">
</el-table-column>
<el-table-column
prop="policemanid"
prop="policeNumber"
label="警号"
:width="userWidths.width2"
>
</el-table-column>
<el-table-column
prop="group"
prop="userGroupNames"
label="用户组"
:width="userWidths.width3"
>
</el-table-column>
<el-table-column
prop="unitname"
prop="unitName"
label="所属单位"
:width="userWidths.width5"
>
</el-table-column>
<el-table-column
prop="roleName"
prop="roleNames"
label="角色"
:width="userWidths.width4"
show-overflow-tooltip
......@@ -116,23 +112,23 @@
<template slot-scope="scope">
<div
class="tags"
v-for="item in scope.row.roleName &&
scope.row.roleName.split(',')"
v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')"
>
{{ item }}
</div>
</template>
</el-table-column>
<el-table-column
prop="groupid_list"
prop="permissionNames"
label="权限"
:width="userWidths.width5"
show-overflow-tooltip
>
<template slot-scope="scope">
<div
v-for="(item, index) in scope.row.permissionname &&
scope.row.permissionname.split(',')"
v-for="(item, index) in scope.row.permissionNames &&
scope.row.permissionNames.split(',')"
>
{{ index > 0 ? "/" : "" }}
{{ item }}
......@@ -145,12 +141,12 @@
:width="userWidths.width1"
>
<template slot-scope="scope">
<div v-if="scope.row.status === '0'" class="circle-red"></div>
<div v-if="scope.row.status === '1'" class="circle-blue"></div>
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
{{
scope.row.status === "0"
scope.row.status === 0
? "停用"
: scope.row.status === "1"
: scope.row.status === 1
? "启用"
: "无状态"
}}
......@@ -251,13 +247,13 @@
class="table"
>
<el-table-column
prop="groupname"
prop="name"
label="用户组"
:width="groupWidths.width1"
>
</el-table-column>
<el-table-column
prop="rolename"
prop="roleNames"
label="组角色"
:width="groupWidths.width2"
show-overflow-tooltip
......@@ -265,15 +261,15 @@
<template slot-scope="scope">
<div
class="tags"
v-for="item in scope.row.rolename &&
scope.row.rolename.split(',')"
v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')"
>
{{ item }}
</div>
</template>
</el-table-column>
<el-table-column
prop="username"
prop="userCount"
label="组成员"
:width="groupWidths.width3"
>
......@@ -283,7 +279,7 @@
style="width: 1rem;height: .8125rem;margin-bottom: -0.0625rem;"
icon-class="group-item"
/>
{{ scope.row.username.split(",").length }}
{{ scope.row.userCount }}
</div>
<!-- <div class="set-btn">-->
<!-- 用户设置-->
......@@ -303,12 +299,12 @@
:width="groupWidths.width3"
>
<template slot-scope="scope">
<div v-if="scope.row.status === '0'" class="circle-red"></div>
<div v-if="scope.row.status === '1'" class="circle-blue"></div>
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
{{
scope.row.status === "0"
scope.row.status === 0
? "停用"
: scope.row.status === "1"
: scope.row.status === 1
? "启用"
: "无状态"
}}
......@@ -499,26 +495,22 @@ export default {
},
// 获取用户信息
searchUser() {
var user = new URLSearchParams();
user.append("username", this.userSearchParams.username);
user.append("truename", this.userSearchParams.truename);
user.append("roleName", this.userSearchParams.roleName);
user.append("unitcode", this.userSearchParams.unitcode);
user.append("permissionname", this.userSearchParams.permissionname);
user.append("groupname", this.userSearchParams.groupname);
user.append("page", this.userSearchParams.page.page);
user.append("total", this.userSearchParams.page.total);
// todo 多条件筛选
this.$axios
.post("/login/user/queryUserList", user)
.then(res => {
this.userTableData = res.data.data;
this.userSearchParams.page.total = res.data.total;
this.userSearchParams.page.page = res.data.page;
this.userSearchParams.page.count = res.data.count;
this.$message.success(res.message);
})
.catch(failResponse => {});
console.info("搜索用户列表");
this.$axios.get("/system/users").then(res => {
console.info(res);
this.userTableData = res.data;
});
// // todo 多条件筛选
// this.$axios
// .post("/login/user/queryUserList", user)
// .then(res => {
// this.userTableData = res.data.data;
// this.userSearchParams.page.total = res.data.total;
// this.userSearchParams.page.page = res.data.page;
// this.userSearchParams.page.count = res.data.count;
// this.$message.success(res.message);
// })
// .catch(failResponse => {});
},
// 编辑用户权限
userEdit(id, rolename) {
......@@ -544,27 +536,22 @@ export default {
// 获取用户组信息
searchGroup() {
console.info("用户组筛选条件=====>", this.groupSearchParams);
var usergroup = new URLSearchParams();
usergroup.append("page", this.groupSearchParams.page.page); //必填
usergroup.append("total", this.groupSearchParams.page.total); //必填
usergroup.append("groupname", this.groupSearchParams.groupname);
usergroup.append("username", this.groupSearchParams.username);
usergroup.append("truename", this.groupSearchParams.truename);
usergroup.append("unitcode", this.groupSearchParams.unitcode);
usergroup.append("rolename", this.groupSearchParams.rolename);
// todo 多条件筛选
this.$axios
.post("/login/usergroup/queryUserGroupList", usergroup)
.then(res => {
console.log(res.data);
this.groupTableData = res.data.data;
this.groupSearchParams.page.total = res.data.total;
this.groupSearchParams.page.page = res.data.page;
this.groupSearchParams.page.count = res.data.count;
this.$message.success(res.message);
})
.catch(failResponse => {});
this.$axios.get("/system/user-groups").then(res => {
console.info(res);
this.groupTableData = res.data;
});
// // todo 多条件筛选
// this.$axios
// .post("/login/usergroup/queryUserGroupList", usergroup)
// .then(res => {
// console.log(res.data);
// this.groupTableData = res.data.data;
// this.groupSearchParams.page.total = res.data.total;
// this.groupSearchParams.page.page = res.data.page;
// this.groupSearchParams.page.count = res.data.count;
// this.$message.success(res.message);
// })
// .catch(failResponse => {});
},
groupEdit(id) {
console.info("用户id=====>", id);
......
......@@ -27,9 +27,9 @@
<div
class="default-role-item"
v-for="(item, index) in defaultRoleBtns"
:key="index"
:class="{ active: item.flag }"
@click="chooseDefaultRoleItem(index)"
:key="item.id"
:class="{ active: item.id === defaultRoleItemIndex }"
@click="chooseDefaultRoleItem(item)"
>
{{ item.name }}
</div>
......@@ -38,12 +38,19 @@
<div
class="diy-role-item"
v-for="(item, index) in diyRoleList"
:key="index"
:class="{ active: item.flag === true }"
@click="chooseDiyRoleItem(index)"
:key="item.id"
:class="{ active: item.id === diyRoleItemIndex }"
@click="chooseDiyRoleItem(item.id)"
>
{{ item.name }}
<!-- <div class="diy-edit-title">{{ item.name }}</div>-->
<div v-show="item.id !== diyRoleItemIndex" class="diy-edit-title">
{{ item.name }}
</div>
<el-input
v-show="item.id === diyRoleItemIndex"
size="mini"
class="diy-edit-title"
v-model="item.name"
></el-input>
<div class="diy-edit-btn">
<img class="img" :src="editurl" @click="editDiyRoleItem(index)" />
</div>
......@@ -213,16 +220,10 @@ export default {
editurl: require("@/assets/img/edit.png"),
funFlag: false,
dataFlag: false,
roles: [],
addRoleParams: [],
// 角色按钮
defaultRoleBtns: [
{ name: "指纹入库员", value: 1, flag: false },
{ name: "综合认定员", value: 2, flag: false },
{ name: "高级认定员", value: 3, flag: false },
{ name: "质量检查员", value: 4, flag: false },
{ name: "高级质量检查", value: 5, flag: false },
{ name: "一般管理员", value: 6, flag: false },
{ name: "超级管理员", value: 7, flag: false }
],
defaultRoleBtns: [],
// 角色权限菜单
roleMenus: [
{ name: "指掌纹采集", code: 0, flag: false },
......@@ -330,14 +331,15 @@ export default {
roleMenusSelection: [],
// 自定义的角色组
diyRoleList: [],
diyRoleItemIndex: -1
diyRoleItemIndex: -1,
defaultRoleItemIndex: -1
};
},
methods: {
addrole() {
var role = {
name: "do aute officia irure voluptate",
permissionIds: []
name: "测试角色",
permissionIds: [11, 12]
};
this.$axios.post("/system/roles", role).then(res => {
console.info(res);
......@@ -354,14 +356,21 @@ export default {
},
// 列表
search() {
var role = new URLSearchParams();
// role.append('userId', "可选");//根据用户id查询角色信息
// role.append('roleId', "可选");//根据角色id查询角色信息
// role.append('roleName', "可选");//根据角色名查询角色信息
// role.append('permissionName', "可选");//查询角色对应的权限
this.$axios
.post("/login/role/queryRolelist", role)
.then(res => {})
.get("/system/roles")
.then(res => {
console.info(res);
this.roles = res.data;
res.data.forEach((item, index) => {
// item.flag = false;
console.info(item);
if (index < 7) {
this.defaultRoleBtns.push(item);
} else {
this.diyRoleList.push(item);
}
});
})
.catch(failResponse => {});
},
// 删除
......@@ -369,61 +378,27 @@ export default {
console.info("删除数据", id);
this.diyRoleList.splice(id, 1);
this.diyRoleItemIndex = -1;
// var sysRole = new URLSearchParams();
// sysRole.append("roleId", "16");
// this.$axios
// .post("/login/role/deleteRoleById", sysRole)
// .then(res => {})
// .catch(failResponse => {});
},
// 新增
add() {
var roleitem = {
name: "自定义" + (this.diyRoleList.length + 1),
flag: false,
code: this.diyRoleList.length
code: this.diyRoleList.length,
edit: false
};
this.diyRoleList.push(roleitem);
console.info("新增数据");
// var role = new URLSearchParams();
// role.append("roleName", "角色名");
// role.append("description", "角色描述");
// sffb; //(是否发布:0:未发布,1:已发布),
// pid; // (父级角色的id),
// isparent; //(是否是父级:0:父级,1:子级),
// type角色类型;
// this.$axios
// .post("/login/role/add", role)
// .then(res => {
// console.log(res);
// this.$message.success(res.message);
// })
// .catch(failResponse => {});
},
// 编辑
edit() {
console.info("编辑数据");
var role = new URLSearchParams();
// 1、进入角色修改界面
role.append("roleId", "15");
this.$axios
.post("/login/role/queryrolesInfo", role)
.then(res => {})
.catch(failResponse => {});
var role1 = new URLSearchParams();
role1.append("roleId", "15");
role1.append("roleName", "修改角色名");
role1.append("description", "修改角色描述");
this.$axios
.post("/login/role/update", role1)
.then(res => {})
.catch(failResponse => {});
},
// 选中默认权限
chooseDefaultRoleItem(index) {
chooseDefaultRoleItem(item) {
this.defaultRoleItemIndex = item.id;
this.defaultRoleBtns.forEach((roleitem, idx) => {
if (idx === index) {
if (idx === item.id) {
roleitem.flag = true;
} else {
roleitem.flag = false;
......@@ -444,6 +419,7 @@ export default {
},
// 编辑
editDiyRoleItem(id) {
this.diyRoleList[id].edit = true;
console.info("编辑方法");
},
funAuth() {
......@@ -457,6 +433,9 @@ export default {
console.info("数据权限");
}
},
created() {
this.search();
},
mounted() {
this.defaultRoleBtns[0].flag = true;
this.funFlag = true;
......
......@@ -16,7 +16,7 @@
<div class="label">姓名:</div>
<el-input
class="search-info"
v-model="searchParams.truename"
v-model="searchParams.name"
placeholder="请输入姓名"
/>
</div>
......@@ -24,7 +24,7 @@
<div class="label">用户组:</div>
<el-input
class="search-info"
v-model="searchParams.groupname"
v-model="searchParams.userGroupId"
placeholder="请输入用户组名"
/>
</div>
......@@ -32,7 +32,7 @@
<div class="label">单位代码:</div>
<el-input
class="search-info"
v-model="searchParams.unitcode"
v-model="searchParams.unitCode"
placeholder="请输入单位代码"
/>
</div>
......@@ -40,7 +40,7 @@
<div class="label">角色:</div>
<el-input
class="search-info"
v-model="searchParams.roleName"
v-model="searchParams.roleId"
placeholder="请输入角色"
/>
</div>
......@@ -56,8 +56,6 @@
</div>
<div class="operation">
<div class="btn1" @click="batch">批量操作</div>
<div class="clear-btn" @click="adduser">adduser</div>
<div class="clear-btn" @click="searchuser">searchuser</div>
<div class="btns">
<div class="btn1" @click="delMore()">删除</div>
<div class="add" @click="open">
......@@ -99,16 +97,16 @@
</el-table-column>
<el-table-column prop="username" label="用户名" :width="width1">
</el-table-column>
<el-table-column prop="truename" label="姓名" :width="width1">
<el-table-column prop="name" label="姓名" :width="width1">
</el-table-column>
<el-table-column prop="policemanid" label="警号" :width="width2">
<el-table-column prop="policeNumber" label="警号" :width="width2">
</el-table-column>
<el-table-column prop="group" label="用户组" :width="width3">
<el-table-column prop="userGroupNames" label="用户组" :width="width3">
</el-table-column>
<el-table-column prop="unitname" label="所属单位" :width="width5">
<el-table-column prop="unitName" label="所属单位" :width="width5">
</el-table-column>
<el-table-column
prop="roleName"
prop="roleNames"
label="角色"
:width="width4"
show-overflow-tooltip
......@@ -116,23 +114,23 @@
<template slot-scope="scope">
<div
class="tags"
v-for="item in scope.row.roleName &&
scope.row.roleName.split(',')"
v-for="item in scope.row.roleNames &&
scope.row.roleNames.split(',')"
>
{{ item }}
</div>
</template>
</el-table-column>
<el-table-column
prop="groupid_list"
prop="permissionNames"
label="权限"
:width="width5"
show-overflow-tooltip
>
<template slot-scope="scope">
<div
v-for="(item, index) in scope.row.permissionname &&
scope.row.permissionname.split(',')"
v-for="(item, index) in scope.row.permissionNames &&
scope.row.permissionNames.split(',')"
>
{{ index > 0 ? "/" : "" }}
{{ item }}
......@@ -141,12 +139,12 @@
</el-table-column>
<el-table-column prop="status" label="启用状态" :width="width1">
<template slot-scope="scope">
<div v-if="scope.row.status === '0'" class="circle-red"></div>
<div v-if="scope.row.status === '1'" class="circle-blue"></div>
<div v-if="scope.row.status === 0" class="circle-red"></div>
<div v-if="scope.row.status === 1" class="circle-blue"></div>
{{
scope.row.status === "0"
scope.row.status === 0
? "停用"
: scope.row.status === "1"
: scope.row.status === 1
? "启用"
: "无状态"
}}
......@@ -217,25 +215,25 @@
v-model="addFormParams.username"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="姓名:" prop="truename">
<el-form-item class="info-item" label="姓名:" prop="name">
<el-input
placeholder="请输入姓名"
class="input-info"
v-model="addFormParams.truename"
v-model="addFormParams.name"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="所属单位代码:" prop="unitcode">
<el-form-item class="info-item" label="所属单位代码:" prop="unitCode">
<el-input
placeholder="请输入所属单位"
class="input-info"
v-model="addFormParams.unitcode"
v-model="addFormParams.unitCode"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="用户警号:" prop="policemanid">
<el-form-item class="info-item" label="用户警号:" prop="policeNumber">
<el-input
placeholder="请输入用户警号"
class="input-info"
v-model="addFormParams.policemanid"
v-model="addFormParams.policeNumber"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="密码:" prop="password">
......@@ -254,31 +252,31 @@
v-model="addFormParams.okpassword"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="手机号码:" prop="telphone">
<el-form-item class="info-item" label="手机号码:" prop="phoneNumber">
<el-input
placeholder="请输入手机号码"
class="input-info"
v-model="addFormParams.telphone"
v-model="addFormParams.phoneNumber"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="加入用户组:">
<el-input
placeholder="请选择用户组"
class="input-info"
v-model="addFormParams.group"
v-model="addFormParams.userGroupId"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="加入角色:">
<el-input
placeholder="请选择角色"
class="input-info"
v-model="addFormParams.role"
v-model="addFormParams.roleId"
></el-input>
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="input-info" v-model="addFormParams.status">
<el-radio :label="'1'">启用</el-radio>
<el-radio :label="'0'">停用</el-radio>
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="addbtns">
......@@ -365,8 +363,8 @@
</el-form-item>
<el-form-item class="info-item" label="启用状态:" prop="status">
<el-radio-group class="input-info" v-model="editFormParams.status">
<el-radio :label="'1'">启用</el-radio>
<el-radio :label="'0'">停用</el-radio>
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="addbtns">
......@@ -511,17 +509,28 @@ export default {
height: 480,
// 新增对象
addFormParams: {
username: "", //用户名
password: "1", //密码
okpassword: "1", // 确认密码
truename: "", //用户真实姓名
policemanid: "A1111", //警号
telphone: "17323245432", //用户电话
unitcode: "3700000", //单位代码
unitname: "北京市海淀区公安局分局", //单位名称
group: "", // 用户组
role: "", // 角色
status: "1" // 启用状态
username: "",
phoneNumber: "",
password: "",
okpassword: "",
policeNumber: "",
unitName: "长沙",
unitCode: "",
name: "",
status: 1,
userGroupId: null,
roleId: null
// username: "", //用户名
// password: "1", //密码
// okpassword: "1", // 确认密码
// truename: "", //用户真实姓名
// policemanid: "A1111", //警号
// telphone: "17323245432", //用户电话
// unitcode: "3700000", //单位代码
// unitname: "北京市海淀区公安局分局", //单位名称
// group: "", // 用户组
// role: "", // 角色
// status: "1" // 启用状态
},
editFormParams: {
userId: "",
......@@ -547,23 +556,23 @@ export default {
username: [
{ validator: validateUsername, trigger: "blur", required: true }
], //用户名
truename: [
name: [
{ validator: validateTruename, trigger: "blur", required: true }
], //用户真实姓名
policemanid: [
policeNumber: [
{ validator: validatePolicemanid, trigger: "blur", required: true }
], //警号
telphone: [
phoneNumber: [
{ validator: validateTelphone, trigger: "blur", required: true }
], //用户电话
unitcode: [
unitCode: [
{ validator: validateUnitcode, trigger: "blur", required: true }
], //单位代码
unitname: [
unitName: [
{ validator: validateUnitname, trigger: "blur", required: true }
], //单位名称
group: [{ validator: validatePass, trigger: "blur" }], // 用户组
role: [{ validator: validatePass, trigger: "blur" }], // 角色
userGroupId: [{ validator: validatePass, trigger: "blur" }], // 用户组
roleId: [{ validator: validatePass, trigger: "blur" }], // 角色
status: [{ validator: validateStatus, trigger: "blur", required: true }] // 启用状态
},
editrules: {
......@@ -636,70 +645,24 @@ export default {
}
},
methods: {
adduser() {
var user = {
username: "2021",
phoneNumber: "15806613121",
password: "2021",
policeNumber: "223",
unitName: "长沙",
unitCode: "123",
name: "王明光",
status: 1,
userGroupId: 1,
roleId: 1
};
this.$axios.post("/system/users", user).then(res => {
console.info(res);
});
},
searchuser() {
this.$axios.get("/system/users").then(res => {
console.info(res);
});
},
// 新增
submitForm(formName) {
this.$refs.addFormParams.validate(valid => {
console.log(valid);
if (valid) {
console.info("addFormParams=====>", this.addFormParams);
var user = new URLSearchParams();
user.append("username", this.addFormParams.username);
user.append("truename", this.addFormParams.truename);
user.append("unitname", this.addFormParams.unitname);
user.append("unitcode", this.addFormParams.unitcode);
user.append("password", this.addFormParams.password);
user.append("policemanid", this.addFormParams.policemanid);
user.append("telphone", this.addFormParams.telphone);
user.append("usergroup", this.searchParams.usergroup); // 警号
user.append("role", this.addFormParams.role);
user.append("status", this.addFormParams.status);
user.append("groupid_coll", "");
user.append("groupid_list", "");
user.append("groupid_edit", "");
user.append("groupid_admin", "");
console.info("user========>", user);
this.$axios
.post("/login/user/saveuser", user)
.then(res => {
if (res.data.message === "用户名已存在,请修改用户名!") {
this.$message.error(res.data.message);
} else {
console.info(res);
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
this.$message.success(res.data.message);
this.search();
}
})
.catch(failResponse => {});
this.$axios.post("/system/users", this.addFormParams).then(res => {
console.info(res);
if (res.data === "成功") {
this.$message.error(res.data);
this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false;
}
});
} else {
console.log("error submit!!");
return false;
}
});
// console.info(this.$refs[this.$refs[formName]]);
},
// 编辑
submitEditForm(formName) {
......@@ -764,30 +727,10 @@ export default {
},
search() {
console.info("搜索用户列表");
var user = new URLSearchParams();
user.append("username", this.searchParams.username);
user.append("truename", this.searchParams.truename);
user.append("roleName", this.searchParams.roleName);
user.append("unitcode", this.searchParams.unitcode);
user.append("permissionname", this.searchParams.permissionname);
user.append("groupname", this.searchParams.groupname);
user.append("page", this.searchParams.page.page);
user.append("total", this.searchParams.page.total);
// todo 多条件筛选
this.$axios
.post("/login/user/queryUserList", user)
.then(res => {
this.tableData = res.data.data;
this.searchParams.page.total = res.data.total;
this.searchParams.page.page = res.data.page;
this.searchParams.page.count = res.data.count;
this.$message.success(res.message);
})
.catch(failResponse => {});
// 做查询时 user.append("page","1");
// user.append("total","20");这两个参数必填
// 修改删除时,userid必填
this.$axios.get("/system/users").then(res => {
console.info(res);
this.tableData = res.data;
});
},
// 清除所有选项
......@@ -834,15 +777,14 @@ export default {
(this.addFormParams.username = ""), //用户名
(this.addFormParams.password = ""), //密码
(this.addFormParams.okpassword = ""), // 确认密码
(this.addFormParams.truename = ""), //用户真实姓名
(this.addFormParams.policemanid = ""), //警号
(this.addFormParams.telphone = ""), //用户电话
(this.addFormParams.unitcode = ""), //单位代码
(this.addFormParams.unitname = ""), //单位名称
(this.addFormParams.group = ""), // 用户组
(this.addFormParams.role = ""), // 角色
(this.addFormParams.status = "1"); // 启用状态
// this.resetForm("addFormParams");
(this.addFormParams.name = ""), //用户真实姓名
(this.addFormParams.policeNumber = ""), //警号
(this.addFormParams.phoneNumber = ""), //用户电话
(this.addFormParams.unitCode = ""), //单位代码
(this.addFormParams.unitName = "长沙"), //单位名称
(this.addFormParams.userGroupId = ""), // 用户组
(this.addFormParams.roleId = ""), // 角色
(this.addFormParams.status = 1); // 启用状态
},
// 打开编辑弹窗
openedit(id) {
......
......@@ -101,7 +101,7 @@
color: #055FE7;
}
.diy-edit-title{
//border: saddlebrown 1px solid;
width: 146px;
height: 19px;
font-size: 14px;
color: #333333;
......@@ -114,7 +114,7 @@
box-shadow: 0px 0px 4px 0px rgba(5, 95, 231, 0.3);
border-bottom-left-radius:250px;
position: relative;
right: -55px;
right: 0;
top: -3px;
.img{
width: 13px;
......
<template>
<div class="confirm_base" id="confirm_base">
<el-container class="confirm-page" direction="vertical">
<div class="confirm_header_search">
<div class="display_style">
<span><b>查询条件</b></span>
......@@ -79,12 +79,29 @@
<div class="display_style">
<label>查询类型:</label>
<div v-for="(btn, index) in queryTypeBtns" :key="index">
<!-- <div-->
<!-- class="btn"-->
<!-- @click="getQueryType(btn, 'querytypes')"-->
<!-- :class="[-->
<!-- reqParam.contrastCustomSearchReq.querytypes.includes(-->
<!-- btn.value-->
<!-- ) && btn.value === '2'-->
<!-- ? 'btn-active-zc'-->
<!-- : ''-->
<!-- ]"-->
<!-- >-->
<div
class="btn"
@click="getQueryType(btn, 'querytypes')"
:class="[
reqParam.contrastCustomSearchReq.querytypes.includes(btn.value)
? 'btn-active'
btn.value === '2'
? 'btn-active-zc'
: btn.value === '3'
? 'btn-active-ca'
: btn.value === '1'
? 'btn-active-dc'
: btn.value === '0'
? 'btn-active-cc'
: ''
]"
>
......@@ -232,7 +249,6 @@
<el-table
style="width: 100%; max-height: 31.25rem"
:height="height"
class="mineral-table"
border
@selection-change="handleSelectionChange"
ref="confirmTable"
......@@ -402,25 +418,23 @@
Tpage
}}页</span
>
<div class="page">
<el-pagination
class="paging"
background
@size-change="handleSizeChange"
@current-change="handleCurrPageChange"
:current-page="reqParam.page.currPage"
:page-sizes="[10, 20, 50, 100]"
:page-size="reqParam.page.pageSize"
layout="prev, pager, next"
:total="reqParam.page.total"
>
</el-pagination>
</div>
<el-pagination
class="paging"
background
@size-change="handleSizeChange"
@current-change="handleCurrPageChange"
:current-page="reqParam.page.currPage"
:page-sizes="[10, 20, 50, 100]"
:page-size="reqParam.page.pageSize"
layout="prev, pager, next"
:total="reqParam.page.total"
>
</el-pagination>
</div>
<el-dialog :visible.sync="historyDialogVisible" style="z-index: 1500">
</el-dialog>
</div>
</el-container>
</template>
<script>
......@@ -1366,6 +1380,50 @@ const setQueryClass = [
background-color: #dadde0;
border-radius: 3px;
}
/deep/.el-table th {
background-color: #f6f8fa;
border: none;
}
/deep/.el-table td,
.el-table th.is-leaf {
background-color: #ffffff;
border: none;
border-bottom: 1px #f6f8fa solid;
border-top: 1px #f6f8fa solid;
}
// 表格最外边框
.el-table--border,
.el-table--group {
border: none;
}
/deep/.el-popover {
padding: 15px 20px !important;
}
/deep/.el-popconfirm__action {
display: flex;
justify-content: center;
}
/deep/.el-popover.el-popper {
background: #006aff;
}
/deep/.el-form-item__label {
color: #333333;
}
/deep/.el-table th > .cell {
font-size: 14px;
font-family: MicrosoftYaHei;
font-weight: normal;
color: #282f3c;
}
/deep/.el-table td > .cell {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
div {
margin: 0;
padding: 0;
......@@ -1461,11 +1519,31 @@ b {
background: #ddebff;
border-radius: 4px;
}
.confirm_base {
height: 100%;
background-color: #ffffff;
.confirm-page {
width: 100%;
padding: 24px;
font-family: MicrosoftYaHei;
div {
display: inline-block;
}
.footer {
width: 1544px;
//width: calc(100vw - 367px);
position: absolute;
bottom: 27px;
left: 24px;
.count {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
.paging {
float: right;
}
}
}
.display_style {
display: inline-block;
margin: 5px 24px 5px 0;
......@@ -1545,6 +1623,18 @@ b {
color: #055fe7;
}
.btn-active-zc {
color: #00b47a;
}
.btn-active-dc {
color: #e60012;
}
.btn-active-cc {
color: #fa9500;
}
.btn-active-ca {
color: #055fe7;
}
.clear_btn {
width: fit-content;
font-family: MicrosoftYaHei;
......@@ -1636,16 +1726,6 @@ b {
// height: 450px;
}
}
.footer {
width: 1544px;
//width: calc(100vw - 367px);
position: absolute;
bottom: 27px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>
<!--table树-->
<style scoped lang="scss">
......
......@@ -7,7 +7,7 @@
<div class="rd-btn" @click="Rdwc">认定完成</div>
</div>
</div>
<Swiper />
<div class="main">
<div class="data">
<!-- 卡片源数据-->
......@@ -632,6 +632,7 @@ import TTPlam from "./modules/TTPlam.vue";
import TTFace from "./modules/TTFace.vue";
import Utils from "@/utils/util.js";
import "@/icons/error.svg";
import Swiper from '@/components/swiper.vue'
export default {
name: "TT",
......@@ -640,6 +641,7 @@ export default {
TTFace,
swiper,
swiperSlide,
Swiper
},
data() {
return {
......
<template>
<div id="homepage_hero_module" class="homepage_hero_module">
<!-- <div class="video_container">-->
<!-- &lt;!&ndash; <div :style="fixStyle" class="filter"></div>&ndash;&gt;-->
<!-- &lt;!&ndash; autoplay 自动播放 loop 循环播放 muted 静音播放&ndash;&gt;-->
<!-- &lt;!&ndash; <video autoplay loop muted class="fillWidth" v-on:canplay="canplay">&ndash;&gt;-->
<!-- &lt;!&ndash; <source :src="barcgroundUrl" type="video/mp4" />&ndash;&gt;-->
<!-- &lt;!&ndash; 浏览器不支持 video 标签,建议升级浏览器。&ndash;&gt;-->
<!-- &lt;!&ndash; </video>&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; todo 视频加载切换为图片加载 &ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; 考虑视频加载失败 图片背景效果 &ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="poster hidden" v-if="!vedioCanPlay">&ndash;&gt;-->
<!-- &lt;!&ndash; <img :style="fixStyle" :src="barcgroundImgUrl" alt="" />&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- -->
<!-- <div :style="fixStyle" class="filter"></div>-->
<!-- autoplay 自动播放 loop 循环播放 muted 静音播放-->
<!-- <video autoplay loop muted class="fillWidth" v-on:canplay="canplay">-->
<!-- <source :src="barcgroundUrl" type="video/mp4" />-->
<!-- 浏览器不支持 video 标签,建议升级浏览器。-->
<!-- </video>-->
<!-- &lt;!&ndash; todo 视频加载切换为图片加载 &ndash;&gt;-->
<!-- &lt;!&ndash; 考虑视频加载失败 图片背景效果 &ndash;&gt;-->
<!-- <div class="poster hidden" v-if="!vedioCanPlay">-->
<!-- <img :style="fixStyle" :src="barcgroundImgUrl" alt="" />-->
<!-- </div>-->
<!-- </div>-->
<img class="video_container" src="@/assets/img/login/login.gif" />
<div :style="drawerStyle" class="login_main_layer" ref="loginWindow">
<div>
<div class=" login_top_layer middle">
<el-image class="login_emblem middle" :src="emblemUrl"></el-image>
<br />
<el-image class="login_system middle" :src="systemUrl"></el-image>
</div>
<div class=" middle margin_top25_bottom10">
<el-button
class="magin_left_right30"
:class="{ active: loginType.accountStatus }"
:autofocus="true"
type="text"
@click="changeLoginType(1)"
>帐号密码登录
</el-button>
<span class="font_color">|</span>
<el-button
class="magin_left_right30"
type="text"
:class="{ active: loginType.keyStatus }"
@click="changeLoginType(2)"
>KEY登录
</el-button>
</div>
<!-- <img class="bg" src="@/assets/img/login/login.gif" />-->
<transition name="slide_fade">
<div :style="drawerStyle" class="login_main_layer" v-if="isShow">
<!-- <transition name="login_fade">-->
<div>
<accountsLogin :login-type="loginType.accountStatus"></accountsLogin>
<div class=" login_top_layer middle">
<el-image class="login_emblem middle" :src="emblemUrl"></el-image>
<br />
<el-image class="login_system middle" :src="systemUrl"></el-image>
</div>
<div class=" middle margin_top25_bottom10">
<el-button
class="magin_left_right30"
:class="{ active: loginType.accountStatus }"
:autofocus="true"
type="text"
@click="changeLoginType(1)"
>帐号密码登录
</el-button>
<span class="font_color">|</span>
<el-button
class="magin_left_right30"
type="text"
:class="{ active: loginType.keyStatus }"
@click="changeLoginType(2)"
>KEY登录
</el-button>
</div>
<div>
<accountsLogin
:login-type="loginType.accountStatus"
></accountsLogin>
</div>
<div>
<keyLogin :login-type="loginType.keyStatus"></keyLogin>
</div>
</div>
<div>
<keyLogin :login-type="loginType.keyStatus"></keyLogin>
<!-- </transition>-->
<div class="login_bottom_layer ">
<span class=" font_color"
>Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span
>
</div>
</div>
<div class="login_bottom_layer middle ">
<span class=" font_color">Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span>
</div>
</div>
</transition>
</div>
</template>
......@@ -67,7 +75,8 @@ export default {
data() {
return {
isShow: true,
isShow: false,
loginShow: false,
// drawerHeight: null,
barcgroundUrl: require("../../assets/video/login.mp4"),
barcgroundImgUrl: require("../../assets/img/login/background.png"),
......@@ -102,18 +111,15 @@ export default {
},
created() {
var me = this;
console.log(this.$refs.loginWindow);
// 动画加载时间
setTimeout(() => {
me.isShow = true;
}, 1000);
// setTimeout(() => {
// me.isShow = true;
// }, 1000);
// me.loginShow = true;
// }, 3000);
},
mounted() {
this.$nextTick(() => {
console.log(this.$refs.loginWindow);
this.$refs.loginWindow.right = "0px";
});
this.loginType.accountStatus = true;
if (localStorage.getItem("token") !== null) {
this.$router.push("/Home/Home");
......@@ -172,17 +178,18 @@ export default {
width: 100vw;
height: 100vh;
overflow: hidden;
background: rgba(36, 54, 76, 0.5);
position: relative;
}
.homepage_hero_module img {
width: 100%;
height: 100%;
}
video {
width: 100%;
height: 100%;
background-image: url("../../assets/img/login/login.gif");
background-repeat: no-repeat;
background-size: 100% 100%;
}
/*.homepage_hero_module img {*/
/* width: 100%;*/
/* height: 100%;*/
/*}*/
/*video {*/
/* width: 100%;*/
/* height: 100%;*/
/*}*/
.el-button--text {
width: 108px;
......@@ -221,7 +228,6 @@ video {
} */
.video_container {
height: 100%;
width: 100%;
}
.video_container .poster img,
.video_container video {
......@@ -236,30 +242,30 @@ video {
/*opacity: 0.5;*/
}
/*!*滑动进入*!*/
/*!* 可以设置不同的进入和离开动画 *!*/
/*!* 设置动画持续时间和动画函数 *!*/
/*.slide_fade-enter-active {*/
/* transition: all 2s ease;*/
/*}*/
/*滑动进入*/
/* 可以设置不同的进入和离开动画 */
/* 设置动画持续时间和动画函数 */
.slide_fade-enter-active {
transition: all 2s ease;
}
/*.slide_fade-leave-active {*/
/* transition: all 0.8s cubic-bezier(1, 0.5, 0.8, 1);*/
/*}*/
.slide_fade-leave-active {
transition: all 0.8s cubic-bezier(1, 0.5, 0.8, 1);
}
/*.slide_fade-enter, .slide_fade-leave-to*/
/* !* .slide-fade-leave-active for below version 2.1.8 *!*/
/* {*/
/* !*transform: translateX(100%);*!*/
/* !*opacity: 0;*!*/
/*}*/
.slide_fade-enter, .slide_fade-leave-to
/* .slide-fade-leave-active for below version 2.1.8 */
{
transform: translateX(1000px);
opacity: 0;
}
/*!*淡入淡出*!*/
/*.login_fade-enter-active,*/
/*.login_-leave-active {*/
/* !* opacity 透明度 *!*/
/* transition: opacity 2s;*/
/*}*/
/*淡入淡出*/
.login_fade-enter-active,
.login_-leave-active {
/* opacity 透明度 */
transition: opacity 2s;
}
/* .fade-leave-active, 2.1.8 版本以下 */
.login_fade-enter,
......@@ -267,33 +273,33 @@ video {
opacity: 0;
}
/*@keyframes fade-in {*/
/* 0% {*/
/* opacity: 0;*/
/* }*/
/* !*初始状态 透明度为0*!*/
/* 40% {*/
/* opacity: 0;*/
/* }*/
/* !*过渡状态 透明度为0*!*/
/* 100% {*/
/* opacity: 1;*/
/* }*/
/* !*结束状态 透明度为1*!*/
/*}*/
@keyframes fade-in {
0% {
opacity: 0;
}
/*初始状态 透明度为0*/
40% {
opacity: 0;
}
/*过渡状态 透明度为0*/
100% {
opacity: 1;
}
/*结束状态 透明度为1*/
}
/*@-webkit-keyframes fade-in {*/
/* !*针对webkit内核*!*/
/* 0% {*/
/* opacity: 0;*/
/* }*/
/* 40% {*/
/* opacity: 0;*/
/* }*/
/* 100% {*/
/* opacity: 1;*/
/* }*/
/*}*/
@-webkit-keyframes fade-in {
/*针对webkit内核*/
0% {
opacity: 0;
}
40% {
opacity: 0;
}
100% {
opacity: 1;
}
}
/*#wrapper {*/
/* animation: fade-in;!*动画名称*!*/
......@@ -305,12 +311,11 @@ video {
height: 100%;
width: 600px;
position: absolute;
right: -600px;
right: 0;
top: 0;
z-index: 4;
/*opacity: 0.5;*/
background: rgba(36, 54, 76, 0.5);
transition: all 2s;
/*background-color: #24364c;*/
}
......@@ -333,7 +338,6 @@ video {
z-index: 10;
margin-bottom: 10px;
opacity: 1;
background: rgba(36, 54, 76, 0);
}
.login_system {
......@@ -341,19 +345,19 @@ video {
height: 55px;
opacity: 1;
z-index: 10;
background: rgba(36, 54, 76, 0);
}
.login_top_layer {
margin-top: 20%;
margin-bottom: 50px;
background: rgba(36, 54, 76, 0);
}
.login_bottom_layer {
position: fixed;
bottom: 40px;
right: 10%;
position: relative;
bottom: -200px;
right: 0;
/*margin-bottom: 40px;*/
margin: 0 auto;
text-align: center;
}
</style>
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