Commit f380e6db by 张超军

as

parents a166a83f d88177d9
......@@ -244,16 +244,61 @@ export default [
component: () => import("@/views/SystemManage/RoleManage.vue")
},
{
path: "AuthManage",
name: "AuthManage",
path: "PermissionManage",
name: "PermissionManage",
hidden: false,
meta: {
title: "权限管理",
auth: "5"
},
component: () => import("@/views/SystemManage/AuthManage.vue")
component: () =>
import("@/views/SystemManage/PermissionManage.vue"),
children: [
// {
// path: "/UserPermission",
// name: "UserPermission",
// hidden: true,
// meta: {
// title: "编辑用户权限",
// auth: "5"
// },
// component: () =>
// import("@/views/SystemManage/UserPermission.vue")
// },
// {
// path: "/GroupPermission",
// name: "GroupPermission",
// hidden: true,
// meta: {
// title: "编辑用户权限",
// auth: "5"
// },
// component: () =>
// import("@/views/SystemManage/GroupPermission.vue")
// }
]
}
]
},
{
path: "/UserPermission",
name: "UserPermission",
hidden: true,
meta: {
title: "编辑用户权限",
auth: "5"
},
component: () => import("@/views/SystemManage/UserPermission.vue")
},
{
path: "/GroupPermission",
name: "GroupPermission",
hidden: true,
meta: {
title: "编辑用户组权限",
auth: "5"
},
component: () => import("@/views/SystemManage/GroupPermission.vue")
}
]
},
......
<template>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="36.375rem"
append-to-body
......
<template>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
width="54.6875rem"
append-to-body
......
......@@ -306,8 +306,8 @@
<el-radio-group v-model="ruleForm.cxlx.querytype">
<el-radio
label="2"
style="color: #00ccb5"
class='color_00ccb5'
style="color: #00b47a"
class='color_00b47a'
>正查</el-radio>
<el-radio
label="3"
......@@ -1085,8 +1085,8 @@ export default {
/deep/.color_fa9500 .el-radio__input.is-checked + .el-radio__label {
color: #fa9500;
}
/deep/.color_00ccb5 .el-radio__input.is-checked + .el-radio__label {
color: #00ccb5;
/deep/.color_00b47a .el-radio__input.is-checked + .el-radio__label {
color: #00b47a;
}
/deep/.color_055fe7 .el-radio__input.is-checked + .el-radio__label {
color: #055fe7;
......
......@@ -19,12 +19,15 @@
<el-input
v-if="type== 'ry'"
v-model="rowData.ysxtAsjxgrybh"
:disabled="true"
></el-input>
<el-input
v-else
v-model="rowData.ysxtAsjbh"
:disabled="true"
></el-input>
</el-form-item>
<div style="height:16px"></div>
<el-form-item
label="新数据条码号:"
prop='barcode'
......@@ -193,6 +196,7 @@ export default {
right: -4px;
}
.tip1 {
margin-top: 26px;
height: 22px;
line-height: 22px;
font-size: 14px;
......
......@@ -19,14 +19,21 @@
label="源条码号:"
v-if="this.type == 'ry'"
>
<el-input v-model="rowData.ysxtAsjxgrybh"></el-input>
<el-input
v-model="rowData.ysxtAsjxgrybh"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item
label="源条码号:"
v-else
v-if="this.type == 'aj'"
>
<el-input v-model="rowData.ysxtAsjbh"></el-input>
<el-input
v-model="rowData.ysxtAsjbh"
:disabled="true"
></el-input>
</el-form-item>
<div style="height:16px"></div>
<el-form-item
label="修改条码号:"
prop='barcode'
......@@ -190,6 +197,7 @@ export default {
padding: 0;
}
.tip1 {
margin-top: 26px;
height: 22px;
line-height: 22px;
font-size: 14px;
......
......@@ -166,10 +166,16 @@ export default {
for (let i = 0; i < this.rowData.length; i++) {
let personDo = {
ysxtAsjxgrybh: '',
id: ''
id: '',
xbdm: '',
zjhm: '',
xm: '',
}
personDo.ysxtAsjxgrybh = this.rowData[i].ysxtAsjxgrybh
personDo.id = this.rowData[i].id
personDo.xbdm = this.rowData[i].xbdm
personDo.zjhm = this.rowData[i].zjhm
personDo.xm = this.rowData[i].xm
newReqParams.personDoList.push(personDo)
}
console.log('关注人员ID', newReqParams);
......@@ -184,10 +190,12 @@ export default {
for (let i = 0; i < this.rowData.length; i++) {
let caseBase = {
ysxtAsjbh: '',
id: ''
id: '',
ajlbdm: ''
}
caseBase.ysxtAsjbh = this.rowData[i].ysxtAsjbh
caseBase.id = this.rowData[i].id
caseBase.ajlbdm = this.rowData[i].ajlbdm
newReqParams.caseBaseList.push(caseBase)
}
console.log('关注案件ID', newReqParams);
......
......@@ -33,6 +33,7 @@
placeholder="请输入案事件编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -46,6 +47,7 @@
placeholder="请输入现场勘验编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -79,6 +81,7 @@
placeholder="请输入现场物掌指纹卡编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -90,6 +93,7 @@
<el-input
v-model="ruleForm.ssjzrmby"
placeholder="请输入损失价值"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -115,11 +119,11 @@
>
<el-option
label="区域一"
value="shanghai"
value="1"
></el-option>
<el-option
label="区域二"
value="beijing"
value="2"
></el-option>
</el-select>
</el-form-item>
......@@ -181,8 +185,9 @@
<el-input
v-model="ruleForm.tqdwGajgjgdm"
placeholder="请输入提取单位代码"
maxlength="23"
maxlength="12"
show-word-limit
clearable
>
</el-input>
</el-form-item>
......@@ -195,6 +200,7 @@
<el-input
v-model="ruleForm.tqryXm"
placeholder="请输入现场物证编号"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -224,6 +230,7 @@
placeholder="请输入提取人身份证号"
maxlength="18"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -243,6 +250,7 @@
<el-input
v-model="ruleForm.tqryLxdh"
placeholder="请输入提取人联系电话"
clearable
></el-input>
</el-form-item>
</el-col>
......
......@@ -33,6 +33,7 @@
placeholder="请输入人员编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -46,6 +47,7 @@
placeholder="请输入警综人员编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -62,6 +64,7 @@
placeholder="请输入案事件相关人员编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -75,6 +78,7 @@
placeholder="请输入指掌纹卡编号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -120,8 +124,7 @@
<el-input
v-model="ruleForm.xm"
placeholder="请输入姓名"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -130,8 +133,7 @@
<el-input
v-model="ruleForm.bmch"
placeholder="请输入别名/绰号"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -247,6 +249,7 @@
placeholder="请输入证件号码"
maxlength="23"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -280,6 +283,7 @@
<el-input
v-model="ruleForm.hjdzDzmc"
placeholder="请输入户籍地址"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -313,6 +317,7 @@
<el-input
v-model="ruleForm.xzzDzmc"
placeholder="请输入现住址"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -371,6 +376,7 @@
<el-input
v-model="ruleForm.nydwGajgmc"
placeholder="请输入捺印单位名称"
clearable
>
</el-input>
</el-form-item>
......@@ -383,6 +389,7 @@
<el-input
v-model="ruleForm.nyryXm"
placeholder="请输入现场物证编号"
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -412,6 +419,7 @@
placeholder="请输入捺印人身份证号"
maxlength="18"
show-word-limit
clearable
></el-input>
</el-form-item>
</el-col>
......@@ -431,6 +439,7 @@
<el-input
v-model="ruleForm.nyryLxdh"
placeholder="请输入捺印人联系电话"
clearable
></el-input>
</el-form-item>
</el-col>
......
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-10 15:51:00
* @LastEditTime: 2021-11-10 18:19:40
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......
......@@ -105,10 +105,28 @@
</el-header>
<el-main class="main">
<div class="contain">
<!-- 导航 -->
<el-tabs
closable
v-model="routePath"
@tab-click="handleClick"
@tab-remove="tabRemove"
>
<el-tab-pane
label="活体指纹采集"
name="/Home/htzwcj"
></el-tab-pane>
<el-tab-pane
:label="item.name"
:name="item.path"
v-for="(item, i) in paths"
:key="i"
:class="{ active: $route.path == item.path }"
></el-tab-pane>
</el-tabs>
<div class="breadcrumb">
<div
<!-- <div
@click="goManager"
ref="path"
class="home-path path"
:class="{ active: $route.path == '/Home/htzwcj' }"
>
......@@ -116,6 +134,7 @@
</div>
<div
class="path"
ref="path"
@click="changeRouter(item)"
v-for="(item, i) in paths"
:key="i"
......@@ -125,7 +144,7 @@
<div class="closeIcon" @click.stop="closePaths(item.name)">
×
</div>
</div>
</div> -->
</div>
<!-- 路由出口 -->
<router-view></router-view>
......@@ -160,6 +179,7 @@ export default {
paths: [],
menuActive: "",
isHoverLogout: false,
routePath: "",
};
},
mounted() {
......@@ -210,6 +230,32 @@ export default {
this.searchTxt = "";
console.log(this.searchTxt);
},
handleClick({ name }) {
if (name == "/Home/htzwcj") {
this.$router.push(name);
this.menuActive = "";
} else {
this.$router.push(name);
let routerObj = this.paths.find((i) => i.path == name);
this.menuActive = routerObj.routeName;
}
},
tabRemove(name) {
let routerObj = this.paths.find((i) => i.path == name);
if (routerObj) {
let pathName = routerObj.name;
let res = this.paths.filter((item) => {
return item.name != pathName;
});
this.paths = res;
console.log(pathName == this.$route.meta.title);
if (pathName == this.$route.meta.title) {
this.$router.push("/Home/htzwcj");
this.$refs.menu.activeIndex = "";
}
}
sessionStorage.setItem("crumbs", JSON.stringify(this.paths));
},
/**
* @description: 调回任务管理
* @param {*}
......@@ -271,6 +317,7 @@ export default {
watch: {
$route: {
handler(newValue, oldValue) {
this.routePath = newValue.path;
setTimeout(() => {
console.log(1);
if (newValue.path != "/Home/htzwcj") {
......@@ -299,8 +346,13 @@ export default {
immediate: true,
},
},
mounted() {
console.log(this.$refs.path);
},
created() {
this.paths = sessionStorage.getItem("crumbs") ? JSON.parse(sessionStorage.getItem("crumbs")) : [];
this.paths = sessionStorage.getItem("crumbs")
? JSON.parse(sessionStorage.getItem("crumbs"))
: [];
},
};
</script>
......@@ -435,7 +487,44 @@ export default {
.aside .minLogo {
background-size: 36px auto;
}
.el-tabs /deep/ {
.el-tabs__header {
margin: 0;
margin-top: 8px;
}
.is-active {
color: #0077ff;
border-bottom: 2px solid #006aff;
}
.el-tabs__active-bar {
background-color: #006aff;
display: none;
}
.el-tabs__item {
position: relative;
padding-right: 35px !important;
padding-left: 35px !important;
&:not(:nth-of-type(2)) {
&:hover {
.el-icon-close {
display: inline-block;
}
}
}
.el-icon-close {
&::before{
transform: scale(1.1)
}
display: none;
position: absolute;
top: 0;
right: 0;
}
&:hover {
color: #0077ff;
}
}
}
.header {
height: 64px;
background: #ffffff;
......@@ -559,7 +648,16 @@ export default {
background: #ffffff;
border-radius: 8px;
overflow: hidden;
.scrollbar {
width: 100%;
position: relative;
height: 47px;
overflow: hidden;
}
.breadcrumb {
position: absolute;
left: 0;
top: 0;
display: flex;
height: 47px;
border-bottom: 1px solid #eeeeee;
......@@ -571,6 +669,7 @@ export default {
padding: 11px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
flex-shrink: 0;
color: #666666;
&:hover {
.closeIcon {
......
<template>
<el-container class="manage-page" direction="vertical">
<!--权限管理-->
<dvi class="header">
<div class="btns">
<div class="btn" :class="{ active: isUser }" @click="getUser">
用户列表
</div>
<div class="btn" :class="{ active: isGroup }" @click="getGroup">
用户组列表
</div>
<el-button @click="add">add</el-button>
<el-button @click="edit">edit</el-button>
<el-button @click="del">del</el-button>
<el-button @click="search">search</el-button>
</div> </dvi
><br />
<div class="search">
<div class="search-item">
<div class="label">用户组:</div>
<div class="input">请输入并选择</div>
</div>
<div class="search-item">
<div class="label">用户名:</div>
<div class="input">请输入并选择</div>
</div>
<div class="search-item">
<div class="label">姓名:</div>
<div class="input">请输入并选择</div>
</div>
<div class="search-item">
<div class="label">用户所属单位代码:</div>
<div class="input">请输入并选择</div>
</div>
<div class="search-item">
<div class="label">组角色:</div>
<div class="input">请输入并选择</div>
</div>
<div class="btns">
<div class="btn-clear">清空</div>
<div class="btn-search">筛选用户组</div>
</div>
</div>
<div class="main">
<div v-if="isUser" class="user">
<el-table
height="720"
highlight-current-row
ref="userMultipleTable"
:data="userTableData"
class="table"
@selection-change="userHandleSelectionChange"
>
<el-table-column prop="date" label="用户名"> </el-table-column>
<el-table-column prop="name" label="姓名"> </el-table-column>
<el-table-column prop="address" label="警号"> </el-table-column
><el-table-column prop="date" label="用户组"> </el-table-column>
<el-table-column prop="name" label="所属单位"> </el-table-column>
<el-table-column prop="address" label="角色"> </el-table-column
><el-table-column prop="date" label="权限"> </el-table-column>
<el-table-column prop="name" label="启用状态"> </el-table-column>
<el-table-column prop="address" label="操作"></el-table-column>
</el-table>
</div>
<div v-if="isGroup" class="group">
<el-table
height="720"
highlight-current-row
ref="groupMultipleTable"
:data="groupTableData"
class="table"
@selection-change="groupHandleSelectionChange"
>
<el-table-column prop="date" label="用户组"> </el-table-column>
<el-table-column prop="name" label="组角色"> </el-table-column>
<el-table-column prop="address" label="组成员"> </el-table-column>
<el-table-column prop="date" label="启用状态"> </el-table-column>
<el-table-column prop="address" label="操作"></el-table-column>
</el-table>
</div>
</div>
<div class="footer">
<span class="count"
>{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{
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>
</div>
</el-container>
</template>
<script>
export default {
name: "AuthManage",
data() {
return {
reqParam: {
userdesc: "",
page: {
total: 0,
pageSize: 10,
currPage: 1
}
},
isUser: false,
isGroup: false,
userTableData: [],
groupTableData: [],
// 选中user的数据
userMultipleSelection: [],
// 选中group的数据
groupMultipleSelection: []
};
},
computed: {
// 计算总页数
Tpage() {
return (
Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1
);
}
},
methods: {
getUser() {
this.isUser = true;
this.isGroup = false;
},
getGroup() {
this.isUser = false;
this.isGroup = true;
},
// 选择数据
userHandleSelectionChange(val) {
this.userMultipleSelection = val;
console.info("选择的数据", this.userMultipleSelection);
if (this.userMultipleSelection.length) {
this.isShowTip = true;
} else {
this.isShowTip = false;
}
},
// 选择数据
groupHandleSelectionChange(val) {
this.groupMultipleSelection = val;
console.info("选择的数据", this.groupMultipleSelection);
if (this.groupMultipleSelection.length) {
this.isShowTip = true;
} else {
this.isShowTip = false;
}
},
// 当期页发生变化
handleCurrPageChange: function(val) {
this.reqParam.page.currPage = val;
// this.search();
},
// 每页展示数量发生变化
handleSizeChange: function(val) {
this.reqParam.page.pageSize = val;
// this.search();
},
add() {
var permission = new URLSearchParams();
permission.append("menuname", "菜单30");
permission.append("pid", "3");
permission.append("zindex", "4");
// permission.append("roleId", "30");
// menuname; //菜单名称
// pid;//父级权限id
// permission;//资源权限字符串
// url;//资源 url
// description;//描述
// type;//权限类型
// zindex;//菜单排序
// flag;//是否生成菜单,0:默认不生成菜单,1:生成菜单
// status;//权限状态(01:显示,02:加锁,03:隐藏)
// roleId;/必填
this.$axios
.post("/login/permission/add", permission)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
del() {
var permission = new URLSearchParams();
permission.append("menuId", "888");
this.$axios
.post("/login/permission/deletePermissionById", permission)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
},
edit() {
var permission = new URLSearchParams();
permission.append("menuId", "777");
this.$axios
.post("/login/permission/querypermissionInfo", permission)
.then(res => {
console.log(res);
})
.catch(failResponse => {});
// menuId;//权限id
// menuname;//菜单名称
// pid;//父级权限id
// permission;//资源权限字符串
// url;//资源 url
// description;//描述
// type;//权限类型
// zindex;//菜单排序
// status;//权限状态(01:显示,02:加锁,03:隐藏)
var permission1 = new URLSearchParams();
permission1.append("menuId", "777");
permission1.append("menuname", "修改菜单名字");
this.$axios
.post("/login/permission/update", permission1)
.then(res => {
console.log(res);
})
.catch(failResponse => {});
},
search() {
var permission = new URLSearchParams();
// permission.append("menuId", "要删除的权限id");
// menuname,pid,
// userId(非admin用户,必填)
permission.append("page", "1"); //必填
permission.append("total", "20"); //必填
this.$axios
.post("/login/permission/querypermissionAll", permission)
.then(res => {
console.log(res);
this.$message.success(res.message);
})
.catch(failResponse => {});
}
},
mounted() {
this.isUser = true;
}
};
</script>
<style scoped lang="scss">
@import "scss/auth.scss";
</style>
......@@ -6,19 +6,6 @@
<div class="search">
<div class="search-item">
<div class="label">用户组:</div>
<!-- <el-select-->
<!-- v-model="searchParams.groupname"-->
<!-- class="search-info"-->
<!-- placeholder="请输入并选择"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in options"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-input
v-model="searchParams.groupname"
class="search-info"
......@@ -43,12 +30,6 @@
</div>
<div class="search-item">
<div class="label">用户所属单位名称:</div>
<!-- <el-select-->
<!-- v-model="searchParams.unitcode"-->
<!-- class="search-info"-->
<!-- placeholder="请输入并选择"-->
<!-- >-->
<!-- </el-select>-->
<el-input
v-model="searchParams.unitcode"
class="search-info"
......@@ -57,12 +38,6 @@
</div>
<div class="search-item">
<div class="label">组角色:</div>
<!-- <el-select-->
<!-- v-model="searchParams.roleId"-->
<!-- class="search-info"-->
<!-- placeholder="请输入并选择"-->
<!-- >-->
<!-- </el-select>-->
<el-input
v-model="searchParams.rolename"
class="search-info"
......@@ -73,6 +48,7 @@
</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">
......@@ -618,6 +594,18 @@ 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; //必填
......
......@@ -60,6 +60,7 @@
数据权限
</div>
</div>
<div @click="addrole">addrole</div>
<div class="save">
<div class="btn" @click="save">保存</div>
<!-- <el-button @click="add">add</el-button>-->
......@@ -333,6 +334,15 @@ export default {
};
},
methods: {
addrole() {
var role = {
name: "do aute officia irure voluptate",
permissionIds: []
};
this.$axios.post("/system/roles", role).then(res => {
console.info(res);
});
},
// 复制
copy() {
console.info("复制数据");
......@@ -358,6 +368,7 @@ export default {
del(id) {
console.info("删除数据", id);
this.diyRoleList.splice(id, 1);
this.diyRoleItemIndex = -1;
// var sysRole = new URLSearchParams();
// sysRole.append("roleId", "16");
// this.$axios
......
......@@ -56,6 +56,8 @@
</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">
......@@ -384,6 +386,8 @@
<script>
import "@/icons/ic_add.svg";
import qs from "qs";
export default {
name: "UserManage",
created() {
......@@ -499,7 +503,6 @@ export default {
}
};
return {
width5: 180,
width4: 350,
width3: 200,
width2: 100,
......@@ -633,6 +636,28 @@ 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 => {
......
.manage-page {
width: 100%;
padding: 24px;
font-family: MicrosoftYaHei;
div {
display: inline-block;
}
.header{
width:100%;
.btns{
width: 260px;
height: 40px;
.btn{
text-align: center;
width: 129px;
height: 32px;
font-size: 14px;
color: #282F3C;
background: #F6F8FA;
border-radius: 2px;
line-height: 32px;
cursor: pointer;
&.active{
background: #055FE7;
color: #FFFFFF;
}
}
}
}
.search{
width:100%;
height:58px;
border-bottom: 1px solid #EEEEEE;
padding-top: 10px;
margin-bottom: 10px;
display: flex;
flex-direction: row;
.search-item{
width: auto;
margin-right: 17px;
.label{
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
margin-right: 5px;
}
.input{
width: 156px;
height: 32px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E6E6E8;
}
}
.btns{
width: 180px;
position: absolute;
right: 24px;
text-align: center;
.btn-clear{
width: 50px;
height: 23px;
font-size: 14px;
color: #055FE7;
line-height: 23px;
cursor: pointer;
}
.btn-search{
width: 110px;
height: 32px;
font-size: 14px;
color: #FFFFFF;
line-height: 32px;
background: #055FE7;
border-radius: 4px;
margin-left: 10px;
cursor: pointer;
}
}
}
.main{
.user{
width: 1550px;
height:700px;
}
.group{
width: 100%;
height: 700px;
}
}
.footer {
width: 1544px;
//width: calc(100vw - 367px);
position: absolute;
bottom: 27px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
.count {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
.paging {
float: right;
}
/deep/.el-pager {
.number {
background-color: transparent;
}
.number.active {
background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px;
}
.el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important;
}
}
/deep/ .btn-prev,
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
//表格表头样式
/deep/.el-table th,
.el-table tr {
height: 48px;
background: #f6f8fa;
font-size: 14px;
color: #282f3c;
}
//表格内容样式
/deep/.el-table td,
.el-table tr {
height: 55px;
background: #ffffff;
font-size: 14px;
color: #333333;
padding: 0;
font-weight: 400;
}
}
\ No newline at end of file
.manage-page {
width: 100%;
padding: 24px;
font-family: MicrosoftYaHei;
div {
display: inline-block;
}
.header{
width: 1544px;
height: 54px;
border-radius: 8px;
overflow: hidden;
&.down{
background: #FEF5F6;
}
&.up{
background: #f2f7fe;
}
.title{
width: 96px;
height: 96px;
border-radius: 16px;
transform: rotate(40deg);
position: relative;
left: -23px;
top: -17px;
&.down{
background: #FAE1E4;
}
&.up{
background: #DDEBFF;
}
.title-status{
position: relative;
top: 28px;
left: 30px;
transform: rotate(-40deg);
.circle-red{
width: 8px;
height: 8px;
background-color:#FE0000;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-blue{
width: 8px;
height: 8px;
background-color:#055FE7;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
}
}
.info{
//border: 1px solid hotpink; width: auto;
.info-item{
padding:0 20px 0 20px;
border-right: 1px solid #E6E6E8;
.info-title{
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
.tags{
width: 100px;
height: 24px;
background: #FFFFFF;
border-radius: 4px;
text-align: center;
margin-right: 16px;
}
}
}
.info-item1{
padding:0 20px 0 20px;
.info-title{
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
width: 80px;
text-align: center;
//width: 80px;
height: 24px;
background: #FFFFFF;
border-radius: 12px;
}
.btn{
margin-left: 5px;
cursor: pointer;
width: 80px;
height: 22px;
font-size: 14px;
color: #055FE7;
line-height: 22px;
}
}
}
}
.main {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
.header {
height: 55px;
margin: 0 auto;
//margin-bottom: 3px;
.btns {
width: 224px;
height: 48px;
background: #f6f8fa;
border-radius: 8px;
text-align: center;
.btn {
margin-top: 8px;
width: 104px;
height: 32px;
line-height: 32px;
color: #666666;
cursor: pointer;
//&:hover{
// background: #FFFFFF;
// color: #055FE7;
// box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
// border-radius: 6px;
//}
&.active {
background: #ffffff;
color: #055fe7;
box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
border-radius: 6px;
}
}
}
.save {
.btn {
position: absolute;
right: 30px;
top: 150px;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
line-height: 32px;
color: #ffffff;
text-align: center;
}
}
}
.role-info {
width: 100%;
height: 690px;
background: #ffffff;
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3),
-1px 1px 3px 0px rgba(5, 95, 231, 0.24);
border-radius: 10px;
display: flex;
flex-direction: row;
.menus {
width: 155px;
height: 100%;
border-right: 1px solid #eeeeee;
.div3 {
width: 100%;
height: 130px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 12px 20px 0 20px;
}
}
.div2 {
width: 100%;
height: 90px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
.div1 {
width: 100%;
height: 70px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
// 未选中字体颜色
/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 {
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 {
width: 100%;
height: 130px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
padding-top: 8px;
.line {
height: 40px;
}
}
.div2 {
width: 100%;
height: 90px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 10px 20px 0 25px;
}
.line {
height: 35px;
}
}
.div1 {
width: 100%;
height: 70px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
// 未选中字体颜色
/deep/ .el-checkbox {
//border: 1px darkblue solid;
width: 140px;
font-size: 14px;
color: #666666;
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 {
font-size: 14px;
font-weight: 400;
color: #333333;
}
/deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
}
}
}
\ No newline at end of file
.manage-page {
width: 100%;
padding: 24px;
font-family: MicrosoftYaHei;
div {
display: inline-block;
}
//用户和用户组切换按钮
.header{
width:100%;
.btns{
width: 260px;
height: 40px;
.btn{
text-align: center;
width: 129px;
height: 32px;
font-size: 14px;
color: #282F3C;
background: #F6F8FA;
border-radius: 2px;
line-height: 32px;
cursor: pointer;
&.active{
background: #055FE7;
color: #FFFFFF;
}
}
}
}
// 用户
.user{
width: 100%;
height: 870px;
.search {
width: 100%;
height: 50px;
.search-item {
width: auto;
height: 32px;
margin: 5px 16px 5px 0;
.label {
width: auto;
height: 32px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 32px;
margin: 8px;
}
.search-info {
width: 155px;
height: 32px;
background: #ffffff;
border-radius: 4px;
//border: 1px solid #e6e6e8;
//margin-top: 8px;
}
}
.btn {
position:absolute;
top: 125px;
right: 24px;
width: 95px;
height: 32px;
background: #055fe7;
border-radius: 4px;
line-height: 32px;
color: #ffffff;
font-size: 14px;
text-align: center;
cursor: pointer;
}
}
.table{
height: 750px;
width: 100%;
margin-top: 10px;
.tags{
width: 100px;
height: 24px;
background: #F0F3F6;
border-radius: 4px;
text-align: center;
margin-right: 3px;
}
.circle-red{
width: 8px; height: 8px; background-color:#FE0000; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%;
}
.circle-blue{
width: 8px; height: 8px; background-color:#055FE7; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%;
}
}
.footer {
width: 1544px;
//width: calc(100vw - 367px);
position: absolute;
bottom: 27px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
.count {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
.paging {
float: right;
}
/deep/.el-pager {
.number {
background-color: transparent;
}
.number.active {
background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px;
}
.el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important;
}
}
/deep/ .btn-prev,
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
}
// 用户组
.group{
width: 100%;
height: 870px;
.search {
width: 100%;
height: 50px;
.search-item {
width: auto;
height: 32px;
margin: 5px 16px 5px 0;
.label {
width: auto;
height: 32px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
line-height: 32px;
margin: 8px;
}
.search-info {
width: 155px;
height: 32px;
background: #ffffff;
border-radius: 4px;
//border: 1px solid #e6e6e8;
//margin-top: 8px;
}
}
.clear{
width: 38px;
border: none;
height: 22px;
padding: 0;
margin: 0 12px 0 12px;
font-size: 14px;
font-weight: 350;
color: #333333;
text-align: center;
position:absolute;
top: 130px;
right: 124px;
cursor: pointer;
&:hover {
color: #055fe7;
}
&:active {
color: #055fe7;
}
}
.btn {
position:absolute;
top: 125px;
right: 24px;
width: 95px;
height: 32px;
background: #055fe7;
border-radius: 4px;
line-height: 32px;
color: #ffffff;
font-size: 14px;
text-align: center;
cursor: pointer;
}
}
.table{
height: 750px;
width: 100%;
margin-top: 10px;
.tags{
width: 100px;
height: 24px;
background: #F0F3F6;
border-radius: 4px;
text-align: center;
margin-right: 3px;
}
.circle-red{
width: 8px; height: 8px; background-color:#FE0000; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%;
}
.circle-blue{
width: 8px; height: 8px; background-color:#055FE7; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%;
}
.group-item{
width: 70px;
height: 24px;
background: #F0F3F6;
border-radius: 12px;
font-size: 16px;
font-weight: bold;
color: #282F3C;
line-height: 24px;
text-align: center;
margin-right: 12px;
}
.set-btn{
width: 56px;
height: 22px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055FE7;
line-height: 22px;
cursor: pointer;
//position: absolute;
//right: 100px;
}
}
.footer {
width: 1544px;
//width: calc(100vw - 367px);
position: absolute;
bottom: 27px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
.count {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
.paging {
float: right;
}
/deep/.el-pager {
.number {
background-color: transparent;
}
.number.active {
background-color: #055fe7 !important;
box-shadow: 0px 12px 16px 1px rgba(0, 21, 51, 0.03);
border-radius: 6px;
}
.el-icon.more.btn-quicknext.el-icon-more,
.el-icon.more.btn-quickprev.el-icon-more {
background-color: transparent !important;
}
}
/deep/ .btn-prev,
/deep/ .btn-next {
background-color: transparent !important;
}
/deep/ .el-pagination__sizes {
position: absolute;
right: 0;
}
/deep/ .btn-next {
//margin-right: 120px !important;
}
}
}
//表格表头样式
/deep/.el-table th,
.el-table tr {
height: 48px;
background: #f6f8fa;
font-size: 14px;
color: #282f3c;
}
//表格内容样式
/deep/.el-table td,
.el-table tr {
height: 55px;
background: #ffffff;
font-size: 14px;
color: #333333;
padding: 0;
font-weight: 400;
}
}
\ No newline at end of file
......@@ -81,9 +81,8 @@
//border: saddlebrown 1px solid;
width: 215px;
height: 366px;
display: flex;
flex-direction: column;
padding-top: 10px;
//display: flex;
//flex-direction: column;
overflow:scroll;
.diy-role-item{
width: 190px;
......@@ -93,7 +92,8 @@
font-size: 14px;
color: #333333;
line-height: 40px;
margin-bottom: 10px;
margin-top: 10px;
margin-left: -22px;
cursor: pointer;
overflow: hidden;
&.active{
......
.manage-page {
width: 100%;
padding: 24px;
font-family: MicrosoftYaHei;
div {
display: inline-block;
}
.header{
width: 1544px;
height: 54px;
border-radius: 8px;
overflow: hidden;
&.down{
background: #FEF5F6;
}
&.up{
background: #f2f7fe;
}
.title{
width: 96px;
height: 96px;
border-radius: 16px;
transform: rotate(40deg);
position: relative;
left: -23px;
top: -17px;
&.down{
background: #FAE1E4;
}
&.up{
background: #DDEBFF;
}
.title-status{
position: relative;
top: 28px;
left: 30px;
transform: rotate(-40deg);
.circle-red{
width: 8px;
height: 8px;
background-color:#FE0000;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-blue{
width: 8px;
height: 8px;
background-color:#055FE7;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
}
}
.info{
//border: 1px solid hotpink; width: auto;
.info-item{
padding:0 20px 0 20px;
border-right: 1px solid #E6E6E8;
.info-title{
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
}
.info-value1{
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
.tags{
}
}
}
.info-item1{
padding:0 20px 0 20px;
.info-title{
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
.tags{
width: 100px;
height: 24px;
background: #FFFFFF;
border-radius: 4px;
text-align: center;
margin-right: 16px;
}
}
}
}
}
.main {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
.header {
height: 55px;
margin: 0 auto;
//margin-bottom: 3px;
.btns {
width: 224px;
height: 48px;
background: #f6f8fa;
border-radius: 8px;
text-align: center;
.btn {
margin-top: 8px;
width: 104px;
height: 32px;
line-height: 32px;
color: #666666;
cursor: pointer;
//&:hover{
// background: #FFFFFF;
// color: #055FE7;
// box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
// border-radius: 6px;
//}
&.active {
background: #ffffff;
color: #055fe7;
box-shadow: 0px 6px 8px 1px rgba(0, 21, 51, 0.05);
border-radius: 6px;
}
}
}
.save {
.btn {
position: absolute;
right: 30px;
top: 150px;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
line-height: 32px;
color: #ffffff;
text-align: center;
}
}
}
.role-info {
width: 100%;
height: 690px;
background: #ffffff;
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3),
-1px 1px 3px 0px rgba(5, 95, 231, 0.24);
border-radius: 10px;
display: flex;
flex-direction: row;
.menus {
width: 155px;
height: 100%;
border-right: 1px solid #eeeeee;
.div3 {
width: 100%;
height: 130px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 12px 20px 0 20px;
}
}
.div2 {
width: 100%;
height: 90px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
.div1 {
width: 100%;
height: 70px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
// 未选中字体颜色
/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 {
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 {
width: 100%;
height: 130px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
padding-top: 8px;
.line {
height: 40px;
}
}
.div2 {
width: 100%;
height: 90px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 10px 20px 0 25px;
}
.line {
height: 35px;
}
}
.div1 {
width: 100%;
height: 70px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
}
}
// 未选中字体颜色
/deep/ .el-checkbox {
//border: 1px darkblue solid;
width: 140px;
font-size: 14px;
color: #666666;
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 {
font-size: 14px;
font-weight: 400;
color: #333333;
}
/deep/ .el-checkbox__input.is-checked .el-checkbox__inner {
background: #055fe7;
border-color: #055fe7;
}
}
}
}
}
\ No newline at end of file
......@@ -87,7 +87,11 @@
</div>
<div class="bzitem">
<div class="bzname">比中人联系电话:</div>
<el-input class="bzphone" v-model="phone" placeholder="请输入内容"></el-input>
<el-input
class="bzphone"
v-model="phone"
placeholder="请输入内容"
></el-input>
<div class="input-error" v-show="isPhoneError">
<!-- <img src="@/assets/img/inputerror.png" alt=""> -->
<svg-icon icon-class="error" class="icon" />
......@@ -100,7 +104,12 @@
<div class="line"></div>
<div class="bzfooter">
<div class="footer-title">备注</div>
<el-input type="textarea" :rows="5" placeholder="在此输入备注信息" v-model="textarea">
<el-input
type="textarea"
:rows="5"
placeholder="在此输入备注信息"
v-model="textarea"
>
</el-input>
</div>
<div class="bzbtns">
......@@ -111,7 +120,11 @@
</div>
<!-- 认定完成确认框 -->
<div class="rdwcDialog" v-show="isShowrdwcDialogBg" @click="cancelrdwc"></div>
<div
class="rdwcDialog"
v-show="isShowrdwcDialogBg"
@click="cancelrdwc"
></div>
<div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看,是否确认认定完成?</div>
<div class="rdwcbtns">
......@@ -136,7 +149,7 @@ export default {
LTCandidate,
ImageEd
},
data () {
data() {
return {
qid: null,
radio: 6,
......@@ -161,12 +174,12 @@ export default {
isShowrdwcDialog: false
};
},
created () {
created() {
this.qid = this.$route.query.rowData;
console.log("源qid====>", this.qid);
},
watch: {
phone (newValue, oldValue) {
phone(newValue, oldValue) {
if (newValue.length < 7) {
this.isPhoneError = true;
document
......@@ -186,7 +199,7 @@ export default {
* @param {*}
* @return {*}
*/
confirmrdwc () {
confirmrdwc() {
let self = this;
this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false;
......@@ -228,7 +241,7 @@ export default {
* @param {*}
* @return {*}
*/
cancelrdwc () {
cancelrdwc() {
this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false;
},
......@@ -237,7 +250,7 @@ export default {
* @param {*}
* @return {*}
*/
cancelbz () {
cancelbz() {
this.isShowbzDialogBg = false;
this.isShowbzDialog = false;
},
......@@ -246,7 +259,7 @@ export default {
* @param {*}
* @return {*}
*/
confirmbz () {
confirmbz() {
let self = this;
console.log("比中");
let affirmstatus = "1";
......@@ -302,7 +315,7 @@ export default {
* @param {*}
* @return {*}
*/
getUserInfo2 () {
getUserInfo2() {
let self = this;
let destbarcode = sessionStorage.getItem("destbarcode") || "";
console.log(destbarcode);
......@@ -323,7 +336,7 @@ export default {
* @param {*} id
* @return {*}
*/
getUserInfo (id = 1234) {
getUserInfo(id = 1234) {
let self = this;
this.$axios({
method: "post",
......@@ -354,7 +367,7 @@ export default {
* @param {*}
* @return {*}
*/
Bz () {
Bz() {
this.getUserInfo();
this.getUserInfo2();
this.asjbh = sessionStorage.getItem("srcbarcode");
......@@ -369,7 +382,7 @@ export default {
* @param {*}
* @return {*}
*/
Rdwc () {
Rdwc() {
console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || "";
......@@ -396,7 +409,7 @@ export default {
* @param {*} code
* @return {*}
*/
judgeZw (code) {
judgeZw(code) {
console.log(code);
switch (code) {
case 1:
......@@ -462,7 +475,7 @@ export default {
}
}
},
beforeDestroy () {
beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.$off("updateFinderSource");
}
......@@ -508,7 +521,7 @@ div {
height: 22px;
font-size: 16px;
font-weight: bold;
color: #00ccb5;
color: #00b47a;
line-height: 22px;
margin-top: 14px;
}
......
......@@ -156,11 +156,11 @@
<el-button type="info" @click="batch">批量操作</el-button>
<div class="middle">
<div class="font" @click="clearAll()">
全部数据&nbsp>
全部数据&nbsp;>
<!-- <span>共找到{{ reqParam.page.total }}</span>-->
</div>
<el-tag
style="margin-right: 10px;"
style="margin-right: 10px"
:key="index"
v-for="(tag, index) in dynamicTags"
closable
......@@ -209,18 +209,21 @@
</div>
</div>
<el-tag
style="width:100%;color:#666666;margin-top:1rem;"
style="width: 100%; color: #666666; margin-top: 1rem"
v-show="isShowTip"
>
<i class="el-icon-info" style="color:#055FE7;font-size:.9375rem"></i>
<i
class="el-icon-info"
style="color: #055fe7; font-size: 0.9375rem"
></i>
已选择
<span style="color:#055FE7">{{ selectionData.length }}</span> 项​
<span style="color: #055fe7">{{ selectionData.length }}</span> 项​
<span v-html="'&nbsp;&nbsp;'"></span>
​服务调用总计:<span v-html="'&nbsp;&nbsp;'"></span>36.4万
<el-link
type="primary"
:underline="false"
style="margin-left:1.25rem;"
style="margin-left: 1.25rem"
@click="toggleSelection()"
>清除</el-link
>
......@@ -249,13 +252,22 @@
<el-table-column prop="" label="任务号/查询号" :width="cxyrdWidth1">
<template slot-scope="scope">
<svg-icon
style="width: .875rem;height: .6875rem;margin-bottom: .125rem ;margin-left: .3125rem ;"
style="
width: 0.875rem;
height: 0.6875rem;
margin-bottom: 0.125rem;
margin-left: 0.3125rem;
"
v-if="scope.row.children || scope.row.children === null"
icon-class="tree_f"
>
</svg-icon>
<svg-icon
style="width: .8125rem;height: .375rem;margin: 0 0 .1875rem 0 ;"
style="
width: 0.8125rem;
height: 0.375rem;
margin: 0 0 0.1875rem 0;
"
v-else-if="!scope.row.children || scope.row.children !== null"
icon-class="tree_c"
></svg-icon>
......@@ -279,27 +291,32 @@
:label="item.colume"
:prop="item.prop"
:width="item.width"
:sortable="
item.prop == 'affirmtime' || item.prop == 'requestdatetime'
? true
: false
"
>
<template slot-scope="scope">
<template v-if="item.prop === 'querytype'">
<div v-if="scope.row.querytype === '3'" style="color: #FFA219">
<div v-if="scope.row.querytype === '3'" style="color: #ffa219">
{{ scope.row.queryTypeName }}
</div>
<div
v-else-if="scope.row.querytype === '0'"
style="color: #005FE7"
style="color: #005fe7"
>
{{ scope.row.queryTypeName }}
</div>
<div
v-else-if="scope.row.querytype === '1'"
style="color:#E60012 "
style="color: #e60012"
>
{{ scope.row.queryTypeName }}
</div>
<div
v-else-if="scope.row.querytype === '2'"
style="color:#08BD9E"
style="color: #00b47a"
>
{{ scope.row.queryTypeName }}
</div>
......@@ -348,12 +365,12 @@
class="img"
@click="edit(scope.row)"
type="text"
style="font-size:1.5rem"
style="font-size: 1.5rem"
v-if="scope.row.barcode"
>
<i>
<img
style="width:1rem;height:1rem;cursor: pointer;"
style="width: 1rem; height: 1rem; cursor: pointer"
:src="editUrl"
alt
/>
......@@ -364,11 +381,11 @@
class="img"
@click.stop="delOne(scope.row.qqid)"
type="text"
style="font-size:1.5rem"
style="font-size: 1.5rem"
>
<i>
<img
style="width:.75rem;height:.875rem;cursor: pointer;"
style="width: 0.75rem; height: 0.875rem; cursor: pointer"
:src="delUrl"
alt
/>
......@@ -631,6 +648,18 @@ export default {
item => item.value !== value
);
} else {
//点击优先级先清除优先级的按钮在添加
if (type == "queryclasss") {
this.queryClassBtns.forEach(i => {
let listIndex = list.findIndex(j => j == i.value);
let dynamicTagsIndex = this.dynamicTags.findIndex(
j => j.name == i.name
);
if (listIndex >= 0) list.splice(listIndex, 1);
if (dynamicTagsIndex >= 0)
this.dynamicTags.splice(dynamicTagsIndex, 1);
});
}
list.push(value);
this.dynamicTags.push(data);
}
......@@ -921,7 +950,7 @@ export default {
}
});
this.dynamicTags = newdynamicTags;
this.reqParam.contrastCustomSearchReq.querytypes = [];
this.$set(this.reqParam.contrastCustomSearchReq, "querystates", []);
this.search();
},
showHistory() {
......
......@@ -62,8 +62,8 @@ $phone: var(--phone, #606266); //#ff4242;
color: #055fe7;
}
&:active {
border: 1px solid #044CB9;
color: #044CB9;
border: 1px solid #044cb9;
color: #044cb9;
}
}
.rdwccancel {
......@@ -71,12 +71,12 @@ $phone: var(--phone, #606266); //#ff4242;
background: #055fe7;
color: #ffffff;
&:hover {
background: #377FEC;
color: #FFFFFF;
background: #377fec;
color: #ffffff;
}
&:active {
background: #044CB9;
color: #FFFFFF;
background: #044cb9;
color: #ffffff;
}
}
}
......@@ -144,14 +144,14 @@ $phone: var(--phone, #606266); //#ff4242;
font-size: 14px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #FFA219;
color: #ffa219;
}
.dot {
margin-bottom: 2px;
margin-right: 5px;
width: 6px;
height: 6px;
background: #FFA219;
background: #ffa219;
border-radius: 50%;
}
}
......@@ -196,7 +196,7 @@ $phone: var(--phone, #606266); //#ff4242;
right: 36px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #FF3745;
color: #ff3745;
}
.input-error {
position: absolute;
......@@ -257,7 +257,8 @@ $phone: var(--phone, #606266); //#ff4242;
align-items: center;
margin-left: 287px;
margin-top: 30px;
.bzconfirm,.bzcancel {
.bzconfirm,
.bzcancel {
cursor: pointer;
display: flex;
justify-content: center;
......@@ -273,14 +274,14 @@ $phone: var(--phone, #606266); //#ff4242;
}
.bzcancel {
margin-left: 24px;
background: #055FE7;
color: #FFFFFF;
background: #055fe7;
color: #ffffff;
}
}
}
}
.detail{
.detail {
z-index: 1000;
position: absolute;
display: flex;
......@@ -288,21 +289,24 @@ $phone: var(--phone, #606266); //#ff4242;
text-align: center;
//justify-content:center;
//top: auto;
top: calc(50% - 470px);
left: calc(50% - 225px);
.head-title{
width: 450px;
height: 28px;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
height: 100vh;
.head-title {
width: calc(50vh - 35px);
height: 30px;
font-size: 16px;
font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
font-weight: bold;
color: #333333;
line-height: 28px;
line-height: 30px;
}
.finger{
.finger {
box-sizing: border-box;
border: #001e33 1px solid;
width: 450px;
height: 450px;
width: calc(50vh - 35px);
height: calc(50vh - 35px);;
margin-bottom: 20px;
}
}
......@@ -7,25 +7,25 @@
<div class="faces">
<div class="face_div">
<div class="face">
<img class="img" src="@/assets/img/face.gif" />
<img class="img" src="@/assets/img/zzjz/zmjz.gif" />
</div>
<div class="face_label">正面</div>
</div>
<div class="face_div">
<div class="face">
<img class="img" src="@/assets/img/leftface.gif" />
<img class="img" src="@/assets/img/zzjz/zcjz.gif" />
</div>
<div class="face_label">左侧面</div>
</div>
<div class="face_div">
<div class="face">
<img class="img" src="@/assets/img/rightface.gif" />
<img class="img" src="@/assets/img/zzjz/yljz.gif" />
</div>
<div class="face_label">右侧面</div>
</div>
<div class="face_div">
<div class="face">
<img class="img-idcard" src="@/assets/img/idcard.gif" />
<img class="img-idcard" src="@/assets/img/zzjz/ID.gif" />
</div>
<div class="face_label">身份证照</div>
</div>
......@@ -38,25 +38,25 @@
<div class="faces">
<div class="face_div">
<div class="face">
<img class="img" src="@/assets/img/face.gif" />
<img class="img" src="@/assets/img/zzjz/zmjz.gif" />
</div>
<div class="face_label">正面</div>
</div>
<div class="face_div">
<div class="face">
<img class="img" src="@/assets/img/leftface.gif" />
<img class="img" src="@/assets/img/zzjz/zcjz.gif" />
</div>
<div class="face_label">左侧面</div>
</div>
<div class="face_div">
<div class="face">
<img class="img" src="@/assets/img/rightface.gif" />
<img class="img" src="@/assets/img/zzjz/yljz.gif" />
</div>
<div class="face_label">右侧面</div>
</div>
<div class="face_div">
<div class="face">
<img class="img-idcard" src="@/assets/img/idcard.gif" />
<img class="img-idcard" src="@/assets/img/zzjz/ID.gif" />
</div>
<div class="face_label">身份证照</div>
</div>
......@@ -123,10 +123,10 @@ div {
/*-webkit-text-fill-color: transparent;*/
}
.img {
margin-top: 30%;
margin-top: 15%;
}
.img-idcard {
margin-top: 40%;
margin-top: 5%;
}
.tt_face_dest_label {
width: 40px;
......
<!--
* @Author: your name
* @Date: 2021-10-23 17:43:14
* @LastEditTime: 2021-10-29 21:05:13
* @LastEditors: your name
* @LastEditTime: 2021-11-10 17:38:25
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\modules\TTPlam.vue
-->
......@@ -12,7 +12,7 @@
<div class="slabel">源数据</div>
<br />
<div class="palm">
<img class="img" src="@/assets/img/handleft.gif" />
<img class="img" src="@/assets/img/zzjz/zsjz.gif" />
</div>
<br />
<div class="left">左掌</div>
......@@ -21,7 +21,7 @@
<div class="dlabel">目标数据</div>
<br />
<div class="palm">
<img class="img" src="@/assets/img/handright.gif" />
<img class="img" src="@/assets/img/zzjz/zsjz.gif" />
</div>
<br />
<div class="palm_label">右掌</div>
......
......@@ -85,8 +85,8 @@
>
</el-table-column>
<el-table-column
prop="name"
label="文件名称"
prop="index"
label="内序"
>
</el-table-column>
<!-- <el-table-column label="条码号">
......@@ -150,8 +150,8 @@
>
</el-table-column>
<el-table-column
prop="name"
label="文件名称"
prop="index"
label="内序"
>
</el-table-column>
<el-table-column
......@@ -225,7 +225,7 @@
<template slot-scope="scope">
<div
v-if='scope.row.type==0'
style="color: #ffa219;"
style="color: #fa9500;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==1'
......@@ -233,7 +233,7 @@
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==2'
style="color: #08BD9E;"
style="color: #00b47a;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==3'
......@@ -282,7 +282,7 @@
<el-table
height="550"
:data="selectArr"
ref="selection"
ref="dataTable"
@selection-change="checkRightAll"
style="width: 100%"
>
......@@ -306,7 +306,7 @@
<template slot-scope="scope">
<div
v-if='scope.row.type==0'
style="color: #ffa219;"
style="color: #fa9500;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==1'
......@@ -314,7 +314,7 @@
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==2'
style="color: #08BD9E;"
style="color: #00b47a;"
>{{scope.row.type | typeNum}}</div>
<div
v-if='scope.row.type==3'
......@@ -393,10 +393,10 @@
:modal-append-to-body="false"
>
<div v-if="showProgress">
<el-progress
<!-- <el-progress
type="circle"
:percentage="UploadPercent"
></el-progress>
></el-progress> -->
<div style="margin-top:.9375rem; margin-bottom:.9375rem;font-size: .875rem;font-family: MicrosoftYaHei;color: #909090;">正在解析指纹文件,点击“取消”可终止处理</div>
<el-button @click="abort">取 消</el-button>
</div>
......@@ -563,6 +563,16 @@ export default {
onChange (file, fileList) {
// console.log(file.raw, 2222233333)
console.log(fileList[0], 1111)
// 重复文件过滤
let existFile = fileList.slice(0, fileList.length - 1).find(f => f.name === file.name)
if (existFile) {
this.$message.error('当前文件已经存在!');
fileList.pop()
}
// 获取文件夹
// var folder = fileList[0].raw.webkitRelativePath.split("/");
// console.log('fffff', folder[0])
......@@ -574,7 +584,6 @@ export default {
var reader = new FileReader();
reader.readAsText(file);
if (this.drlx == 3) {
console.log('333333')
that.action = '/api/upload/person'
reader.onload = function () {
const reg = /\<ysxt_asjxgrybh\>(.*?)\<\/ysxt_asjxgrybh\>/
......@@ -582,7 +591,7 @@ export default {
that.$set(newlist[i], 'barcode', barcode[1])
}
} else if (this.drlx == 6) {
that.action = '/api/upload/person'
that.action = '/api/upload/case'
reader.onload = function () {
const reg = /\<ysxt_asjbh\>(.*?)\<\/ysxt_asjbh\>/
let barcode = this.result.match(reg)
......@@ -657,10 +666,71 @@ export default {
},
// 上传
submitUpload () {
// 创建一个空的FormData对象:
const formData = new FormData()
// 可以使用FormData.append来添加键/值对到表单里面;
this.nowSelectRightData.forEach((file) => {
formData.append('file', file.raw)
})
// 添加自定义参数,不传可删除
// formData.append('parentId', '49')
// formData.append('uploadType', '备料单')
// formData.append('versions', 'v4.0')
console.log('formData', formData)
// console.log('this.selectArr', this.selectArr)
// console.log('this.nowSelectRightData', this.nowSelectRightData)
this.$refs.upload.uploadFiles = this.nowSelectRightData
this.$refs.upload.submit();
// this.$refs.upload.uploadFiles = formData
// console.log('this.$refs.upload.uploadFiles', this.$refs.upload.uploadFiles)
// this.$refs.upload.submit();
// 自定义上传
// axios
// .post(this.upload.url, formData, { headers: { 'Content-Type': 'multipart/form-data', Authorization: getToken() } })
// .then(response => {
// if (response.code == 200) {
// this.upload.open = false;
// this.upload.isUploading = false;
// this.$refs.upload.clearFiles();
// this.msgSuccess('上传成功!');
// } else {
// this.$message.error(response.msg);
// }
// })
// .catch(error => {
// this.$message.error('上传失败!');
// });
// this.$axios
// .post(this.action, formData, { headers: { 'Content-Type': 'multipart/form-data' }, loading: false })
this.dialogVisible = true;
this.$axios({
method: 'post',
url: this.action,
data: formData,
loading: false
}).then(res => {
if (res.data.code === 0) {
// this.tableDate = response.data.ret.list;
// this.reqParam.page.total = response.data.ret.total;
if (this.drlx == 3 || this.drlx == 6) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
} else if (this.drlx == 9) {
this.successCount = res.data.ret.successCount
this.failCount = res.data.ret.failCount
this.showProgress = false;
}
// this.$refs.upload.clearFiles()
this.showProgress = false;
console.info("查询结果===>", res);
// this.userInfo = this.getUserInfo(this.tableDate);
} else {
this.$message.error(res.data.message);
}
});
},
// 删除文件
handleRemove (file, fileList) {
......@@ -742,12 +812,15 @@ export default {
this.nowSelectData = val;
},
checkRightAll (val) {
console.log('val', val)
// console.log('val111', val)
this.nowSelectRightData = val;
},
// 选中
handelSelect () {
// this.checkRightAll(this.nowSelectData)
// this.nowSelectRightData.push(this.nowSelectData)
this.selectArr = this.handleConcatArr(this.selectArr, this.nowSelectData)
this.nowSelectRightData = this.selectArr
this.handleRemoveTabList(this.nowSelectData, this.datas);
this.nowSelectData = [];
},
......
<template>
<div id="homepage_hero_module" class="homepage_hero_module">
<div class="video_container">
<!-- <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 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>-->
<img src="@/assets/img/login/login.gif" />
</div>
<transition name="slide_fade">
<div :style="drawerStyle" class="login_main_layer" v-if="isShow">
<transition name="login_fade">
<div v-if="loginShow">
<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 />
......@@ -42,22 +41,16 @@
</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>
</transition>
<div class="login_bottom_layer middle ">
<span class=" font_color"
>Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span
>
<span class=" font_color">Copyright&nbsp;©&nbsp;2021&nbsp;Founder</span>
</div>
</div>
</transition>
</div>
</template>
......@@ -74,8 +67,7 @@ export default {
data() {
return {
isShow: false,
loginShow: false,
isShow: true,
// drawerHeight: null,
barcgroundUrl: require("../../assets/video/login.mp4"),
barcgroundImgUrl: require("../../assets/img/login/background.png"),
......@@ -110,15 +102,18 @@ export default {
},
created() {
var me = this;
console.log(this.$refs.loginWindow);
// 动画加载时间
setTimeout(() => {
me.isShow = true;
}, 1000);
setTimeout(() => {
me.loginShow = true;
}, 3000);
// setTimeout(() => {
// me.isShow = true;
// }, 1000);
},
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");
......@@ -177,6 +172,8 @@ export default {
width: 100vw;
height: 100vh;
overflow: hidden;
background: rgba(36, 54, 76, 0.5);
position: relative;
}
.homepage_hero_module img {
width: 100%;
......@@ -224,6 +221,7 @@ video {
} */
.video_container {
height: 100%;
width: 100%;
}
.video_container .poster img,
.video_container video {
......@@ -238,30 +236,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(1000px);
opacity: 0;
}
/*.slide_fade-enter, .slide_fade-leave-to*/
/* !* .slide-fade-leave-active for below version 2.1.8 *!*/
/* {*/
/* !*transform: translateX(100%);*!*/
/* !*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,
......@@ -269,33 +267,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;!*动画名称*!*/
......@@ -307,11 +305,12 @@ video {
height: 100%;
width: 600px;
position: absolute;
right: 0;
right: -600px;
top: 0;
z-index: 4;
/*opacity: 0.5;*/
background: rgba(36, 54, 76, 0.5);
transition: all 2s;
/*background-color: #24364c;*/
}
......@@ -334,6 +333,7 @@ video {
z-index: 10;
margin-bottom: 10px;
opacity: 1;
background: rgba(36, 54, 76, 0);
}
.login_system {
......@@ -341,11 +341,13 @@ 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 {
......
......@@ -8,13 +8,13 @@
*/
const path = require("path");
// 引入等比适配插件
const px2rem = require('postcss-px2rem')
const px2rem = require("postcss-px2rem");
// 配置基本大小
const postcss = px2rem({
// 基准大小 baseSize,需要和rem.js中相同
remUnit: 16
})
});
// const CompressionPlugin = require('compression-webpack-plugin');
// const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
......@@ -107,11 +107,20 @@ module.exports = {
},
"/login": {
target: "http://47.92.226.24:3004/", // 登录
// target: "http://192.168.128.109:8765/", // 王
ws: true,
changeOrigin: true,
pathRewrite: {
"^/login": ""
}
},
"/system": {
target: "http://192.168.128.109:8765", // 湖南-王
ws: true,
changeOrigin: true,
pathRewrite: {
"^/system": ""
}
}
// 阿里
// "/api": {
......@@ -127,9 +136,7 @@ module.exports = {
css: {
loaderOptions: {
postcss: {
plugins: [
postcss
]
plugins: [postcss]
}
},
sourceMap: process.env.NODE_ENV === "development" ? true : false // 在开发环境下开启 CSS sourcemaps
......
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