Skip to content

F
founder_vue
Commit 77eddc99 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 0afe8c62 8388b47f
Showing with 384 additions and 141 deletions
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-15 21:12:58
* @LastEditTime: 2021-11-24 17:21:02
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -14,7 +14,12 @@
<script>
import zoom from "./utils/autosize";
export default {};
export default {
mounted() {
//所在单位数据
this.$store.dispatch("publicData/_getList");
},
};
</script>
<style lang="scss">
......
src/assets/styles/main.scss
// 参考文档：https://element.faas.ele.me/#/zh-CN/component/color#fu-zhu-se
* {
padding: 0;
margin: 0;
box-sizing: border-box;
padding: 0;
margin: 0;
box-sizing: border-box;
}
.disabel {
border: none !important;
background-color: #ecedf1 !important;
color: #c2c4c7 !important;
}
//主色调，红色：#FF0036，绿色 #4CAF50，蓝色：#03A9F4，黄色：#FF9800，粉色：#FF547B，棕色：#C3A769，浅绿色：#65C4AA，黑色：#333333，紫色：#B323B4，淡粉色：#FF8B8B,element UI：#409eff
$base-color: #03A9F4;
$base-color: #03a9f4;
$base-color-success: #4caf50;
$base-color-warning: #e6a23c;
$base-color-danger: #f56c6c;
......@@ -25,47 +29,48 @@ $width: 1210px;
// 小
.ns-font-size-sm {
font-size: $ns-font-size-sm;
font-size: $ns-font-size-sm;
}
// 标准
.ns-font-size-base {
font-size: $ns-font-size-base;
font-size: $ns-font-size-base;
}
// 标准
.ns-font-size-lg {
font-size: $ns-font-size-lg;
font-size: $ns-font-size-lg;
}
//文字颜色
.ns-text-color {
color: $base-color !important;
color: $base-color !important;
}
.ns-text-color-black {
color: $ns-text-color-black !important;
color: $ns-text-color-black !important;
}
//边框
.ns-border-color {
border-color: $base-color !important;
border-color: $base-color !important;
}
//背景色
.ns-bg-color {
background-color: $base-color !important;
background-color: $base-color !important;
}
body {
line-height: 1.8;
font-family: 'Helvetica Neue', Helvetica, 'MicrosoftYaHei', 'PingFang SC', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
background-color: #f7f7f7;
font-size: $ns-font-size-base;
color: $ns-text-color-black;
line-height: 1.8;
font-family: "Helvetica Neue", Helvetica, "MicrosoftYaHei", "PingFang SC", "Hiragino Sans GB", "WenQuanYi Micro Hei",
sans-serif;
background-color: #f7f7f7;
font-size: $ns-font-size-base;
color: $ns-text-color-black;
}
#nprogress .bar {
background: $base-color !important; //自定义颜色
background: $base-color !important; //自定义颜色
}
html,
......@@ -82,8 +87,8 @@ h4,
h5,
h6,
p {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}
article,
aside,
......@@ -96,42 +101,42 @@ hgroup,
menu,
nav,
section {
display: block;
display: block;
}
ol,
ul,
li {
list-style: none;
list-style: none;
}
i,
em {
font-style: normal;
font-style: normal;
}
// 去掉a标签的默认样式
a {
text-decoration: none;
color: $ns-text-color-black;
&:hover {
color: $base-color;
}
text-decoration: none;
color: $ns-text-color-black;
&:hover {
color: $base-color;
}
}
.el-main {
border-top: solid 1px #f2f2f2;
overflow: initial;
width: $width;
margin: 0 auto;
padding: 0;
border-top: solid 1px #f2f2f2;
overflow: initial;
width: $width;
margin: 0 auto;
padding: 0;
}
img {
border-style: none;
max-width: 100%;
vertical-align: middle;
border-style: none;
max-width: 100%;
vertical-align: middle;
}
// 居中
.ns-text-align {
text-align: center;
text-align: center;
}
src/components/swiper.vue
<!--
* @Author: your name
* @Date: 2021-11-13 16:32:50
* @LastEditTime: 2021-11-19 14:50:32
* @LastEditors: 赵鹏龙
* @LastEditTime: 2021-11-24 16:14:47
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\swiper.vue
-->
......@@ -35,7 +35,7 @@
</p>
<p>
<span>源条码号：</span>
<span>{{ item.barcode }}</span>
<span :class="{ del: souceDel }">{{ item.barcode }}</span>
</p>
</div>
</div>
......@@ -45,7 +45,7 @@
<!-- 可以点击上一条的左侧按钮-->
<div v-show="carIndex > 0" class="left" @click="btnQiehuan('left')">
<img
style="transform: rotate(180deg);"
style="transform: rotate(180deg)"
src="@/assets/img/right.png"
alt="暂无图片"
/>
......@@ -69,7 +69,7 @@
@click="noData('right')"
>
<img
style="transform: rotate(180deg);"
style="transform: rotate(180deg)"
src="@/assets/img/left.png"
alt="暂无图片"
/>
......@@ -80,7 +80,7 @@
export default {
data() {
return {
carIndex: 0
carIndex: 0,
};
},
methods: {
......@@ -107,17 +107,27 @@ export default {
this.$refs.carousel.next();
this.$emit("next", this.carIndex);
}
}
},
},
props: {
carData: {
type: Array,
default: () => []
}
}
default: () => [],
},
souceDel: {
type: Boolean,
default: false,
},
},
};
</script>
<style lang="scss" scoped>
.del {
text-decoration: none; /*没有文本装饰*/
text-decoration: underline red; /*红色下划线*/
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
.el-carousel__item h3 {
color: #475669;
font-size: 18px;
......
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-22 15:53:22
* @LastEditTime: 2021-11-24 17:23:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -45,6 +45,7 @@ _axios.interceptors.request.use(
loadingIndex++;
}
NProgress.start();
console.log('请求前' + loadingIndex)
// 在发送请求之前做些什么
// 判断是否存在token,如果存在将每个页面header添加token
if (localStorage.getItem("token")) {
......@@ -64,7 +65,8 @@ _axios.interceptors.response.use(
function (response) {
NProgress.done();
if (loadingBoo) loadingIndex--;
if (loadingIndex == 0) {
console.log('请求后' + loadingIndex)
if (loadingIndex <= 0) {
clearTimeout(timer)
timer = setTimeout(() => {
loading && loading.close();
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -389,14 +389,7 @@
label="捺印单位："
prop="nydwGajgmc"
>
<el-input
v-model="ruleForm.nydwGajgmc"
placeholder="请输入捺印单位名称"
maxlength="100"
show-word-limit
clearable
>
</el-input>
<Cascader :form="ruleForm" id="nydwGajgmc"></Cascader>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -484,6 +477,7 @@
</template>
<script>
import Cascader from "@/components/Cascader.vue";
const targetOptions = [
"本地案件库",
"比中案件库",
......@@ -496,6 +490,9 @@ const targetOptions = [
];
export default {
name: "xzry",
components: {
Cascader
},
props: {
isShowXzry: {
type: [Number, String, Boolean],
......@@ -587,7 +584,7 @@ export default {
{ required: true, message: "请输入现住地址", trigger: "blur" },
],
nydwGajgmc: [
{ required: true, message: "请输入捺印单位", trigger: "blur" },
{ required: true, message: "请输入捺印单位", trigger: "change" },
],
nyryXm: [
{ required: true, message: "请输入捺印人员姓名", trigger: "change" },
......
src/views/SystemManage/PermissionManage.vue
......@@ -193,7 +193,7 @@
cursor: pointer;
"
src="../../assets/img/qbryk/bj.png"
@click="userEdit(scope.row.userId, scope.row.roleName)"
@click="userEdit(scope.row.id)"
/>
<!-- <img-->
<!-- style="width: 1.125rem;height: 1.125rem;cursor: pointer"-->
......@@ -653,8 +653,9 @@ export default {
searchUser() {
console.info("搜索用户列表");
this.$axios.get("/system/users").then((res) => {
console.info(res);
this.userTableData = res.data;
if (res.data.code == 200) {
this.userTableData = res.data.detail;
}
});
// // todo 多条件筛选
// this.$axios
......@@ -669,13 +670,12 @@ export default {
// .catch(failResponse => {});
},
// 编辑用户权限
userEdit(id, rolename) {
console.info("用户id=====>", id);
userEdit(id) {
this.$store.commit("layout/delcachePageName", "UserPermission");
this.$router.push({
name: "UserPermission",
params: {
path: "/UserPermission",
query: {
id: id,
rolename: rolename,
},
});
},
......@@ -693,21 +693,10 @@ export default {
// 获取用户组信息
searchGroup() {
this.$axios.get("/system/user-groups").then((res) => {
console.info(res);
this.groupTableData = res.data;
if (res.data.code == 200) {
this.groupTableData = res.data.detail;
}
});
// // 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/scss/group.scss
......@@ -363,8 +363,9 @@
.addUserDialog {
box-sizing: border-box;
position: absolute;
top: calc(50% - 257px);
left: calc(50% - 471.5px);
top: 50%;
left: 50%;
transform: translate(-40%, -50%);
z-index: 1000;
width: 890px;
height: 440px;
......@@ -475,8 +476,9 @@
.userDialog {
box-sizing: border-box;
position: absolute;
top: calc(50% - 257px);
left: calc(50% - 471.5px);
top: 50%;
left: 50%;
transform: translate(-40%, -50%);
z-index: 1000;
width: 890px;
height: 540px;
......@@ -512,11 +514,15 @@
.info {
padding: 12px 24px 12px 24px;
.header {
display: flex;
align-items: center;
justify-content: space-between;
width: 780px;
height: 45px;
padding: 0;
.btn {
width: 96px;
line-height: 32px;
height: 32px;
border-radius: 4px;
border: 1px solid #aeb5c2;
......@@ -526,6 +532,8 @@
cursor: pointer;
}
.btn-right {
display: flex;
align-items: center;
//border: 1px solid darkblue;
position: absolute;
right: 24px;
......@@ -621,7 +629,7 @@
position: absolute;
top: 50%;
left: 50%;
transform: translateX(-60%) translateY(-55%);
transform: translateX(-40%) translateY(-50%);
z-index: 1000;
width: 626px;
padding-bottom: 20px;
......@@ -705,6 +713,7 @@
> div {
width: 100%;
.label {
display: inline-block;
color: #666666;
vertical-align: top;
margin-top: 10px;
......@@ -714,12 +723,29 @@
width: 105px;
box-sizing: border-box;
}
.barlen {
padding-right: 20px !important;
}
.ziding {
.contentItem {
width: calc((100% - 75px) / 3) !important;
height: 32px !important;
border: 1px solid #aeb5c2 !important;
background-color: #fff !important;
box-shadow: none !important;
border-radius: 4px !important;
position: relative !important;
text-align: center !important;
}
}
.content {
// display: inline-table;
display: inline-block;
width: calc(100% - 105px);
max-height: 140px !important;
max-height: 94px !important;
box-sizing: border-box;
overflow: auto;
.contentItem {
display: inline-block;
width: calc((100% - 75px) / 3);
height: 32px;
background: #f6f8fa;
......@@ -743,6 +769,7 @@
position: absolute;
top: -6px;
right: -6px;
cursor: pointer;
}
}
}
......@@ -862,30 +889,33 @@
margin-left: 5px;
}
}
.addbtns {
width: 100%;
text-align: center;
.btn1 {
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
color: #2e3846;
line-height: 40px;
cursor: pointer;
margin-right: 15px;
}
.btn2 {
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
color: #ffffff;
line-height: 40px;
cursor: pointer;
}
}
.addbtns {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
text-align: center;
.btn1 {
width: 72px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
color: #2e3846;
line-height: 40px;
cursor: pointer;
margin-right: 35px;
}
.btn2 {
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
color: #ffffff;
line-height: 40px;
cursor: pointer;
}
}
src/views/SystemManage/scss/role.scss
......@@ -47,8 +47,8 @@
border: 1px solid #aeb5c2;
margin-left: 5px;
cursor: pointer;
&:hover{
border-color: #377FEC;
&:hover {
border-color: #377fec;
}
}
}
......@@ -215,7 +215,7 @@
height: 90px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
margin: 25px 20px 0 20px;
}
}
.div1 {
......@@ -223,7 +223,7 @@
height: 70px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
margin: 25px 20px 0 20px;
}
}
// 未选中字体颜色
......@@ -263,19 +263,25 @@
width: 100%;
height: 90px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
.el-checkbox {
margin: 10px 20px 0 25px;
margin: 10px 20px 0 0px;
}
.line {
height: 35px;
width: 190px;
}
}
.div1 {
width: 100%;
height: 70px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
.line {
width: 190px;
}
.el-checkbox {
margin: 25px 20px 0 25px;
margin: 25px 20px 0 0px;
}
}
......
src/views/SystemManage/scss/user.scss
......@@ -273,7 +273,9 @@
box-sizing: border-box;
position: absolute;
top: 20px;
left: calc(50% - 471.5px);
left: 50%;
top: 50%;
transform: translate(-40%, -50%);
z-index: 1000;
width: 890px;
background: #ffffff;
......
src/views/SystemManage/scss/userpermission.scss
.manage-page {
.manage-page /deep/ {
width: 100%;
padding: 24px;
padding-top: 12px;
font-family: MicrosoftYaHei;
.line {
width: 190px !important;
height: 35px !important;
.el-checkbox {
margin-left: 0 !important;
}
}
.yonghuzu {
.el-checkbox {
.el-checkbox__label {
cursor: default !important;
color: #999999;
}
.el-checkbox__inner {
position: relative;
z-index: 3;
cursor: default !important;
background-color: #ffce86;
border-color: #ffce86;
&::after {
cursor: default !important;
border-color: #fff;
}
}
}
}
.juese {
.el-checkbox {
.el-checkbox__label {
cursor: default !important;
color: #999999;
}
.el-checkbox__inner {
cursor: default !important;
background-color: #b1b6c2;
border-color: #b1b6c2;
&::after {
cursor: default !important;
border-color: #fff;
}
}
}
}
.danlan {
background-color: #f5f9fe;
}
.danhuang{
background-color: #FFFBF0;
.danhuang {
background-color: #fffbf0;
position: relative;
}
.textGreen{
color: #00AA73;
.textGreen {
color: #00aa73;
}
.textRed{
.textRed {
color: #fe0000;
}
.textBlue{
color: #055FE7;
.textBlue {
color: #055fe7;
}
.groupText{
.groupText {
position: absolute;
right: 0;
top: 0;
......@@ -29,10 +73,10 @@
font-weight: normal;
text-align: center;
box-shadow: 1px -1px 1px 0px rgba(247, 199, 116, 0.6);
background: #FFFCF4;
background: #fffcf4;
border-radius: 0px 0px 0px 15px;
color: #FF9400;
border: 1px solid #F7C774;
color: #ff9400;
border: 1px solid #f7c774;
}
.userText {
position: absolute;
......@@ -83,7 +127,7 @@
background: #ddebff;
}
&.green {
background-color: #C7EFE2;
background-color: #c7efe2;
}
.title-status {
position: relative;
......@@ -360,4 +404,128 @@
}
}
}
.is-disabled {
.el-checkbox__inner {
&::after {
border-color: #fff !important;
}
}
}
.is-checked {
.el-checkbox__inner {
background-color: #055fe7;
border-color: #055fe7;
}
.el-checkbox__label {
color: #055fe7;
}
}
.lei2 {
.is-checked {
&::after {
border-radius: 2px;
content: "";
display: inline-block;
width: 14px;
height: 14px;
position: absolute;
z-index: 2;
top: 3px;
left: 3px;
}
.el-checkbox__inner {
position: relative;
z-index: 3;
}
}
}
.lei3 {
.is-checked {
&::before {
content: "";
border-radius: 2px;
display: inline-block;
width: 14px;
height: 14px;
position: absolute;
z-index: 1;
top: 6px;
left: 6px;
}
.el-checkbox__inner {
position: relative;
z-index: 3;
}
}
}
.danhuang1 {
.is-checked {
.el-checkbox__inner {
background-color: #ffce86;
border-color: #ffce86;
}
}
}
.danhuang2 {
.is-checked {
&::after {
background-color: #ffce86;
}
}
}
.danhuang3 {
.is-checked {
&::before {
background-color: #ffce86;
}
}
}
.huise1 {
.is-checked {
.el-checkbox__inner {
background-color: #d8d8d8;
border-color: #d8d8d8;
}
}
}
.huise2 {
.is-checked {
&::after {
background-color: #d8d8d8;
}
}
}
.huise3 {
.is-checked {
&::before {
background-color: #d8d8d8;
}
}
}
.wu1 {
.is-checked {
.el-checkbox__inner {
background-color: #055fe7;
border-color: #055fe7;
}
}
}
.wu2 {
.is-checked {
&::after {
background-color: #055fe7;
}
}
}
.wu3 {
.is-checked {
&::before {
background-color: #055fe7;
}
}
}
}
// background-color: #b1b6c2;
src/views/cxyrd/TT.scss
......@@ -368,10 +368,40 @@ $phone: var(--phone, #606266); //#ff4242;
}
span {
font-size: 17px;
}
}
}
.bzActive {
filter: blur(2px);
}
.delText {
position: absolute;
bottom: -30px;
left: 50%;
width: 100%;
text-align: center;
transform: translateX(-50%);
> p {
display: flex;
align-items: center;
width: 100%;
text-align: center;
justify-content: center;
> img {
margin-right: 10px;
}
span {
margin-right: 10px;
color: #e60012;
-webkit-background-clip: text;
font-family: MicrosoftYaHei;
font-size: 16px;
}
}
}
.del {
text-decoration: none; /*没有文本装饰*/
text-decoration: underline red; /*红色下划线*/
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
src/views/login/modules/AccountsLogin.vue
......@@ -123,8 +123,7 @@ export default {
// this.getCaptcha();
console.info(err);
});
//所在单位数据
this.$store.dispatch("publicData/_getList");
// "/myLoginForm?userName=" +
// userinfo.userName +
// "&passWord=" +
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-18 14:54:43
* @LastEditTime: 2021-11-24 18:33:09
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -92,7 +92,7 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.166:8099", // 湖南-张
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.111:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
......@@ -116,8 +116,8 @@ module.exports = {
}
},
"/system": {
// target: "http://192.168.128.104:8765", // 湖南-王
target: "http://www.meetfood.cn:2390/system", // 湖南-王
target: "http://192.168.128.106:8765/security", // 湖南-王
// target: "http://www.meetfood.cn:2390/system", // 湖南-王
ws: true,
changeOrigin: true,
pathRewrite: {
......
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