Commit ed02c167 by 李金轩

发现另一个版本

1 parent 4984ccc0
...@@ -33,7 +33,7 @@ html, body, #app { ...@@ -33,7 +33,7 @@ html, body, #app {
width: 50%; width: 50%;
} }
.query-item+.query-item { .query-item + .query-item {
padding-left: 20px; padding-left: 20px;
text-align: left; text-align: left;
} }
...@@ -50,11 +50,11 @@ html, body, #app { ...@@ -50,11 +50,11 @@ html, body, #app {
margin-left: 20px; margin-left: 20px;
} }
.showData{ .showData {
width: 50%; width: 50%;
height: 460px; height: 460px;
min-width: 600px; min-width: 600px;
box-shadow: 0 1px 4px 0 rgba(0,0,0,0.37); box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37);
border-radius: 4px; border-radius: 4px;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
...@@ -65,7 +65,7 @@ html, body, #app { ...@@ -65,7 +65,7 @@ html, body, #app {
/* padding: 0 20px; */ /* padding: 0 20px; */
width: 50%; width: 50%;
min-width: 600px; min-width: 600px;
box-shadow: 0 1px 4px 0 rgba(0,0,0,0.37); box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37);
border-radius: 4px; border-radius: 4px;
margin: 20px auto 0; margin: 20px auto 0;
position: relative; position: relative;
...@@ -76,7 +76,7 @@ html, body, #app { ...@@ -76,7 +76,7 @@ html, body, #app {
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
padding: 10px 0; padding: 10px 0;
box-shadow: 0px 0px 3px 0 rgba(0,0,0,.2); box-shadow: 0px 0px 3px 0 rgba(0, 0, 0, .2);
/* margin: 10px 0 0; */ /* margin: 10px 0 0; */
} }
...@@ -174,7 +174,7 @@ html, body, #app { ...@@ -174,7 +174,7 @@ html, body, #app {
.result-footer { .result-footer {
padding: 12px 20px; padding: 12px 20px;
font-size: 16px; font-size: 16px;
box-shadow: 0px 0px 3px 0 rgba(0,0,0,.2); box-shadow: 0px 0px 3px 0 rgba(0, 0, 0, .2);
} }
.result-footer::after, .result-footer::after,
......
...@@ -2,7 +2,7 @@ window._CONF_ = { ...@@ -2,7 +2,7 @@ window._CONF_ = {
reportApiUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '', reportApiUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '',
apiUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '', apiUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '',
apiUrl2: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '', apiUrl2: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '',
webSockUrl: window.location.hostname === 'localhost' ? 'http://store.keliuyun.com:9998' : '', webSockUrl: window.location.hostname === 'localhost' ? 'store.keliuyun.com:9998' : '',
} }
const log = console.log.bind(console) const log = console.log.bind(console)
...@@ -1229,7 +1229,9 @@ new Vue({ ...@@ -1229,7 +1229,9 @@ new Vue({
const { const {
dateVal, mallVal, type dateVal, mallVal, type
} = query } = query
log('query', query)
var urlPath = TAB_API[dateFormat](type) var urlPath = TAB_API[dateFormat](type)
log(urlPath)
var scheduleType = dateFormat + type var scheduleType = dateFormat + type
var parameter = { var parameter = {
// startDate: dateVal ? dateVal + ' 00:00:00' : null, // startDate: dateVal ? dateVal + ' 00:00:00' : null,
...@@ -1247,6 +1249,8 @@ new Vue({ ...@@ -1247,6 +1249,8 @@ new Vue({
{ {
parameter.featureType = type parameter.featureType = type
} }
log(8888, parameter)
var socketParameter = { var socketParameter = {
scheduleType: scheduleType, scheduleType: scheduleType,
// callback: 'fetchApi', // callback: 'fetchApi',
...@@ -1266,6 +1270,7 @@ new Vue({ ...@@ -1266,6 +1270,7 @@ new Vue({
var self = this, var self = this,
wsUrl = window._CONF_.webSockUrl || window.location.host, wsUrl = window._CONF_.webSockUrl || window.location.host,
socketUrl = "ws://" + wsUrl + WSAPI.RecalSchedule + scheduleType socketUrl = "ws://" + wsUrl + WSAPI.RecalSchedule + scheduleType
log(socketUrl)
if ("WebSocket" in window) if ("WebSocket" in window)
{ {
self.socket = new WebSocket(socketUrl) self.socket = new WebSocket(socketUrl)
......
...@@ -27,7 +27,7 @@ Axios.interceptors.request.use( ...@@ -27,7 +27,7 @@ Axios.interceptors.request.use(
if (window.location.hostname === 'localhost') if (window.location.hostname === 'localhost')
{ {
config.headers.Authorization = 'c3b85226-4301-45fb-a087-4caf3194fc90' config.headers.Authorization = '34cdfc09-4ff1-44ac-9e9b-0b0da9b3047a'
} }
else else
{ {
......
.datelevel{
text-align: center;
padding-bottom: 10px;
}
.data-type{
width: 100%;
text-align: center;
}
.data{
width: 100%;
height: 70px;
}
.data-select{
width: 100%;
text-align: center;
margin-top: 0.5%;
}
.button-class{
}
.param{
width: 100%;
text-align: center;
overflow: hidden;
}
.el-select{
width: 310px !important;
}
.el-select__tags{
max-width: 290px !important;
}
.input-class{
width: 200px
}
.face-data{
margin-left: 60px
}
.showData{
/* border-width:5px; */
width: 50%;
height: 460px;
/* border:3px solid gray; */
box-shadow: 0 1px 4px 0 rgba(0,0,0,0.37);
border-radius: 4px;
margin: 0 auto;
position: relative;
/* left: 50%;
margin-left: -25%; */
overflow: auto;
}
.show-span{
margin-left: 10px;
}
.clear-select{
text-align: center;
padding: 10px 0 10px 0;
}
.date-time{
height: 30px;
}
/*覆盖 element css*/
.el-input__inner {
height: 30px !important;
line-height: 30px !important;
}
.el-input__icon {
line-height: 30px !important;
}
.date-time .el-input__inner {
height: 30px !important;
line-height: 30px !important;
}
.date-time .el-input__icon {
line-height: 30px !important;
}
.el-button {
padding: 6px 20px !important;
}
.input-class {
width: 200px
}
.date-select {
width: 100%;
text-align: center;
padding: 5px;
}
/* 全選 */
.mall-sel-box {
/* display: block; */
height: 22px;
font-size: 13px;
width: 150px;
height: 100%;
}
.sel-all-box {
height: 30px;
line-height: 30px;
font-size: 14px;
padding: 0 20px;
position: relative;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #606266;
box-sizing: border-box;
cursor: pointer;
}
.sel-all-box.selected {
color: #409EFF;
font-weight: 700;
background-color: #fff;
}
.sel-all-box.selected .custom-checkbox__inner {
background-color: #409eff;
border-color: #409eff;
}
.sel-all-box.selected .custom-checkbox__inner:after {
transform: rotate(45deg) scaleY(1);
}
.custom-checkbox__input {
white-space: nowrap;
cursor: pointer;
outline: none;
display: inline-block;
line-height: 1;
position: relative;
vertical-align: middle;
}
.custom-checkbox__inner {
display: inline-block;
position: relative;
border: 1px solid #dcdfe6;
border-radius: 2px;
box-sizing: border-box;
width: 14px;
height: 14px;
background-color: #fff;
z-index: 1;
transition: border-color .05s cubic-bezier(.71, -.46, .29, 1.46), background-color .05s cubic-bezier(.71, -.46, .29, 1.46);
}
.custom-checkbox__inner:after {
box-sizing: content-box;
content: "";
border: 1px solid #fff;
border-left: 0;
border-top: 0;
height: 7px;
left: 4px;
position: absolute;
top: 1px;
transform: rotate(45deg) scaleY(0);
width: 3px;
transition: transform .05s cubic-bezier(.71, -.46, .88, .6) .05s;
transform-origin: center;
}
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
content: none;
}
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected .custom-checkbox__inner {
background-color: #409eff;
border-color: #409eff;
}
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected .custom-checkbox__inner:after {
transform: rotate(45deg) scaleY(1);
}
.center-div {
position: absolute;
left: 50%;
margin-left: -12%;
}
.center-progress {
display: inline-block;
margin-left: 38%;
}
.center-repairprogress {
display: inline-block;
}
.check-box {
}
.top-box {
}
.el-checkbox-group {
padding-top: 1px;
}
.el-checkbox:first-child {
margin-left: 55px
}
.el-checkbox+.el-checkbox {
margin-left: 70px;
}
.el-checkbox:last-child {
margin-left: 75px
}
.el-checkbox {
padding: 1px 0 1px 0;
}
.el-checkbox__inner{
width: 15px;
height: 15px;
}
.el-checkbox__label {
font-size: 16px
}
.level-div {
font-size: 18px;
padding: 0px 0px 0px 30px;
}
.level-box :first-child{
padding-top: 22px;
}
.bloc-mall-box {
text-align: center;
width: 50%;
float: left;
}
.line-progress {
display: block;
width: 405px;
background-color: #ebeef5;
height: 18px;
border-radius: 20px;
margin-left: 50px;
margin-top: -20px;
}
.websocket-line {
height: 18px;
/* border-radius: 20px; */
margin-left: 50px;
margin-top: -18px;
background-color: #409EFF;
position: relative;
z-index: 999;
}
.check-box .websocket-line:nth-of-type(1) {
border-top-left-radius: 20px;
border-bottom-left-radius: 20px;
}
.check-box .websocket-line:nth-of-type(2) {
border-top-left-radius: 20px;
border-bottom-left-radius: 20px;
}
.check-box :last-child {
border-top-right-radius: 20px;
border-bottom-right-radius: 20px;
}
.tooltip-div {
height:50px;
background-color: #fff;
position:absolute;
z-index: 9999;
text-align: center;
border:2px solid black;
border-radius: 10px;
}
No preview for this file type
This diff could not be displayed because it is too large.
[v-cloak] {
display: none;
}
html, body, #app {
margin: 0;
padding: 0;
width: 100%;
height: 100%;
}
.container {
width: 100%;
height: 100%;
padding-top: 10px;
max-width: 1200px;
margin: 0 auto;
box-sizing: border-box;
}
.query-box {
width: 100%;
display: table;
}
.query-box + .query-box {
padding-top: 10px;
}
.query-item {
display: table-cell;
text-align: right;
width: 50%;
}
.query-item+.query-item {
padding-left: 20px;
text-align: left;
}
.query-select {
font-size: 13px;
}
.query-item__title {
font-size: 14px;
}
.query-button {
margin-left: 20px;
}
.showData{
width: 50%;
height: 460px;
min-width: 600px;
box-shadow: 0 1px 4px 0 rgba(0,0,0,0.37);
border-radius: 4px;
margin: 0 auto;
position: relative;
overflow: auto;
}
.result-wrapper {
/* padding: 0 20px; */
width: 50%;
min-width: 600px;
box-shadow: 0 1px 4px 0 rgba(0,0,0,0.37);
border-radius: 4px;
margin: 20px auto 0;
position: relative;
overflow: auto;
}
.result-header {
text-align: center;
font-size: 16px;
padding: 10px 0;
box-shadow: 0px 0px 3px 0 rgba(0,0,0,.2);
/* margin: 10px 0 0; */
}
.result-content {
font-size: 14px;
padding: 0 20px 20px;
}
.result-item {
padding-right: 8px;
box-sizing: border-box;
}
.result-item + .result-item {
margin-top: 10px;
}
.empty-data {
text-align: center;
padding: 10px 0;
font-size: 14px;
}
.result-page {
margin: 8px 0;
}
.result-page span + .result-page span {
padding: 0 5px;
}
/* .result-progress-wrapper {
margin: 20px 0 10px;
} */
.result-progress-wrapper::after,
.result-progress-wrapper::before {
content: '';
display: table;
}
.result-progress-wrapper::after {
clear: both;
}
.result-progress-left {
float: left;
}
.result-progress-right {
width: 100%;
padding-left: 88px;
box-sizing: border-box;
}
.result-progress {
height: 26px;
margin-bottom: 4px;
position: relative;
border-radius: 100px;
/* box-shadow: 0px 0px 2px 0 rgba(0,0,0,1); */
background-color: #ebeef5;
overflow: hidden;
}
.result-progress__inner {
width: 0;
position: absolute;
left: 0;
top: 0;
height: 100%;
color: #fff;
background: #409EFF;
/* background-image: linear-gradient(#86bef7, #409eff); */
border-radius: inherit;
text-align: right;
transition: width 0.1s linear;
}
.result-progress__text {
display: inline-block;
margin: 0 5px;
vertical-align: middle;
}
.result-progress-right span {
padding-left: 10px;
}
.pagination-page {
float: right;
padding-right: 10px;
}
.result-footer {
padding: 12px 20px;
font-size: 16px;
box-shadow: 0px 0px 3px 0 rgba(0,0,0,.2);
}
.result-footer::after,
.result-footer::before {
content: '';
display: table;
}
.result-footer::after {
clear: both;
}
.result-intro {
float: left;
}
.result-clear-btn {
float: right;
border-radius: 20px;
}
/* login */
#loginApp {
width: 100%;
height: 100%;
}
.login-container {
width: 100%;
height: 100%;
background: url(../image/login_bg.png) no-repeat;
background-size: 100% 100%;
text-align: right;
}
.login-form {
display: inline-block;
width: 20%;
padding-top: 30vh;
margin-right: 10%;
color: #fff;
box-sizing: border-box;
}
.login-title {
text-align: left;
}
input::-webkit-autofill {
background-color: transparent;
box-shadow: 0 0 0 1000px rgba(255, 255, 255, 0) inset !important;
-webkit-box-shadow: 0 0 0 1000px rgba(255, 255, 255, 0) inset !important;
-webkit-text-fill-color: #fff !important;
transition: background-clor 5000s ease-in-out 0s;
}
@keyframes move {
0% {
background-position: 0 0;
}
100% {
background-position: 30px 30px;
}
}
/* cover elementui stylesheet*/
.scrollbar-wrapper {
height: 100%;
height: 376px;
max-height: 376px;
overflow-x: hidden !important;
}
.el-scrollbar__bar.is-vertical {
right: 0px;
}
.el-scrollbar {
height: 100%;
}
const API = {
Login: '/users/login',
Accounts: '/accounts',
Malls: '/malls',
Gates: '/gates',
Devices: '/devices',
Channels: '/channels',
Mall: '/mall/',
FaceRecognitionsCount: '/faceRecognitions/count',
SimulationFaceRecognition: '/simulation/faceRecognition',
SimulationCountData: '/simulation/countData',
PreviewCountData: '/preview/countData',
mallStaffFeature: '/mall/staffFeature',
MallFeature: '/mall/feature',
MallStaffPool: '/mall/staffPool',
MallCustomPool: '/mall/customPool',
MallStaff: '/mall/staff',
MallCustom: '/mall/custom'
}
const WSAPI = {
RecalSchedule: '/recal/schedule/'
}
This diff could not be displayed because it is too large.
window._CONF_ = {
reportApiUrl: window.location.hostname === 'localhost' ? 'http://36.112.68.214:9999' : '',
apiUrl: window.location.hostname === 'localhost' ? 'http://36.112.68.214:9999' : '',
apiUrl2: window.location.hostname === 'localhost' ? 'http://36.112.68.214:9999' : '',
webSockUrl: window.location.hostname === 'localhost' ? '36.112.68.214:9999' : '',
},
apiUrl = '',
webSockUrl = '',
window.apiUrl = '',
window.webSockUrl = ''
/**
* [MDN](https://developer.mozilla.org/zh-CN/docs/Web/API/Document/cookie#Syntax)
*/
const Cookies = {
get: function (sKey) {
return decodeURIComponent(
document.cookie.replace(
new RegExp(
"(?:(?:^|.*;)\\s*" +
encodeURIComponent(sKey).replace(/[-.+*]/g, "\\$&") +
"\\s*\\=\\s*([^;]*).*$)|^.*$"
), "$1"
)
) || null
},
/**
* 写入
* @param {string} sKey necessary
* @param {string} sValue necessary
* @param {number|null|date|object|Infinity|string} vEnd optional
* @param {string|null} sPath optional
* @param {string|null} sDomain optional
* @param {boolean|null} bSecure optional
*/
set: function (sKey, sValue, vEnd, sPath, sDomain, bSecure) {
if (!sKey ||
/^(?:expires|max\-age|path|domain|secure)$/i.test(sKey)
) {
return false
}
let sExpires = ''
if (vEnd) {
switch (vEnd.constructor) {
case Number:
sExpires = vEnd === Infinity
? '; expires=Fri, 31 Dec 9999 23:59:59 GMT'
: '; max-age=' + vEnd
break;
case String:
sExpires = '; expires=' + vEnd
break;
case Date:
sExpires = '; expires=' + vEnd.toUTCString()
break;
}
}
document.cookie = encodeURIComponent(sKey) + '=' +
encodeURIComponent(sValue) + sExpires +
(sDomain ? '; domain=' + sDomain : '') +
(sPath ? '; path=' + sPath : '') +
(bSecure ? '; secure' : '')
return true
},
remove: function (sKey, sPath, sDomain) {
if (!sKey || !this.has(sKey)) return false
document.cookie = encodeURIComponent(sKey) +
'=; expires=Thu, 01 Jan 1970 00:00:00 GMT' +
(sDomain ? '; domain=' + sDomain : '') +
(sPath ? '; path=' + sPath : '')
return true
},
has: function (sKey) {
return (
new RegExp('(?:^|;\\s*)' +
encodeURIComponent(sKey).replace(/[-.+*]/g, '\\$&') +
'\\s*\\='
)
).test(document.cookie)
},
keys: function () {
let aKeys = document.cookie.replace(
/((?:^|\s*;)[^\=]+)(?=;|$)|^\s*|\s*(?:\=[^;]*)?(?:\1|$)/g,
''
).split(/\s*(?:\=[^;]*)?;\s*/)
for (let nIdx = 0;nIdx < aKeys.length;nIdx++) {
aKeys[nIdx] = decodeURIComponent(aKeys[nIdx])
}
return aKeys
}
}
This diff could not be displayed because it is too large.
(function() {
console.log('location', location, Cookies.get('atoken'))
if (!Cookies.get('atoken')) {
window.location.replace(window.location.href + 'login.html')
}
})()
\ No newline at end of file \ No newline at end of file
const Axios = axios.create({
baseURL: window._CONF_.apiUrl,
timeout: 0,
withCredentials: true,
headers: {
"Content-Type": "application/json;charset=UTF-8"
}
})
Axios.interceptors.request.use(
config => {
if (window.location.hostname === 'localhost')
{
config.headers.Authorization = '34cdfc09-4ff1-44ac-9e9b-0b0da9b3047a'
}
else
{
config.headers.Authorization = Cookies.get('atoken')
}
return config
},
error => {
return Promise.reject(error)
}
)
Axios.interceptors.response.use(
res => {
// if (res.data.enote || res.data.code === 401) {
// ELEMENT.MessageBox.alert('授权到期, 请重新登录', '提示', {
// confirmButtonText: '确定',
// callback: action => {
// console.log('action', action)
// window.location.replace(window.location.href + 'login.html')
// }
// });
// } else {
return Promise.resolve(res.data)
// }
},
error => {
console.error(error)
return Promise.reject(error)
}
)
function get(url, params = {}, config = {}) {
params['s'] = +new Date()
return Axios.get(url, {...config, params})
}
function post(url, params, config = {}) {
return Axios.post(url, params, config)
}
function deletes(url, params, config = {}) {
return Axios.delete(url, params, config)
}
function put(url, params, config = {}) {
return Axios.put(url, params, config)
}
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!