Commit d037b011 by 张超军

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

parents 0ba6623d b0098973
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="8px" viewBox="0 0 14 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>路径</title>
<defs>
<radialGradient cx="0%" cy="50%" fx="0%" fy="50%" r="175%" gradientTransform="translate(0.000000,0.500000),scale(0.571429,1.000000),translate(-0.000000,-0.500000)" id="radialGradient-1">
<stop stop-color="#7ED7FF" offset="0%"></stop>
<stop stop-color="#49AFFF" offset="100%"></stop>
</radialGradient>
</defs>
<g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员工作流设置-串行交互备份" transform="translate(-768.000000, -455.000000)" fill="url(#radialGradient-1)" fill-rule="nonzero">
<path d="M776.783882,457.342107 L776.180818,455.550752 C776.006385,455.033803 776.229028,454.841214 776.684832,455.14438 L781.660116,458.450645 C782.110661,458.750126 782.115921,459.24496 781.660116,459.548126 L776.684832,462.855313 C776.234287,463.154794 776.002879,462.975105 776.180818,462.44802 L776.783882,460.656665 L768.783634,459.315914 C767.739666,459.140833 767.737912,458.857939 768.783634,458.682858 L776.783882,457.342107 Z" id="路径"></path>
</g>
</g>
</svg>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="19px" viewBox="0 0 16 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>形状备份 10</title>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#7ED7FF" offset="0%"></stop>
<stop stop-color="#48AEFF" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="人员工作流设置-串行交互备份" transform="translate(-662.000000, -443.000000)" fill="url(#linearGradient-1)" fill-rule="nonzero">
<g id="编组-4备份-3" transform="translate(662.000000, 443.000000)">
<path d="M15.5312,0.491054722 C15.2402967,0.180089589 14.8303435,0.00212861766 14.4,0 L1.60000001,0 C1.16965651,0.00212861766 0.759703314,0.180089589 0.468800006,0.491054722 C0.168,0.804827718 0,1.23155899 0,1.67554776 L0,17.1476939 C0,17.7517069 0.310400006,18.3086539 0.811199999,18.6067383 C1.30854526,18.9035297 1.93525277,18.8949948 2.424,18.5847742 L7.17760001,15.5976553 C7.67779148,15.2792707 8.32220852,15.2792707 8.82239999,15.5976553 L13.576,18.5847742 C14.0647472,18.8949948 14.6914547,18.9035297 15.1888,18.6067383 C15.6896,18.3086539 16,17.7517069 16,17.1476939 L16,1.67554776 C16,1.23155899 15.832,0.804827718 15.5312,0.491054722 Z" id="形状备份-10"></path>
</g>
</g>
</g>
</svg>
\ No newline at end of file
<?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
<?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
<?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
<?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
<?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
......@@ -14,9 +14,8 @@ export default {
return fHttp.postJson(
_path.drFptx + url,
_parameter,
{
loading: false,
fHttp.closeLoad({
onUploadProgress: onProgress
})
}))
},
}
import addrType from '../../netmgr/NetAddressType'
/**
* Description: 逻辑分库相关接口类
* @author: li_hongchao
* @date: 2022/1/5 11:33
*/
const _path = {
ryfkgl: addrType.api + '/logic/person/',
ajfkgl: addrType.api + '/logic/case/'
ajfkgl: addrType.api + '/logic/case/',
ljkyh: addrType.security + '/r-user-user-group/',
gzl: addrType.api + '/workflow/'
}
export default {
/**
* Description: 获取人员逻辑库列表信息
* @author: li_hongchao
* @date: 2022/1/5 11:32
*/
ryList(_parameter) {// 获取人员逻辑库
return fHttp.postJson(_path.ryfkgl + 'queryAll', _parameter)
},
/**
* Description: 获取案件逻辑库列表信息
* @author: li_hongchao
* @date: 2022/1/5 11:32
*/
ajList(_parameter) {// 获取案件逻辑库
return fHttp.postJson(_path.ajfkgl + 'queryAll', _parameter)
},
/**
* Description: 获取用户、用户组列表信息,用于选择逻辑库用户选择控件
* @author: li_hongchao
* @date: 2022/1/5 11:31
*/
yhList() {
return fHttp.get(_path.ljkyh + 'getUserAndUserGroup', {})
},
/**
* Description: 更新逻辑分库信息
* @author: li_hongchao
* @date: 2022/1/5 11:31
*/
updateLjfkxx(_parameter, isPerson = true) {
let path = isPerson ? _path.ryfkgl : _path.ajfkgl
return fHttp.postJson(path + 'insert', _parameter)
},
saveGzl(_parameter) {
return fHttp.postJson(_path.gzl + 'save', _parameter)
},
queryGzl(_parameter) {
return fHttp.post(_path.gzl + 'queryByLogicIdAndType', _parameter, {
headers: {'Content-Type': 'application/x-www-form-urlencoded'}
})
},
}
import axios from 'axios'
import { Message, MessageBox } from 'element-ui'
import {Message, MessageBox} from 'element-ui'
import qs from 'qs'
import { ACCESS_TOKEN } from '../store/mutation-types'
import {ACCESS_TOKEN} from '../store/mutation-types'
import router from '../router'
import { showLoading, hideLoading } from '@/utils/requestLoading'
import {showLoading, hideLoading} from '@/utils/requestLoading'
import fa from 'element-ui/src/locale/lang/fa'
// debugger
axios.defaults.timeout = 0
......@@ -13,6 +14,13 @@ axios.defaults.headers = {
}
axios.defaults.responseType = 'json'
var _HTTP_TYPE = {
LOADING: 'loading',
LOADING_TARGET: 'loadingTarget',
TIP: 'isShowTip'
}
var common = axios.create()
var instance = axios.create({// post 常规请求
......@@ -46,17 +54,18 @@ let initConfig = (config) => {
if (!window._axiosPromiseArr) {
window._axiosPromiseArr = []
}
window._axiosPromiseArr.push({ cancel })
window._axiosPromiseArr.push({cancel})
})
// 判断当前请求是否设置了不显示Loading,默认显示
if (config.loading !== false) {
showLoading(config.loadingTarget) // 如果设置了targer,使用设置的target,比如el-table
if (config[_HTTP_TYPE.LOADING] !== false) {
showLoading(config[_HTTP_TYPE.LOADING_TARGET]) // 如果设置了targer,使用设置的target,比如el-table
}
// console.log('initConfig', config)
// console.log('initConfig', config)
return config
}
let onError = (error) => {
logger.info('error-config', error.config)
if (error) {
hideLoading()
}
......@@ -64,7 +73,8 @@ let onError = (error) => {
logger.error('onError-error.toString', error.toString())
let result = {
code: 999,
message: ''
message: '',
[_HTTP_TYPE.TIP]: error.config[_HTTP_TYPE.TIP]
}
if (error.toString().indexOf('400') >= 0) {
result.code = 400
......@@ -101,18 +111,19 @@ let onResponse = (response) => {
if (response.headers && response.headers.token) localStorage.setItem(ACCESS_TOKEN, response.headers.token)
if (response.config && response.config.loading !== false) hideLoading(response.config.loadingTarget)
logger.info('response', response)
logger.info('response-config', response.config)
if (response.data && response.data.code >= 0) {
let status = response.data.code
let message = response.data.message
response.data[_HTTP_TYPE.TIP] = response.config[_HTTP_TYPE.TIP]
if (status === 0) {
// return response.data
} else if (status === '200') {
} else if (status === '200' || status === 200) {
response.data.code = 0
} else if (status === 401) {
response.data.message = message === '未登录' ? '登超时,请重新登录!' : message
$(".tzdDrawing").css('z-index', '1')
response.data.message = message === '未登录' ? '登超时,请重新登录!' : message
$('.tzdDrawing').css('z-index', '1')
} else {
response.data.message = '未知异常:' + message
}
......@@ -126,7 +137,6 @@ let onResponse = (response) => {
// request 请求拦截器
common.interceptors.request.use(
config => {
config.headers['Content-Type'] = 'application/json'
config = initConfig(config)
return config
}, onError)
......@@ -181,11 +191,12 @@ let handleError = (response) => {
break
}
Message({
message: message,
type: type
})
if (response[_HTTP_TYPE.TIP] !== false) {
Message({
message: message,
type: type
})
}
}
let parseResponse = (resolve, reject, response) => {
......@@ -201,11 +212,11 @@ export default {
/**
* 封装get方法
*/
get (url, params) {
get(url, data) {
return new Promise((resolve, reject) => {
common
.get(url, {
params: params
params: data
})
.then(response => {
logger.net(data, url, response)
......@@ -220,9 +231,9 @@ export default {
/**
* 封装post请求
*/
post (url, params, config) {
post(url, data, config) {
return new Promise((resolve, reject) => {
common.post(url, qs.stringify(params), config)
common.post(url, qs.stringify(data), config)
.then(response => {
logger.net(data, url, response)
parseResponse(resolve, reject, response)
......@@ -236,7 +247,7 @@ export default {
/**
* 封装post请求 multipart/form-data
*/
postform (url, data, config) {
postform(url, data, config) {
return new Promise((resolve, reject) => {
instance.post(url, data, config).then(response => {
logger.net(data, url, response)
......@@ -250,7 +261,7 @@ export default {
/**
* 封装post请求 文件下载
*/
postdown (url, data, config) {
postdown(url, data, config) {
return new Promise((resolve, reject) => {
down.post(url, data, config).then(response => {
logger.net(data, url, response)
......@@ -265,7 +276,7 @@ export default {
/**
* 封装post请求 json格式
*/
postJson (url, data, config) {
postJson(url, data, config) {
return new Promise((resolve, reject) => {
json.post(url, data, config).then(response => {
logger.net(data, url, response)
......@@ -276,7 +287,12 @@ export default {
})
},
cancel () {// 取消当前网络请求
/**
* Description: 取消网络请求
* @author: li_hongchao
* @date: 2022/1/7 19:55
*/
cancel() {// 取消当前网络请求
if (window._axiosPromiseArr) {
window._axiosPromiseArr.forEach((ele, index) => {// 切换路由时,关闭当前页面请求
if (ele) {
......@@ -287,6 +303,15 @@ export default {
}
},
closeTip(params = {}) { // 关闭提示
params[_HTTP_TYPE.TIP] = false
return params
},
closeLoad(params = {}) { // 关闭加载进度
params[_HTTP_TYPE.LOADING] = false
return params
},
// get, post, postform, postdown, postJson
}
......@@ -42,7 +42,6 @@
/>
<img
v-show="!isCollapse"
class="title"
src="../assets/img/Home/tmLogo.svg"
alt=""
/>
......
......@@ -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为成功.
......
......@@ -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;
}
......
<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"
......@@ -1269,7 +1243,6 @@ const candidates = [
box-sizing: border-box;
width: 100%;
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
div {
display: inline-block;
......@@ -1393,7 +1366,7 @@ const candidates = [
.lt_candidate_bottom {
position: absolute;
bottom: 12px;
bottom: 0px;
left: 20px;
text-align: center;
width: 352px;
......@@ -1582,7 +1555,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 {
......
<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>
......@@ -1379,7 +1379,6 @@ const candidates = [
box-sizing: border-box;
width: 100%;
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
div {
......@@ -1509,7 +1508,7 @@ const candidates = [
.lt_candidate_bottom {
position: absolute;
bottom: 32px;
bottom: 5px;
left: 20px;
text-align: center;
width: 352px;
......@@ -1629,6 +1628,11 @@ const candidates = [
}
</style>
<style scoped lang="scss">
.el-table {
&::before {
display: none;
}
}
.el-table /deep/ {
.el-table__body-wrapper {
height: 693px;
......@@ -1693,11 +1697,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;
}
......
......@@ -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>
......@@ -359,7 +359,6 @@ export default {
.tl-candidate {
width: 100%;
height: calc(100% - 40px);
background: #f6f8fa;
border-radius: 8px;
position: relative;
......@@ -499,7 +498,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 {
......
......@@ -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;
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -7,9 +7,10 @@
style="width: 100%"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
class="table">
<el-table-column prop="logicName" label="分库名称" :width="width1"></el-table-column>
<el-table-column prop="logicName" label="分库名称" :width="width1" show-overflow-tooltip></el-table-column>
<el-table-column prop="sjkyh" label="数据库用户组/用户" :width="width2">
<template slot-scope="scope">
<div class="tagsBox">
......@@ -117,7 +118,7 @@
content="编辑"
placement="top"
:open-delay="500">
<svg class="icon" aria-hidden="true" @click.stop="goBj"
<svg class="icon" aria-hidden="true" @click.stop="goBj(scope.row)"
style="width: 1.125rem;height: 1.125rem; margin-right: 1.125rem;cursor: pointer;">
<use xlink:href="#icon-bianji" />
</svg>
......@@ -129,7 +130,7 @@
placement="top"
:open-delay="500">
<svg class="icon" aria-hidden="true" @click.stop="goGzl"
<svg class="icon" aria-hidden="true" @click.stop="goGzl(scope.row)"
style="width: 1.125rem;height: 1.125rem; margin-right: 1.125rem;cursor: pointer;">
<use xlink:href="#icon-gongzuoliu" />
</svg>
......@@ -208,6 +209,9 @@ export default {
// this.getList()
},
methods: {
getRowKeys(row) {
return row.logicId
},
loadData() {
this.getList()
},
......@@ -254,13 +258,13 @@ export default {
return yhs
},
goBj() {
goBj(info) {
//TODO...编辑.
this.$emit('openBj')
this.$emit('openBj', info)
},
goGzl() {
goGzl(info) {
//TODO.... 工作流
this.$emit('openGzl')
this.$emit('openGzl', info)
},
goSjgl() {
//TODO....数据管理
......
/**
* Description: _DL_TYPES 队列类型 _CXDL_TYPES 队列中查询队列类型
* <pre>
* 1 处理队列
* 2 编辑队列
* 3 检查队列
* 4 查询队列(串査)
* 5 查询队列(倒查)
* 6 查询队列(正查)
* 7 查询队列(查重)
* </pre
* @author: li_hongchao
* @date: 2022/1/6 11:12
*/
const _DL_TYPES = {
CLDL: {type: 1, name: '处理队列'}, // 处理队列
BJDL: {type: 2, name: '编辑队列'}, // 编辑队列
JCDL: {type: 3, name: '检查队列'}, // 检查队列
CXDL: {type: 99, name: '查询队列'}// 用于页面逻辑构建,与业务无关
}
const _CXDL_TYPES = {// 案件:正查 串查 人员:倒查 查重
ChuanC: {type: 4, name: '串査'}, // 查询队列(串査)
DaoC: {type: 5, name: '倒查'}, // 查询队列(倒查)
ZhengC: {type: 6, name: '正查'}, // 查询队列(正查)
ChaC: {type: 7, name: '查重'} // 查询队列(查重)
}
/**
* Description:
* 案件: 处理队列(不可选择) 编辑队列 查询队列(正查、串查)*
* 人员: 处理队列(不可选择) 编辑队列 检查队列 查询队列(倒查、查重)
* @author: li_hongchao
* @date: 2022/1/6 19:23
*/
const _DLMC = function (isRy) {
return isRy ? ['1', '2', '3', '5', '7'] : ['1', '2', '4', '6']
}
const isDlcxItem = function (val) {
return val > 3
}
/**
* Description: 工作流类 用于处理工作流数据逻辑
* @author: li_hongchao
* @date: 2022/1/7 0:00
*/
class Gzlzz {
static _PARAMS_TYPE = {
GZDL: 'gzdlArr',
GZDL_CXDL: 'gzdlCxdlArr',
DLMC: 'dlmcArr',
DLMC_CXDL: 'dlmcCxdlArr',
DL_COUNT: '_DL_COUNT'
}
static _CXDL_TYPE = _DL_TYPES.CXDL.type
gzdlArr = []
gzdlCxdlArr = []
dlmcArr = []
dlmcCxdlArr = []
_DL_COUNT = 0
isRy = false
getDl(type) {
switch (type) {
case '1':
return _DL_TYPES.CLDL
case '2':
return _DL_TYPES.BJDL
case '3':
return _DL_TYPES.JCDL
case '4':
return _CXDL_TYPES.ChuanC
case '5':
return _CXDL_TYPES.DaoC
case '6':
return _CXDL_TYPES.ZhengC
case '7':
return _CXDL_TYPES.ChaC
}
}
/**
* Description: 新增逻辑库时,初始化队列信息
* <pre>
* 队列说明:
* 案件: 处理队列(不可选择) 编辑队列 查询队列(正查、串查)*
* 人员: 处理队列(不可选择) 编辑队列 检查队列 查询队列(倒查、查重)
*</pre>
* @author: li_hongchao
* @date: 2021/12/28 13:57
*/
init(isRy) {
this.isRy = isRy
this.clear()
if (this.isRy) {
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.JCDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
this.dlmcCxdlArr.push(_CXDL_TYPES.DaoC)
this.dlmcCxdlArr.push(_CXDL_TYPES.ChaC)
this.gzdlArr.push(_DL_TYPES.CLDL)
} else {
this.dlmcArr.push(_DL_TYPES.BJDL)
this.dlmcArr.push(_DL_TYPES.CXDL)
this.dlmcCxdlArr.push(_CXDL_TYPES.ZhengC)
this.dlmcCxdlArr.push(_CXDL_TYPES.ChuanC)
this.gzdlArr.push(_DL_TYPES.CLDL)
}
this._DL_COUNT = this.dlmcArr.length
}
initByVal(val) {
this.clear()
let resDl = _DLMC(this.isRy)
let desDl = val.split(',')
let index = -1
let isAddCxdl = false
desDl.forEach(item => {
if (item && item !== '') {
index = resDl.indexOf(item)
if (index >= 0) {
resDl.splice(index, 1)
}
if (isDlcxItem(item)) {
if (!isAddCxdl) {
this.gzdlArr.push(_DL_TYPES.CXDL)
isAddCxdl = true
}
this.gzdlCxdlArr.push(this.getDl(item))
} else {
this.gzdlArr.push(this.getDl(item))
}
}
})
logger.info('resDl', resDl)
isAddCxdl = false
resDl.forEach(item => {
if (isDlcxItem(item)) {
if (!isAddCxdl) {
this.dlmcArr.push(_DL_TYPES.CXDL)
isAddCxdl = true
}
this.dlmcCxdlArr.push(this.getDl(item))
} else {
this.dlmcArr.push(this.getDl(item))
}
})
}
result() {
let result = ''
if (this.gzdlArr && this.gzdlArr.length > 0) {
this.gzdlArr.forEach(i => {
if (i.type === _DL_TYPES.CXDL.type) {
if (this.gzdlCxdlArr && this.gzdlCxdlArr.length > 0) {
this.gzdlCxdlArr.forEach(j => {
if (result === '') {
result += j.type
} else {
result += ',' + j.type
}
})
}
} else {
if (result === '') {
result += i.type
} else {
result += ',' + i.type
}
}
})
}
return result
}
clear() {
this.gzdlArr = []
this.gzdlCxdlArr = []
this.dlmcArr = []
this.dlmcCxdlArr = []
}
updateCxdl(group, groupIndex, child, childIndex, isAdd = false) {// 点击查询队列子项处理逻辑
if (isAdd) {
if (this.dlmcCxdlArr.length !== 2) {
this.dlmcArr.splice(groupIndex, 1)
}
this.dlmcCxdlArr.splice(childIndex, 1)
if (this.gzdlCxdlArr.length === 0) {
this.gzdlArr.push(group)
}
this.gzdlCxdlArr.push(child)
} else {
if (this.gzdlCxdlArr.length !== 2) {
this.gzdlArr.splice(groupIndex, 1)
}
this.gzdlCxdlArr.splice(childIndex, 1)
if (this.dlmcCxdlArr.length === 0) {
this.dlmcArr.push(group)
}
this.dlmcCxdlArr.push(child)
}
}
updateGzdl(clickItem, index, isAdd = false) {// 处理队列添加、取消逻辑
if (isAdd) {
this.dlmcArr.splice(index, 1)
if (clickItem.type === _DL_TYPES.CXDL.type) {
if (this.dlmcCxdlArr.length === 2) {
this.gzdlArr.push(_DL_TYPES.CXDL)
}
this.gzdlCxdlArr = this.gzdlCxdlArr.concat(this.dlmcCxdlArr)
this.dlmcCxdlArr = []
} else {
this.gzdlArr.push(clickItem)
}
} else {
this.gzdlArr.splice(index, 1)
if (clickItem.type === _DL_TYPES.CXDL.type) {
if (this.gzdlCxdlArr.length === 2) {
this.dlmcArr.push(_DL_TYPES.CXDL)
}
this.dlmcCxdlArr = this.dlmcCxdlArr.concat(this.gzdlCxdlArr)
this.gzdlCxdlArr = []
} else {
this.dlmcArr.push(clickItem)
}
}
}
}
module.exports = Gzlzz
/**
* Description: 工作流队列相关代码
* @author: li_hongchao
* @date: 2021/12/28 21:07
*/
<template>
<div style="background: #F7F9FB; padding: 30px 0px;">
<el-row style="margin-bottom: 20px;">
<el-col :span="24">
<el-form-item class="dui-lie-ming-cheng-layout" label="队列名称:" prop="dlmc">
<div style="margin-left: 40px;">
<div
class="dui-lie-ming-cheng"
v-for="(item,index) in dlmcArr"
v-show="dlmcArr && dlmcArr.length > 0">
<i class="el-icon-circle-plus icon" style="color: #055fe7"
@click="addDl(item,index)" />
<div>
{{ item.name || '-'}}
<div v-if="item.type === 3">
<span class="line" />
<span v-if="isRy">
<span v-show="item.search === 3 || item.search === 1"
class="tag">倒查</span>
<span v-show="item.search === 3 || item.search === 2"
class="tag">查重</span>
</span>
<span v-else>
<span v-show="item.search === 3 || item.search === 1"
class="tag">正查</span>
<span v-show="item.search === 3 || item.search === 2"
class="tag">串查</span>
</span>
</div>
</div>
</div>
</div>
<div
v-show="!dlmcArr || dlmcArr.length <= 0"
v-for="(item, index) in getDlCount()"
:key="index + 'l'"
class="kong"
></div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item class="gong-zuo-dui-lie-layout" label="工作队列:" prop="gzdl">
<div v-if="gzdlArr && gzdlArr.length > 1">
<!-- 串行模式;-->
<div v-if="ruleForm.gzms === 0"
class="gong-zuo-dui-lie-chuanxing"
v-for="(item,index) in gzdlArr">
<div v-if="index === 0" class="chu-li-dui-lie"
style="margin-left: 0px;">处理队列
</div>
<i v-if="index !== 0" class="el-icon-remove icon"
style="color: #055fe7"
@click="deledeDl(item,index)" />
<div v-if="index !== 0">
{{ item.name || '-'}}
<div v-if="item.type === 3">
<span class="gzdl-line" />
<span v-if="isRy">
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chachong">查重</span>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag daocha">倒查</span>
</span>
<span v-else>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag zhengcha">正查</span>
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chuancha">串查</span>
</span>
</div>
</div>
</div>
<!-- 并行模式;-->
<div
v-if="ruleForm.gzms === 1"
v-for="(item,index) in gzdlArr"
:class="{'gong-zuo-dui-lie-bingxing-item':true, kk:index !== 0}">
<div class="gong-zuo-dui-lie-bingxing-item-left">
<div :class="{verLine:true,verLineTrans: index === 0}" />
<div :class="{verLine:true,verLineTrans: index === gzdlArr.length -1}" />
</div>
<div class="gong-zuo-dui-lie-bingxing-item-right">
<span class="mid-line" />
<span class="mid-circle" />
<div v-if="index === 0" class="chu-li-dui-lie"
style="margin-left: 8px;">处理队列
</div>
<div v-else class="gong-zuo-dui-lie-bingxing">
<i class="el-icon-remove icon" @click="deledeDl(item,index)"
style="color: #055fe7" />
<div>
{{ item.name || '-'}}
<div v-if="item.type === 3">
<span class="gzdl-line" />
<span v-if="isRy">
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chachong">查重</span>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag daocha">倒查</span>
</span>
<span v-else>
<span v-show="item.search === 3 || item.search === 1"
class="gztl-tag zhengcha">正查</span>
<span v-show="item.search === 3 || item.search === 2"
class="gztl-tag chuancha">串查</span>
</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div v-else>
<div class="chu-li-dui-lie">处理队列</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
name: 'GzlDlView'
}
</script>
<style scoped>
</style>
......@@ -7,14 +7,14 @@
style="width: 100%"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
class="table">
<el-table-column prop="logicName" label="分库名称" :width="width1"></el-table-column>
<el-table-column prop="logicName" label="分库名称" :width="width1" show-overflow-tooltip />
<el-table-column prop="sjkyh" label="数据库用户组/用户" :width="width2">
<template slot-scope="scope">
<div class="tagsBox">
<div
v-for="item in strArr(scope.row.groups)"
<div v-for="item in strArr(scope.row.groups)"
:class="{ tags: true, tagszu: item.type === 1 }"
:key="item.logicId"
v-show="item !== ''">
......@@ -46,8 +46,8 @@
effect="dark"
placement="right"
style="width: auto !important"
v-if="scope.row.groups && scope.row.groups.length > 4"
>
v-if="scope.row.groups && scope.row.groups.length > 4">
<span style="margin-left: 5px">...</span>
<div slot="content" class="tooTipBtn">
<div
......@@ -82,7 +82,6 @@
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" :width="width3"></el-table-column>
<el-table-column prop="qyzt" label="启用状态" :width="width4">
......@@ -118,7 +117,7 @@
content="编辑"
placement="top"
:open-delay="500">
<svg class="icon" aria-hidden="true" @click.stop="goBj"
<svg class="icon" aria-hidden="true" @click.stop="goBj(scope.row)"
style="width: 1.125rem;height: 1.125rem; margin-right: 1.125rem;cursor: pointer;">
<use xlink:href="#icon-bianji" />
</svg>
......@@ -130,7 +129,7 @@
placement="top"
:open-delay="500">
<svg class="icon" aria-hidden="true" @click.stop="goGzl"
<svg class="icon" aria-hidden="true" @click.stop="goGzl(scope.row)"
style="width: 1.125rem;height: 1.125rem; margin-right: 1.125rem;cursor: pointer;">
<use xlink:href="#icon-gongzuoliu" />
</svg>
......@@ -211,6 +210,9 @@ export default {
this.getList()
},
methods: {
getRowKeys(row) {
return row.logicId
},
loadData() {
this.getList()
},
......@@ -258,13 +260,13 @@ export default {
},
goBj() {
goBj(info) {
//TODO...编辑.
this.$emit('openBj')
this.$emit('openBj', info)
},
goGzl() {
goGzl(info) {
//TODO.... 工作流
this.$emit('openGzl')
this.$emit('openGzl', info)
},
goSjgl() {
//TODO....数据管理
......
......@@ -9,37 +9,46 @@
<div style="float: left;" class="opt-select">
<div class="select-left">{{selValue}}</div>
<div :class="isShowing?'select-right-focus':'select-right-normal'">
<svg class="icon opt-select-right-svg" aria-hidden="true">
<use xlink:href="#icon-shenhe" />
</svg>
</div>
<!-- <div :class="isShowing?'select-right-focus':'select-right-normal'">-->
<!-- <svg class="icon opt-select-right-svg" aria-hidden="true">-->
<!-- <use xlink:href="#icon-shenhe" />-->
<!-- </svg>-->
<!-- </div>-->
</div>
<el-dropdown-menu slot="dropdown" class="select-list-content">
<div class="select-list-content-left">
<div class="list-item">用户</div>
<div class="list-item">用户组</div>
<div :class="{'list-item':true,'list-item-focus':isYh}" @click="toggleYh(true)">用户</div>
<div :class="{'list-item':true,'list-item-focus':!isYh}" @click="toggleYh(false)">用户组</div>
</div>
<div class="select-list-content-right">
<div class="top-div">
<div v-for="item in curOpt" class="top-item">{{item.name}}</div>
<div v-for="(item,index) in getItemArr()" class="top-item" @click="selectItem(item)"
:key="index">
<span v-if='item.name.length > 6'>
<el-tooltip effect="dark" :content="item.name" placement="top">
<div class="span-name">
{{ item.name.slice(0,6) + '...'}}
</div>
</el-tooltip>
</span>
<span v-else>
{{ item.name}}
</span>
<div v-show="isSelect(item)" class="look" style="float: right;margin-right: 17px;">
<i class="iconfont icon-duihao"></i>
</div>
</div>
</div>
<div class="bottom-div">
<div class="queding">确定</div>
<div class="quxiao">取消</div>
<div class="queding" @click="commit()">确定</div>
<div class="quxiao" @click="cancel()">取消</div>
</div>
</div>
<!-- <div v-for="item in curOpt" :key="item.icon" class="select-list-content-item">-->
<!-- <svg class="icon opt-select-right-svg" aria-hidden="true"-->
<!-- style="margin-right: 5px;width: 20px;height: 20px;">-->
<!-- <use :xlink:href="item.icon" />-->
<!-- </svg>-->
<!-- {{item.name}}-->
<!-- </div>-->
</el-dropdown-menu>
</el-dropdown>
......@@ -50,6 +59,11 @@
<script>
export default {
name: 'SjkyhSelect',
props: {
params: {
type: Array
}
},
data() {
return {
isShowing: false,
......@@ -62,13 +76,132 @@ export default {
{name: '审核4', value: '4', icon: '#icon-shenhe'},
{name: '审核5', value: '5', icon: '#icon-shenhe'},
],
userGroupArr: [],
userArr: [],
userGroupSelectSet: [],
userSelectSet: [],
isYh: true,
}
},
created() {
this.userGroupSelectSet = new Set()
this.userSelectSet = new Set()
this.doQuery()
},
methods: {
isSelect(item) {
if (this.isYh) {
return this.userSelectSet.has(item.id)
} else {
return this.userGroupSelectSet.has(item.id)
}
},
selectItem(item) {
if (this.isYh) {
if (this.userSelectSet.has(item.id)) {
this.userSelectSet.delete(item.id)
} else {
this.userSelectSet.add(item.id)
}
} else {
if (this.userGroupSelectSet.has(item.id)) {
this.userGroupSelectSet.delete(item.id)
} else {
this.userGroupSelectSet.add(item.id)
}
}
this.$forceUpdate()
},
visibleChange(val) {
let _that = this
_that.isShowing = val
this.isYh = true
this.updateSelectSet()
},
updateSelectSet() {
this.userSelectSet.clear()
this.userGroupSelectSet.clear()
this.params.forEach(item => {
if (item.type === 0) {
this.userSelectSet.add(item.id)
} else {
this.userGroupSelectSet.add(item.id)
}
})
},
toggleYh(isyh) {
this.isYh = isyh
},
getItemArr() {
if (this.isYh) {
return this.userArr
} else {
return this.userGroupArr
}
},
commit() {
let userSize = this.userSelectSet.size
let groupSize = this.userGroupSelectSet.size
// logger.info('size', size)
if (userSize > 0 || groupSize > 0) {
let result = []
if (userSize > 0) {
this.userArr.forEach(item => {
if (this.userSelectSet.has(item.id)) {
result.push({
id: item.id,
name: item.name,
type: 0
})
}
})
}
if (groupSize > 0) {
this.userGroupArr.forEach(item => {
if (this.userGroupSelectSet.has(item.id)) {
result.push({
id: item.id,
name: item.name,
type: 1
})
}
})
}
if (this.$refs.dropdown) {
this.$refs.dropdown.visible = false
}
this.$emit('select', result)
} else {
this.$message({
type: 'info',
message: '请先选择用户',
})
}
},
cancel() {
if (this.$refs.dropdown) {
this.$refs.dropdown.visible = false
}
// this.userSelectSet.clear()
// this.userGroupSelectSet.clear()
},
doQuery() {
NetUtil.xtfkgl
.yhList()
.then(res => {
logger.info(res)
if (res && res.code === 0 && res.detail) {
this.userGroupArr = res.detail.userGroups
this.userArr = res.detail.users
}
})
}
},
watch: {
params() {
this.updateSelectSet()
}
}
}
</script>
......@@ -183,6 +316,9 @@ export default {
/*height: 40px;*/
background: #FFFFFF;
border: 1px none #EEEEEE;
border-right-style: solid;
.list-item {
width: 100%;
height: 40px;
......@@ -191,12 +327,23 @@ export default {
color: #333333;
line-height: 19px;
padding: 0px 0px 0px 15px;
padding: 0px 0px 0px 13px;
display: flex;
align-items: center;
justify-content: left;
border: 2px none white;
border-left-style: solid;
}
.list-item-focus {
border: 2px none #055FE7;
border-left-style: solid;
color: #055FE7;
}
}
.select-list-content-right {
......@@ -217,7 +364,18 @@ export default {
font-size: 14px;
font-family: HarmonyOS_Sans_SC;
color: #333333;
line-height: 19px;
line-height: 40px;
padding-left: 16px;
}
.top-item:hover {
background: #F5F5F7;
}
.span-name {
overflow: hidden;
float: left;
}
}
......@@ -331,6 +489,7 @@ export default {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .top-div::-webkit-scrollbar-thumb {
background-color: #dadde0;
......
......@@ -42,29 +42,25 @@
@openGzl="openGzl"
@openSjgl="openSjgl" />
<!-- 新增分库页面-->
<add-xtfk-view ref="addXtfk" :is-ry="isPerson" v-show="isAddFk" @close="closeXtfkView" />
<gzl-view ref="gzlView" v-show="isShowGzl" @close="closeGzlView" />
<!-- 逻辑分库、工作流 新增、编辑页面 -->
<xtfk-and-gzl-view ref="addXtfk" :is-ry="isPerson" v-show="isAddFk" @close="closeXtfkView" />
</el-container>
</template>
<script>
import RyXtljfkView from '../xtfkgl/RyXtljfkView.vue'
import AjXtljfkView from '../xtfkgl/AjXtljfkView.vue'
import AddXtfkView from '../xtfkgl/AddXtfkView.vue'
import GzlView from '../xtfkgl/GzlView.vue'
import XtfkAndGzlView from '../xtfkgl/XtfkAndGzlView.vue'
export default {
name: 'XtfkglMain',
components: {
GzlView,
RyXtljfkView,
AjXtljfkView,
AddXtfkView
XtfkAndGzlView
},
data() {
return {
isShowGzl: false,
isAddFk: false,
isPerson: true,
}
......@@ -85,29 +81,28 @@ export default {
this.$refs.addXtfk.showAll()
},
openBj() { // 人员/案件编辑
openBj(info) { // 人员/案件编辑
this.isAddFk = true
this.$refs.addXtfk.showLjfk()
this.$refs.addXtfk.showLjfk(info)
},
openGzl() {// 人员/案件工作流
openGzl(info) {// 人员/案件工作流
this.isAddFk = true
this.$refs.addXtfk.showGzl()
this.$refs.addXtfk.showGzl(info)
},
openSjgl() { // 人员/案件数据管理
if (this.isPerson) {
} else {
}
},
closeXtfkView() {
closeXtfkView(isSuccess) {
this.isAddFk = false
if (isSuccess && isRefresh) {
if (this.isPerson) {
this.$refs.ryXtfk.loadData()
} else {
this.$refs.ajXtfk.loadData()
}
}
},
closeGzlView() {
this.isShowGzl = false
}
},
}
......
......@@ -53,7 +53,7 @@
.title {
display: flex;
padding: 30px 0 20px 0px;
padding: 20px 0px 0px 0px;
div {
font-size: 16px;
......@@ -115,10 +115,10 @@
}
.radio-info {
margin-top: 10px;
margin-top: 2px;
width: 204px;
height: 35px;
height: 40px;
}
.el-input__inner {
......@@ -177,7 +177,7 @@
//box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #ffffff;
position: relative;
text-align: center;
margin-right: 25px;
margin-right: 5px;
//margin-top: 7px;
> div {
......@@ -236,7 +236,8 @@
border: 1px dashed #aeb5c2 !important;
position: relative !important;
display: inline-block;
margin-right: 25px;
margin-right: 5px;
margin-left: 20px;
border-radius: 4px;
}
......@@ -247,6 +248,20 @@
}
}
.dui-lie-ming-cheng-bx { // 并行,查询队列布局
border: 0px solid #AEB5C2;
background: #F6F8FA;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8), -4px -4px 4px 0px #FFFFFF;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
line-height: 22px;
}
.chu-li-dui-lie {
width: 96px;
height: 32px;
......@@ -363,7 +378,7 @@
position: relative;
text-align: center;
margin-left: 30px;
margin-left: 8px;
> div {
line-height: 32px;
......@@ -391,7 +406,6 @@
margin-left: 73px;
}
.gong-zuo-dui-lie-bingxing-item {
height: 52px;
......@@ -554,6 +568,18 @@
}
}
.slide-fade-leave-active,
.slide-fade-enter-active {
transition: all 0.8s;
}
.slide-fade-enter,
.slide-fade-leave-to {
transform: translateY(230px);
opacity: 0;
}
.dialog /deep/ {
.el-form-item__content {
margin-left: 20px !important;
......@@ -671,6 +697,7 @@
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
// 滚动条的滑块
/deep/ .fix-height::-webkit-scrollbar-thumb {
background-color: #dadde0;
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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 } ?>
......
......@@ -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) ?>
......
......@@ -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>
......@@ -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 } ?>
......
......@@ -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