Skip to content

F
founder_vue
Commit bbd1f073 by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 51e44d58 62c6c3d6
Showing with 489 additions and 326 deletions
src/assets/img/rgrd/chachong.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="210px" height="40px" viewBox="0 0 210 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 168备份 2</title>
<defs>
<linearGradient x1="97.3463649%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
<stop stop-color="#FEB344" offset="0%"></stop>
<stop stop-color="#FA9501" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-168备份-2" fill-rule="nonzero">
<polygon id="路径备份-43" fill="url(#linearGradient-1)" points="0 0 179.25 0 195 17.675 179.25 35 0 35"></polygon>
<polygon id="路径备份-47" fill="#FA9500" opacity="0.2" points="21 1 195.15 1 210 17.665 195.15 34 21 34"></polygon>
<polygon id="路径备份-51" fill="#DF8500" points="0 35 9 35 9 40"></polygon>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rgrd/chuancha.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="210px" height="40px" viewBox="0 0 210 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 168备份 3</title>
<defs>
<linearGradient x1="97.3463649%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
<stop stop-color="#5D9BFA" offset="0%"></stop>
<stop stop-color="#055FE7" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-168备份-3" fill-rule="nonzero">
<polygon id="路径备份-43" fill="url(#linearGradient-1)" points="0 0 179.25 0 195 17.675 179.25 35 0 35"></polygon>
<polygon id="路径备份-47" fill="#1B6EEC" opacity="0.199789138" points="21 1 195.15 1 210 17.665 195.15 34 21 34"></polygon>
<polygon id="路径备份-51" fill="#0056D9" points="0 35 9 35 9 40"></polygon>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rgrd/daocha.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="210px" height="40px" viewBox="0 0 210 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 168备份</title>
<defs>
<linearGradient x1="97.3463649%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
<stop stop-color="#FB6A77" offset="0%"></stop>
<stop stop-color="#E60012" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-168备份" fill-rule="nonzero">
<polygon id="路径备份-43" fill="url(#linearGradient-1)" points="0 0 179.25 0 195 17.675 179.25 35 0 35"></polygon>
<polygon id="路径备份-47" fill="#E50314" opacity="0.15" points="21 1 195.15 1 210 17.665 195.15 34 21 34"></polygon>
<polygon id="路径备份-51" fill="#CD0313" points="0 35 9 35 9 40"></polygon>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rgrd/gongjvlan.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="1920px" height="133px" viewBox="0 0 1920 133" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>形状结合备份</title>
<defs>
<path d="M0,0 L1920,0 L1920,60 L1191,60 C1185.47715,60 1181,64.4771525 1181,70 L1181,108 C1181,116.284271 1174.28427,123 1166,123 L952,123 L952,123 L756,123 C747.715729,123 741,116.284271 741,108 L741,70 C741,64.4771525 736.522847,60 731,60 L0,60 L0,60 L0,0 Z" id="path-1"></path>
<filter x="-0.6%" y="-5.7%" width="101.1%" height="117.9%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="3" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0.0196078431 0 0 0 0 0.37254902 0 0 0 0 0.905882353 0 0 0 0.08 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="形状结合备份">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
</g>
</svg>
\ No newline at end of file
src/assets/img/rgrd/zhengcha.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="210px" height="40px" viewBox="0 0 210 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 168</title>
<defs>
<linearGradient x1="97.3463649%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
<stop stop-color="#56E0B4" offset="0%"></stop>
<stop stop-color="#00B47A" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-168" fill-rule="nonzero">
<polygon id="路径备份-43" fill="url(#linearGradient-1)" points="0 0 179.25 0 195 17.675 179.25 35 0 35"></polygon>
<polygon id="路径备份-47" fill="#0AB981" opacity="0.200309" points="31 1 195.15 1 210 17.665 195.15 34 31 34"></polygon>
<polygon id="路径备份-51" fill="#049F6D" points="0 35 9 35 9 40"></polygon>
</g>
</g>
</svg>
\ No newline at end of file
src/views/Home.vue
......@@ -42,7 +42,6 @@
/>
<img
v-show="!isCollapse"
class="title"
src="../assets/img/Home/tmLogo.svg"
alt=""
/>
......
src/views/SystemManage/GroupManage.vue
......@@ -1029,10 +1029,7 @@ export default {
* @function strArr
* @param {String} str 用户组角色字符串(逗号分隔)
* @example 当用户组角色大于三个则裁剪否则不操作
* @returns {Object} 返回的对象看上图解释(obj)
* @property {object} obj - 该函数返回的对象.
* @property {array} obj.arr - 裁剪后的角色集合.
* @property {number} obj.length - 裁剪前的角色个数.
* @returns {Object} (arr: 裁剪前的对象个数 , length: 裁剪后的对象集合)
* @see 1038
*/
strArr(str) {
......@@ -1104,12 +1101,12 @@ export default {
* @function userDel
* @param {String} id 用户id
* @example 用户设置弹窗删除用户
* @property {object} axiosObect - 使用到接口的信息.
* @property {String} [axiosObect.url=http://zwpt.xzclub.top:9333/users/delUserFromGroup] 请求地址
* @property {String} [axiosObect.method=delete] 请求方式
* @property {object} axiosObect.data 请求参数
* @property {String} axiosObect.data.groupId 组id
* @property {String} axiosObect.data.userId 用户id
* @property {object} request - 使用到接口的信息.
* @property {String} [request.url=http://zwpt.xzclub.top:9333/users/delUserFromGroup] 请求地址
* @property {String} [request.method=delete] 请求方式
* @property {object} request.data 请求参数
* @property {String} request.data.groupId 组id
* @property {String} request.data.userId 用户id
* @property {object} response - 获取到的数据.
* @property {number} response.code - 状态码(200为成功).
* @property {String} response.info - success为成功.
......
src/views/cxyrd/QueryConfirm.vue
......@@ -14,7 +14,7 @@
></el-input>
</div>
<div class="display_style">
<span>用户：</span>
<span class="labelFont">用户：</span>
<el-select
class="el_select"
v-model="reqParam.contrastCustomSearchReq.userid"
......@@ -30,7 +30,7 @@
</el-select>
</div>
<div class="display_style">
<span>查询ID：</span>
<span class="labelFont">查询ID：</span>
<el-input
class="el_input"
placeholder="请输入查询ID"
......@@ -38,7 +38,7 @@
></el-input>
</div>
<div class="display_style">
<span>任务号：</span>
<span class="labelFont">任务号：</span>
<el-input
class="el_input"
placeholder="请输入任务号"
......@@ -49,7 +49,7 @@
class="display_style send_time"
style="display: flex; align-items: center"
>
<span>发送时间：</span>
<span class="labelFont">发送时间：</span>
<el-date-picker
v-model="startEndDate"
style="display: flex; align-items: center"
......@@ -77,7 +77,7 @@
</div>
<div class="width100 margin_top24_bottom24 display_style">
<div class="display_style prevent">
<label>查询类型：</label>
<label class="btnLabel">查询类型：</label>
<div v-for="(btn, index) in queryTypeBtns" :key="index">
<!-- <div-->
<!-- class="btn"-->
......@@ -111,7 +111,7 @@
</div>
<p class="shu"></p>
<div class="display_style prevent">
<label>优先级：</label>
<label class="btnLabel">优先级：</label>
<div v-for="(btn, index) in queryClassBtns" :key="index">
<div
class="btn"
......@@ -128,7 +128,7 @@
</div>
<p class="shu"></p>
<div class="display_style">
<label>是否远程：</label>
<label class="btnLabel">是否远程：</label>
<div v-for="(btn, index) in remoteFlagBtns" :key="index">
<div
class="btn"
......@@ -150,7 +150,7 @@
</div>
</div>
<div class="width100 margin_top24_bottom24 display_style">
<label class="width70">状态选择：</label>
<label class="width70 btnLabel">状态选择：</label>
<!-- -1：无效；0：等待比对；1：正在比对；9：比对出错；10：比对完成（等待认定）；11：正在认定；19：认定出错；20：认定完成（等待复核）；21：正在复核；29：复核出错；30；复合完成；99：标记删除-->
<div class="btn" @click="allQueryType()">全部</div>
<div v-for="(btn, index) in queryStateBtns" :key="index">
......@@ -1385,7 +1385,7 @@ div {
float: left;
color: #055fe7;
margin-right: 10px;
transform: translateY(3px);
transform: translateY(5px);
cursor: pointer;
> i {
margin-right: 5px;
......@@ -1613,6 +1613,11 @@ b {
/deep/.el-input__inner {
height: 32px !important;
}
.btnLabel {
font-family: HarmonyOS_Sans_SC_Medium;
color: #282f3c;
font-size: 14px;
}
.btn {
width: fit-content;
display: flex;
......@@ -1625,7 +1630,7 @@ b {
margin: 0 15px 0 12px;
font-size: 14px;
font-weight: 350;
color: #333333;
color: #666666;
cursor: pointer;
}
......
src/views/rgrd/modules/LLCandidate.vue
<template>
<div class="lt_candidate">
<div class="lt_cnadidate_search">
<!-- <el-dropdown trigger="click" @command="choose">-->
<!-- <span class="el-dropdown-link">-->
<!-- 指纹-->
<!-- <i style=" width: 1rem; height: 1rem" class="el-icon-caret-bottom"></i>-->
<!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item command="1">指纹</el-dropdown-item>-->
<!-- <el-dropdown-item command="2">掌纹</el-dropdown-item>-->
<!-- &lt;!&ndash; <div class="label" @click="choose(1)">指纹</div>-->
<!-- <div class="label" @click="choose(2)">掌纹</div> &ndash;&gt;-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- 指纹下拉框-->
<!-- <el-input-->
<!-- placeholder="请输入内容"-->
<!-- v-model="input3"-->
<!-- class="input-with-select"-->
<!-- >-->
<!-- <el-select v-model="select" slot="prepend" placeholder="请选择">-->
<!-- <el-option label="指纹" value="1"></el-option>-->
<!-- <el-option label="掌纹" value="2"></el-option>-->
<!-- </el-select>-->
<!-- <el-button slot="append" @click="search">筛选</el-button>-->
<!-- </el-input>-->
</div>
<div class="lt_candidate_number">
<el-table
:highlight-current-row="isDelete ? false : true"
......@@ -1184,7 +1158,6 @@ const candidates = [
box-sizing: border-box;
width: 100%;
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
div {
display: inline-block;
......@@ -1308,7 +1281,7 @@ const candidates = [
.lt_candidate_bottom {
position: absolute;
bottom: 12px;
bottom: 0px;
left: 20px;
text-align: center;
width: 352px;
......@@ -1497,7 +1470,17 @@ const candidates = [
font-weight: normal;
}
}
.el-table {
/deep/ .has-gutter {
.cell {
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c;
}
}
&::before {
display: none;
}
}
// 在表格显示暂无数据时，去掉白色背景
/deep/ .el-table,
/deep/ .el-table__expanded-cell {
......
src/views/rgrd/modules/LLSrc.vue
<template>
<div class="lt_src">
<div class="lt_top">
<!-- <label>任务号：{{ tableData.qid }}</label> -->
<label class="rwh">任务号：{{ rwh }}</label>
<el-checkbox v-model="checked">显示已认定完成查询ID</el-checkbox>
</div>
<div class="lt_middle">
<!-- 源数据区 -->
<div class="lt_middle_src_data">
<el-table
ref="singleTable"
highlight-current-row
@current-change="handleCurrentChange"
:data="dataList"
class="lt_candidate_table border_radius tableHeight"
......@@ -91,9 +85,7 @@
>
{{ Number(item.seq + 1) &lt; 11 ? ("0" + Number(item.seq)) : Number(item.seq) }}
</div>
<img
:src="'data:image/jpeg;base64,' + item.image"
/>
<img :src="'data:image/jpeg;base64,' + item.image" />
<div class="finger-tips">
<!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus == 1">
......@@ -546,14 +538,14 @@ export default {
document
.getElementsByTagName("body")[0]
.style.setProperty("--tableHeight", "48.75rem");
this.tableHeight = "48.75rem"
this.tableHeight = "48.75rem";
this.options = "折叠";
$(".ico").css("transform", "rotate(180deg)");
} else {
document
.getElementsByTagName("body")[0]
.style.setProperty("--tableHeight", "20rem");
this.tableHeight = "20rem"
this.tableHeight = "20rem";
this.options = "展开";
$(".ico").css("transform", "rotate(0deg)");
}
......@@ -629,7 +621,9 @@ const datas = [
.lt_src {
width: 100%;
height: 100%;
border-radius: 0px 20px 0px 0px;
box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
overflow: hidden;
div {
display: inline-block;
}
......@@ -672,8 +666,10 @@ const datas = [
.lt_middle_src_data {
border-radius: 8px;
width: 100%;
height: 320px;
height: 120px;
.cell {
padding: 0 20px;
}
.Bizhong {
.cell {
color: #ff0039;
......@@ -701,13 +697,12 @@ const datas = [
.lt_middle_finger_print {
background-color: #f6f8fa;
width: 100%;
position: relative;
.btns-switch {
display: flex;
align-items: center;
margin-top: 13px;
margin-left: 47px;
justify-content: center;
.btn {
cursor: pointer;
width: 129px;
......@@ -719,7 +714,10 @@ const datas = [
justify-content: center;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #282f3c;
color: #055fe7;
font-family: HarmonyOS_Sans_SC_Medium;
border: 1px solid #055fe7;
margin: 0 10px;
}
.active {
......@@ -738,21 +736,23 @@ const datas = [
margin-top: 12px;
overflow-y: auto;
width: 100%;
height: 400px;
height: 630px;
}
}
/*底部的统计数据*/
.lt_middle_bottom {
text-align: center;
background-color: #f6f8fa;
height: 40px !important;
line-height: 40px;
width: 100%;
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #999;
position: absolute;
bottom: -40px;
left: 50%;
transform: translateX(-50%);
span {
span {
color: #666;
......@@ -1246,7 +1246,19 @@ $tableHeight: var(--tableHeight, 320px);
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
.el-table {
height: 120px !important;
/deep/ .has-gutter {
.cell {
font-family: HarmonyOS_Sans_SC_Medium !important;
padding: 0 20px;
color: #282f3c;
}
}
&::before {
display: none;
}
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #dadde0;
......@@ -1295,5 +1307,6 @@ del {
.hui {
color: #c2c4c7 !important;
background-color: #ecedf1 !important;
border: none !important;
}
</style>
src/views/rgrd/modules/LTCandidate.vue
......@@ -1306,7 +1306,6 @@ const candidates = [
box-sizing: border-box;
width: 100%;
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
div {
......@@ -1436,7 +1435,7 @@ const candidates = [
.lt_candidate_bottom {
position: absolute;
bottom: 32px;
bottom: 5px;
left: 20px;
text-align: center;
width: 352px;
......@@ -1556,6 +1555,11 @@ const candidates = [
}
</style>
<style scoped lang="scss">
.el-table {
&::before {
display: none;
}
}
.el-table /deep/ {
.el-table__body-wrapper {
height: 693px;
......@@ -1620,11 +1624,16 @@ const candidates = [
// 表头
/deep/ .has-gutter {
.el-table_2_column_3 {
border-radius: 20px 0px 0px 0px;
}
font-weight: normal;
.cell {
font-family: HarmonyOS_Sans_SC_Medium;
}
th {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
font-family: HarmonyOS_Sans_SC_Medium;
color: #282f3c;
font-weight: normal;
}
......
src/views/rgrd/modules/LTSrc.vue
......@@ -5,7 +5,6 @@
<div class="lt_middle_src_data">
<el-table
ref="singleTable"
highlight-current-row
@current-change="handleCurrentChange"
:data="dataList"
class="lt_candidate_table border_radius tableHeight"
......@@ -557,14 +556,14 @@ export default {
document
.getElementsByTagName("body")[0]
.style.setProperty("--tableHeight", "48.75rem");
this.tableHeight = "48.75rem"
this.tableHeight = "48.75rem";
this.options = "折叠";
$(".ico").css("transform", "rotate(180deg)");
} else {
document
.getElementsByTagName("body")[0]
.style.setProperty("--tableHeight", "20rem");
this.tableHeight = "20rem"
this.tableHeight = "20rem";
this.options = "展开";
$(".ico").css("transform", "rotate(0deg)");
}
......@@ -690,12 +689,29 @@ const datas = [
background: #ffffff;
border-radius: 8px;
}
.el-table {
height: 120px !important;
.has-gutter {
.el-table_1_column_2 {
border-radius: 0px 20px 0px 0px;
}
.cell {
font-family: HarmonyOS_Sans_SC_Medium !important;
padding: 0 20px;
color: #282f3c;
}
}
&::before {
display: none;
}
}
.lt_middle_src_data {
border-radius: 8px;
width: 100%;
height: 320px;
padding-top: 35px;
height: 120px;
.cell {
padding: 0 20px;
}
.Bizhong {
.cell {
color: #ff0039;
......@@ -723,14 +739,14 @@ const datas = [
.lt_middle_finger_print {
background-color: #f6f8fa;
width: 100%;
box-sizing: border-box;
margin: 0;
.btns-switch {
display: flex;
align-items: center;
margin-top: 13px;
margin-left: 47px;
justify-content: center;
background-color: #f6f8fa;
.btn {
cursor: pointer;
width: 129px;
......@@ -741,17 +757,18 @@ const datas = [
align-items: center;
justify-content: center;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #282f3c;
color: #055fe7;
font-family: HarmonyOS_Sans_SC_Medium;
border: 1px solid #055fe7;
margin: 0 10px;
}
.active {
width: 129px;
height: 32px;
background: #055fe7;
border-radius: 2px;
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
font-family: HarmonyOS_Sans_SC_Medium;
color: #ffffff;
}
}
......@@ -761,7 +778,7 @@ const datas = [
margin-top: 12px;
overflow-y: auto;
width: 100%;
height: 390px;
height: 630px;
.finger_print_number_active {
background: #055fe7;
}
......@@ -771,7 +788,7 @@ const datas = [
/*底部的统计数据*/
.lt_middle_bottom {
text-align: center;
background: #f6f8fa;
background: #ffffff;
height: 40px !important;
line-height: 40px;
width: 100%;
......@@ -1339,5 +1356,6 @@ del {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #aeafb4 !important;
border: none !important;
}
</style>
src/views/rgrd/modules/TLCandidate.vue
......@@ -298,7 +298,6 @@ export default {
.tl-candidate {
width: 100%;
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
position: relative;
......@@ -438,7 +437,17 @@ export default {
font-weight: normal;
}
}
.el-table {
&::before {
display: none;
}
/deep/ .has-gutter {
.cell {
font-family: HarmonyOS_Sans_SC_Medium !important;
color: #282f3c;
}
}
}
// 在表格显示暂无数据时，去掉白色背景
/deep/.el-table,
/deep/.el-table__expanded-cell {
......
src/views/rgrd/modules/TLSrc.vue
......@@ -5,17 +5,11 @@
<div class="data lt_middle_src_data">
<el-table
ref="singleTable"
highlight-current-row
@current-change="handleCurrentChange"
:data="dataList"
class="lt_candidate_table border_radius tableHeight"
:row-class-name="tableRowClassName"
>
<el-table-column
prop="qqid"
label="查询ID"
:width="width1"
></el-table-column>
<el-table-column prop="barcode" label="源条码号" width="auto">
<template slot-scope="scope">
<!-- 被删除-->
......@@ -743,9 +737,9 @@ export default {
data: {
barcode: self.barcode,
querytype: "1",
qqid: self.qqid
}
}).then(res => {
qqid: self.qqid,
},
}).then((res) => {
console.log(res);
if (res.data.code === 0) {
self.handList.forEach((item) => {
......@@ -1890,10 +1884,11 @@ label {
.main {
width: 100%;
height: 100%;
padding-top: 35px;
background: #ffffff;
border-radius: 8px;
overflow: hidden;
box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
border-radius: 0px 20px 0px 0px;
.data {
width: 100%;
}
......@@ -1918,7 +1913,22 @@ label {
}
.lt_middle_src_data {
height: 215px;
height: 125px;
.el-table {
/deep/ .has-gutter {
.cell {
font-family: HarmonyOS_Sans_SC_Medium !important;
padding: 0 20px;
color: #282f3c;
}
}
/deep/ .cell {
padding: 0 20px;
}
&::before {
display: none !important;
}
}
.lt_middle_bottom {
margin-top: -10px;
display: flex;
......@@ -1956,17 +1966,17 @@ label {
.finger-print {
width: 352px;
height: 600px;
height: 680px;
background: #f6f8fa;
position: relative;
.btns {
width: 272px;
width: 100%;
height: 32px;
margin: 12px 0 12px 41px;
margin: 12px 0 12px 0px;
background-color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
.btn {
cursor: pointer;
width: 90px;
......@@ -1975,11 +1985,14 @@ label {
background: #ffffff;
border-radius: 2px;
text-align: center;
&:active {
background: #055fe7;
color: #ffffff;
}
color: #055fe7;
font-family: HarmonyOS_Sans_SC_Medium;
border: 1px solid #055fe7;
margin: 0 7px;
// &:active {
// background: #055fe7;
// color: #ffffff;
// }
&.active {
background: #055fe7;
......@@ -1995,6 +2008,7 @@ label {
.isHasData {
background-color: #ecedf1;
color: #aeafb4;
border: none;
}
}
......@@ -2011,8 +2025,7 @@ label {
height: 230px;
width: 100%;
margin: 0;
.label {
label {
width: 28px;
height: 22px;
font-size: 14px;
......@@ -2490,13 +2503,15 @@ label {
.bottom {
text-align: center;
background: #f6f8fa;
//height: 40px;
width: 100%;
font-size: 12px;
font-family: HarmonyOS_Sans_SC;
color: #999999;
margin-top: 0;
position: absolute;
bottom: -34px;
left: 50%;
transform: translateX(-50%);
.expend {
font-size: 12px;
......
src/views/rgrd/rgLL.vue
......@@ -626,7 +626,6 @@ div {
background-color: #ffffff;
/*padding: 24px;*/
margin: 0;
padding: 0 24px 24px 24px;
display: flex;
flex-direction: column;
/deep/.el-table__body-wrapper.is-scrolling-none {
......@@ -641,6 +640,7 @@ div {
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 25px;
.label {
align-self: flex-start;
height: 22px;
......@@ -706,12 +706,13 @@ div {
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.lt_main_left {
width: 352px;
border: none;
/* margin-right: 16px; */
margin-top: 18px;
margin-top: 13px;
}
.lt_main_middle {
width: 1120px;
......@@ -732,10 +733,12 @@ div {
border: 1px #8b4513 solid;
}
.lt_main_right {
margin-top: 50px;
margin-top: 13px;
margin-left: 16px;
width: 380px;
border: none;
border-radius: 20px 0px 0px 0px;
box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
}
.lt_main_footer {
......
src/views/rgrd/rgTL.vue
......@@ -406,7 +406,7 @@ export default {
this.isShowbzDialog = true;
},
Rdwc() {
this.$message.success('认定完成')
this.$message.success("认定完成");
},
hideDialog() {
this.dialog = true;
......@@ -569,7 +569,6 @@ div {
// background-color: #ffffff;
/*padding: 24px;*/
margin: 0;
padding: 0 24px 24px 24px;
display: flex;
flex-direction: column;
}
......@@ -580,6 +579,7 @@ div {
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 25px;
.label {
align-self: flex-start;
height: 22px;
......@@ -631,7 +631,7 @@ div {
width: 352px;
border: none;
/* margin-right: 16px; */
margin-top: 18px;
margin-top: 13px;
//border: none;
}
.main-middle {
......@@ -642,10 +642,13 @@ div {
margin-left: -10px;
}
.main-right {
margin-top: 50px;
margin-top: 13px;
margin-left: 20px;
width: 380px;
border: none;
border-radius: 20px 0 0 0;
overflow: hidden;
box-shadow: 0px 4px 10px 0px rgba(5, 95, 231, 0.3);
}
}
/deep/.el-dialog {
......
static/doc/GroupManage.vue.html
......@@ -1073,10 +1073,7 @@ export default {
* @function strArr
* @param {String} str 用户组角色字符串(逗号分隔)
* @example 当用户组角色大于三个则裁剪否则不操作
* @returns {Object} 返回的对象看上图解释(obj)
* @property {object} obj - 该函数返回的对象.
* @property {array} obj.arr - 裁剪后的角色集合.
* @property {number} obj.length - 裁剪前的角色个数.
* @returns {Object} (arr: 裁剪前的对象个数 , length: 裁剪后的对象集合)
* @see 1038
*/
strArr(str) {
......@@ -1148,12 +1145,12 @@ export default {
* @function userDel
* @param {String} id 用户id
* @example 用户设置弹窗删除用户
* @property {object} axiosObect - 使用到接口的信息.
* @property {String} [axiosObect.url=http://zwpt.xzclub.top:9333/users/delUserFromGroup] 请求地址
* @property {String} [axiosObect.method=delete] 请求方式
* @property {object} axiosObect.data 请求参数
* @property {String} axiosObect.data.groupId 组id
* @property {String} axiosObect.data.userId 用户id
* @property {object} request - 使用到接口的信息.
* @property {String} [request.url=http://zwpt.xzclub.top:9333/users/delUserFromGroup] 请求地址
* @property {String} [request.method=delete] 请求方式
* @property {object} request.data 请求参数
* @property {String} request.data.groupId 组id
* @property {String} request.data.userId 用户id
* @property {object} response - 获取到的数据.
* @property {number} response.code - 状态码(200为成功).
* @property {String} response.info - success为成功.
......@@ -1765,7 +1762,7 @@ export default {
<br class="clear">
<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 15:37:09 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 16:54:27 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>
<script>prettyPrint();</script>
......
static/doc/UserManage.vue.html
......@@ -1357,7 +1357,7 @@ export default {
<br class="clear">
<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 15:37:09 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 16:54:27 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>
<script>prettyPrint();</script>
......
static/doc/index.html
......@@ -68,7 +68,7 @@
<br class="clear">
<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 15:37:09 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 16:54:27 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>
<script>prettyPrint();</script>
......
static/doc/module-UserManage.html
......@@ -236,7 +236,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>点击批量操作后的方法</code></pre>
......@@ -332,7 +332,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>关闭新增弹窗</code></pre>
......@@ -428,7 +428,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>关闭修改弹窗</code></pre>
......@@ -524,7 +524,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>清空所有筛选条件并更新用户表格数据</code></pre>
......@@ -620,14 +620,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>单个删除用户</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -765,7 +765,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>批量删除用户</code></pre>
......@@ -861,14 +861,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>回显要编辑的人员信息</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -1006,14 +1006,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>当期页发生变化</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -1151,14 +1151,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>将勾选的用户对象保存起来</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -1296,14 +1296,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>每页展示数量发生变化</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -1441,7 +1441,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>取消批量操作状态，删除所有选中的用户</code></pre>
......@@ -1537,7 +1537,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>打开新增弹窗</code></pre>
......@@ -1633,14 +1633,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>打开编辑弹窗</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -1778,14 +1778,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>重置对应的form表单</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -1923,14 +1923,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>筛选用户表格数据</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -2071,14 +2071,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>当用户角色大于三个则裁剪否则不操作</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -2238,7 +2238,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>编辑用户</code></pre>
......@@ -2334,7 +2334,7 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>新增用户</code></pre>
......@@ -2430,14 +2430,14 @@
<h5>描述</h5>
<h5>方法描述</h5>
<pre class="prettyprint"><code>如果用户对象存在则选中否则清空</code></pre>
<h5>参数:</h5>
<h5>方法参数:</h5>
<table class="params">
......@@ -2524,7 +2524,7 @@
<br class="clear">
<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 15:37:09 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.7</a> on Fri Jan 07 2022 16:54:27 GMT+0800 (中国标准时间) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>
<script>prettyPrint();</script>
......
static/docdash/tmpl/container.tmpl
......@@ -61,7 +61,7 @@
<?js } ?>
<?js if (doc.examples && doc.examples.length) { ?>
<h3>描述<?js= doc.examples.length > 1? 's':'' ?></h3>
<h3>方法描述<?js= doc.examples.length > 1? 's':'' ?></h3>
<?js= self.partial('examples.tmpl', doc.examples) ?>
<?js } ?>
<?js } ?>
......
static/docdash/tmpl/details.tmpl
......@@ -140,7 +140,7 @@ if (data.defaultvalue && (data.defaultvaluetype === 'object' || data.defaultvalu
if (properties && properties.length && properties.forEach) {
?>
<h5 class="subsection-title">对象注解:</h5>
<h5 class="subsection-title">接口对象:</h5>
<?js= this.partial('properties.tmpl', data) ?>
......
static/docdash/tmpl/members.tmpl
......@@ -34,7 +34,7 @@ var self = this;
<?js } ?>
<?js if (data.examples && examples.length) { ?>
<h5>描述<?js= examples.length > 1? 's':'' ?></h5>
<h5>方法描述<?js= examples.length > 1? 's':'' ?></h5>
<?js= this.partial('examples.tmpl', examples) ?>
<?js } ?>
</div>
static/docdash/tmpl/method.tmpl
......@@ -53,12 +53,12 @@ var self = this;
<?js } ?>
<?js if (data.examples && examples.length) { ?>
<h5>描述<?js= examples.length > 1? 's':'' ?></h5>
<h5>方法描述<?js= examples.length > 1? 's':'' ?></h5>
<?js= this.partial('examples.tmpl', examples) ?>
<?js } ?>
<?js if (data.params && params.length) { ?>
<h5>参数:</h5>
<h5>方法参数:</h5>
<?js= this.partial('params.tmpl', params) ?>
<?js } ?>
......
static/docdash/tmpl/properties.tmpl
......@@ -47,10 +47,6 @@
<th>类型</th>
<?js if (props.hasAttributes) {?>
<th>Attributes</th>
<?js } ?>
<?js if (props.hasDefault) {?>
<th>Default</th>
<?js } ?>
......@@ -77,18 +73,6 @@
<?js } ?>
</td>
<?js if (props.hasAttributes) {?>
<td class="attributes">
<?js if (prop.optional) { ?>
&lt;optional><br>
<?js } ?>
<?js if (prop.nullable) { ?>
&lt;nullable><br>
<?js } ?>
</td>
<?js } ?>
<?js if (props.hasDefault) {?>
<td class="default">
<?js if (typeof prop.defaultvalue !== 'undefined') { ?>
......
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