Skip to content

F
founder_vue
Commit f1c227b7 by 张超军
Options

合并

parents 8526f62e 3fe80b73
Showing with 353 additions and 334 deletions
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -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) {
......
src/views/Editor/modules/imageEdAJ.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/SystemManage/PermissionManage.vue
......@@ -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);
......
src/views/SystemManage/RoleManage.vue
......@@ -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)"
>
<div v-show="item.id !== diyRoleItemIndex" class="diy-edit-title">
{{ item.name }}
<!-- <div class="diy-edit-title">{{ item.name }}</div>-->
</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;
......
src/views/SystemManage/scss/role.scss
......@@ -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;
......
src/views/cxyrd/QueryConfirm.vue
<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,7 +418,6 @@
Tpage
}}页</span
>
<div class="page">
<el-pagination
class="paging"
background
......@@ -416,11 +431,10 @@
>
</el-pagination>
</div>
</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">
......
src/views/cxyrd/TT.vue
......@@ -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 {
......
src/views/login/Login1.vue
<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>-->
<img class="video_container" src="@/assets/img/login/login.gif" />
<div :style="drawerStyle" class="login_main_layer" ref="loginWindow">
<!-- </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>
<div class=" login_top_layer middle">
<el-image class="login_emblem middle" :src="emblemUrl"></el-image>
......@@ -41,16 +43,22 @@
</el-button>
</div>
<div>
<accountsLogin :login-type="loginType.accountStatus"></accountsLogin>
<accountsLogin
:login-type="loginType.accountStatus"
></accountsLogin>
</div>
<div>
<keyLogin :login-type="loginType.keyStatus"></keyLogin>
</div>
</div>
<div class="login_bottom_layer middle ">
<span class=" font_color">Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span>
<!-- </transition>-->
<div class="login_bottom_layer ">
<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