提交 aeaf1529 编写于 作者: 刘英杰's avatar 刘英杰

V20240627保存

上级 e2f6669c
流水线 #27920 已通过 ,包含阶段
in 35 second
...@@ -8,7 +8,7 @@ stages: ...@@ -8,7 +8,7 @@ stages:
build: build:
stage: publish stage: publish
script: script:
- remove-item -Force -Recurse D:\ASC_web\A00051\occupancyManagement\pc* # - remove-item -Force -Recurse D:\ASC_web\A00051\occupancyManagement\pc*
- xcopy "dist" "D:\ASC_web\A00051\occupancyManagement\pc\" /s/e/y/ - xcopy "dist" "D:\ASC_web\A00051\occupancyManagement\pc\" /s/e/y/
only: only:
- pc - pc
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px} .ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.mainDiv[data-v-320a95b4]{width:100%;height:100%;display:flex;flex-wrap:wrap;justify-content:space-between}.mainDiv .bigCard[data-v-320a95b4],.mainDiv .smallCard[data-v-320a95b4]{margin-bottom:16px}.mainDiv .bigCard[data-v-320a95b4] .ivu-card-body,.mainDiv .smallCard[data-v-320a95b4] .ivu-card-body{height:calc(100% - 51px)}.mainDiv .bigCard[data-v-320a95b4] .ivu-card-body .ivu-form-item,.mainDiv .smallCard[data-v-320a95b4] .ivu-card-body .ivu-form-item{margin-bottom:12px}.mainDiv .bigCard[data-v-320a95b4]{width:calc(50% - 8px)}.mainDiv .smallCard[data-v-320a95b4]{width:calc(33.33333% - 10.66667px)}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body{overflow:auto}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP]{display:flex;justify-content:space-between}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]{color:#ed4014}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:hover{color:#f16643}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:active{color:#e13d13}.mainDiv[data-v-320a95b4] .cplhsCard .ivu-card-body{display:flex;flex-direction:column;justify-content:space-evenly}.mainDiv[data-v-320a95b4] .save-bt{text-align:right;position:absolute;bottom:16px;right:16px}.mainDiv .roomOpeningHours[data-v-320a95b4]{display:flex;justify-content:space-between;flex-wrap:wrap}.mainDiv .flexBetWeen[data-v-320a95b4]{width:100%;height:100%;display:flex;justify-content:space-between} .ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.mainDiv[data-v-320a95b4]{width:100%;height:100%;display:flex;flex-wrap:wrap;justify-content:space-between}.mainDiv .bigCard[data-v-320a95b4],.mainDiv .smallCard[data-v-320a95b4]{margin-bottom:16px}.mainDiv .bigCard[data-v-320a95b4] .ivu-card-body,.mainDiv .smallCard[data-v-320a95b4] .ivu-card-body{height:calc(100% - 51px)}.mainDiv .bigCard[data-v-320a95b4] .ivu-card-body .ivu-form-item,.mainDiv .smallCard[data-v-320a95b4] .ivu-card-body .ivu-form-item{margin-bottom:12px}.mainDiv .bigCard[data-v-320a95b4]{width:calc(50% - 8px)}.mainDiv .smallCard[data-v-320a95b4]{width:calc(33.33333% - 10.66667px)}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body{overflow:auto}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP]{display:flex;justify-content:space-between}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]{color:#ed4014}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:hover{color:#f16643}.mainDiv[data-v-320a95b4] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:active{color:#e13d13}.mainDiv[data-v-320a95b4] .cplhsCard .ivu-card-body{display:flex;flex-direction:column;justify-content:space-evenly}.mainDiv[data-v-320a95b4] .save-bt{text-align:right;position:absolute;bottom:16px;right:16px}.mainDiv .roomOpeningHours[data-v-320a95b4]{display:flex;justify-content:space-between;flex-wrap:wrap}.mainDiv .flexBetWeen[data-v-320a95b4]{width:100%;height:100%;display:flex;justify-content:space-between}
\ No newline at end of file \ No newline at end of file
.tiledContainer[data-v-0f60ba39]{width:100%;min-height:566px;padding-top:10px}.tiledContainer .tiledContainer-h[data-v-0f60ba39]{width:100%;height:50px;background-color:#f8f8fa;padding:10px;display:flex;justify-content:space-between;align-content:center}.tiledContainer .tiledContainer-c[data-v-0f60ba39]{position:relative;display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fit,minmax(100px,auto));align-content:start;justify-content:start;height:34%;padding:10px;list-style:none}.tiledContainer .tiledContainer-item[data-v-0f60ba39]{height:120px;padding:15px;display:flex;justify-content:center;align-items:center;border:1px solid #e3e1e1;cursor:pointer;flex-wrap:wrap}.tiledContainer .tiledContainer-item[data-v-0f60ba39]:hover{transition:border;transition-duration:.2s;transition-timing-function:unset;border:1px solid #1e93ff}.tiledContainer .tiledContainer-item:hover .item_[data-v-0f60ba39]{cursor:pointer;margin-right:5px;width:50px;height:50px}.demo-split[data-v-0f60ba39]{height:calc(100vh - 112px)}.demo-split .demo-split-pane-L[data-v-0f60ba39]{padding:10px;height:100%;background-color:#fff}.demo-split .demo-split-pane-R[data-v-0f60ba39]{padding-left:24px}.bottom[data-v-0f60ba39],.top[data-v-0f60ba39]{text-align:center}.center[data-v-0f60ba39]{width:300px;margin:10px auto;overflow:hidden}.center-left[data-v-0f60ba39]{float:left}.center-right[data-v-0f60ba39]{float:right} .tiledContainer[data-v-5e121241]{width:100%;min-height:566px;padding-top:10px}.tiledContainer .tiledContainer-h[data-v-5e121241]{width:100%;height:50px;background-color:#f8f8fa;padding:10px;display:flex;justify-content:space-between;align-content:center}.tiledContainer .tiledContainer-c[data-v-5e121241]{position:relative;display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fit,minmax(100px,auto));align-content:start;justify-content:start;height:34%;padding:10px;list-style:none}.tiledContainer .tiledContainer-item[data-v-5e121241]{height:120px;padding:15px;display:flex;justify-content:center;align-items:center;border:1px solid #e3e1e1;cursor:pointer;flex-wrap:wrap}.tiledContainer .tiledContainer-item[data-v-5e121241]:hover{transition:border;transition-duration:.2s;transition-timing-function:unset;border:1px solid #1e93ff}.tiledContainer .tiledContainer-item:hover .item_[data-v-5e121241]{cursor:pointer;margin-right:5px;width:50px;height:50px}.demo-split[data-v-5e121241]{height:calc(100vh - 112px)}.demo-split .demo-split-pane-L[data-v-5e121241]{padding:10px;height:100%;background-color:#fff}.demo-split .demo-split-pane-R[data-v-5e121241]{padding-left:24px}.bottom[data-v-5e121241],.top[data-v-5e121241]{text-align:center}.center[data-v-5e121241]{width:300px;margin:10px auto;overflow:hidden}.center-left[data-v-5e121241]{float:left}.center-right[data-v-5e121241]{float:right}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px} .ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-98ed90d0]{color:#515a6e}.cyrIcon[data-v-98ed90d0]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-98ed90d0]:active{color:#3f485c} .ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-5d1582ba]{color:#515a6e}.cyrIcon[data-v-5d1582ba]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-5d1582ba]:active{color:#3f485c}
\ No newline at end of file \ No newline at end of file
.ivu-modal-close .ivu-icon-ios-close[data-v-7980c3ab]{color:red;font-weight:700}
\ No newline at end of file
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px} .ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-2a1252fa]{color:#515a6e}.cyrIcon[data-v-2a1252fa]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-2a1252fa]:active{color:#3f485c} .ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-4a9ee69e]{color:#515a6e}.cyrIcon[data-v-4a9ee69e]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-4a9ee69e]:active{color:#3f485c}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-0148f294]{color:#515a6e}.cyrIcon[data-v-0148f294]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-0148f294]:active{color:#3f485c}
\ No newline at end of file
.ivu-modal-close .ivu-icon-ios-close[data-v-33f0d42e]{color:red;font-weight:700}
\ No newline at end of file
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px} .ivu-form-item[data-v-6054bc96]{padding-right:15px}.fileRow[data-v-6054bc96]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-6054bc96]{color:#ed4014}.fileRow .delIcon[data-v-6054bc96]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-00c9bf51]{padding-right:15px}.fileRow[data-v-00c9bf51]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-00c9bf51]{color:#ed4014}.fileRow .delIcon[data-v-00c9bf51]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-a66708ae]{color:#515a6e}.cyrIcon[data-v-a66708ae]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-a66708ae]:active{color:#3f485c}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>自习室占座预约系统</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/js?v=2.exp&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W&libraries=drawing,geometry,place,convertor,visualization"></script><script src=https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js></script><script src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 自习室占座预约系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.6916cc08.js></script><script src=js/app.355c0a19.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>自习室占座预约系统</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/js?v=2.exp&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W&libraries=drawing,geometry,place,convertor,visualization"></script><script src=https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js></script><script src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 自习室占座预约系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.6916cc08.js></script><script src=js/app.15447f3b.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -90,8 +90,7 @@ ...@@ -90,8 +90,7 @@
format="yyyy-MM-dd" format="yyyy-MM-dd"
:placeholder="'请选择'+item.name" :placeholder="'请选择'+item.name"
@on-change="(val1, val2) => datetimeChange1(val1, val2, item.id)"/> @on-change="(val1, val2) => datetimeChange1(val1, val2, item.id)"/>
<div v-else-if="item.type == 'area'"> <div v-else-if="item.type === 'area'">
<!-- <span v-if="formData[item['id']].length > 2" style="margin-right: 10px;">已设置范围</span>-->
<Button type="primary" ghost @click="setMap">{{ ['设置区域' ,'更改区域'][Number(regionDot.length >0)] }}</Button> <Button type="primary" ghost @click="setMap">{{ ['设置区域' ,'更改区域'][Number(regionDot.length >0)] }}</Button>
</div> </div>
</FormItem> </FormItem>
...@@ -137,14 +136,12 @@ ...@@ -137,14 +136,12 @@
<span style="color: #1e93ff;cursor: pointer">查看</span> <span style="color: #1e93ff;cursor: pointer">查看</span>
</span> </span>
<div v-if="item.type == 'area'"> <div v-if="item.type == 'area'">
<Button type="primary" ghost @click="setMap">查看区域</Button> <Button type="primary" ghost @click="setMap">查看区域</Button>
</div> </div>
<!-- 存在问题:性别项,有时返回值为null,select的“不限”值为空字符串,会报错 --> <!-- 存在问题:性别项,有时返回值为null,select的“不限”值为空字符串,会报错 -->
<span v-if="item.type == 'select'"> <span v-if="item.type == 'select'">
{{ item.optList[item.optList.findIndex(a => a.value == formData[item.id])].label }} {{ item.optList[item.optList.findIndex(a => a.value == formData[item.id])].label }}
</span> </span>
<span v-if="item.type == 'switch'">{{ `${formData[item.id] == 1 ? '是' : '否'}` }}</span> <span v-if="item.type == 'switch'">{{ `${formData[item.id] == 1 ? '是' : '否'}` }}</span>
</FormItem> </FormItem>
......
<template> <template>
<span class="i-layout-header-trigger i-layout-header-trigger-min"> <span class="i-layout-header-trigger i-layout-header-trigger-min">
<!-- <Dropdown :trigger="isMobile ? 'click' : 'hover'" class="i-layout-header-user" <Dropdown :trigger="isMobile ? 'click' : 'hover'" class="i-layout-header-user"
:class="{ 'i-layout-header-user-mobile': isMobile }" @on-click="handleClick"> :class="{ 'i-layout-header-user-mobile': isMobile }" @on-click="handleClick">
<Avatar size="default" icon="ios-person" style="background-color: #2D8CF0;"/> <Avatar size="default" icon="ios-person" style="background-color: #2D8CF0;"/>
<span class="i-layout-header-user-name" v-if="!isMobile">{{ userName }}</span> <span class="i-layout-header-user-name" v-if="!isMobile">{{ userName }}</span>
<DropdownMenu slot="list"> <!-- <DropdownMenu slot="list">
<i-link to="/setting/user"> <i-link to="/setting/user">
<DropdownItem> <DropdownItem>
<Icon type="ios-contact-outline" /> <Icon type="ios-contact-outline" />
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
<Icon type="ios-log-out" /> <Icon type="ios-log-out" />
<span>{{ $t('basicLayout.user.logOut') }}</span> <span>{{ $t('basicLayout.user.logOut') }}</span>
</DropdownItem> </DropdownItem>
</DropdownMenu> </DropdownMenu>-->
</Dropdown> --> </Dropdown>
<Dropdown <!-- <Dropdown
:trigger="isMobile ? 'click' : 'hover'" :trigger="isMobile ? 'click' : 'hover'"
class="i-layout-header-user" class="i-layout-header-user"
:class="{ 'i-layout-header-user-mobile': isMobile }" :class="{ 'i-layout-header-user-mobile': isMobile }"
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<span>{{ item.role_name }}</span> <span>{{ item.role_name }}</span>
</DropdownItem> </DropdownItem>
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>-->
<span style="margin-left:8px;"> <span style="margin-left:8px;">
<Icon type="md-power" @click="handleLogout"/> <Icon type="md-power" @click="handleLogout"/>
</span> </span>
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
}, },
computed: { computed: {
...mapState('admin/user', [ ...mapState('admin/user', [
'info' 'info',
]), ]),
...mapState('admin/layout', [ ...mapState('admin/layout', [
'isMobile', 'isMobile',
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<!-- <img src="@/assets/images/logo-small.png" v-if="menuCollapse"> <!-- <img src="@/assets/images/logo-small.png" v-if="menuCollapse">
<img src="@/assets/images/logo.png" v-else-if="siderTheme === 'light'"> <img src="@/assets/images/logo.png" v-else-if="siderTheme === 'light'">
<img src="@/assets/images/logo-dark.png" v-else> --> <img src="@/assets/images/logo-dark.png" v-else> -->
<h1>占座管理系统</h1> <h1>自习室位置预约</h1>
</i-link> </i-link>
</transition> </transition>
</div> </div>
......
...@@ -219,16 +219,21 @@ export default { ...@@ -219,16 +219,21 @@ export default {
}, },
signRecord(recordId){ signRecord(recordId){
//签到轨迹 //签到轨迹
this.signTimeLine.show = true this.signTimeLine.data = []
api.getApiRecordGetRecordTrackDetailsList({id: recordId}).then(re => {
//获取活动的签到记录 hooks.myEncapsulationFunction(()=>{
this.signTimeLine.data = re.response.map(cur=>{ return api.getApiRecordGetRecordTrackDetailsList({id: recordId}).then(re => {
return{ //获取活动的签到记录
...cur, if (re.code === 1) this.signTimeLine.show = true
color:['green','green','blue'][cur.sign_state] this.signTimeLine.data = re.response.map(cur=>{
} return{
}); ...cur,
}) color:['green','green','blue'][cur.sign_state]
}
});
return re
})
},true,'正在加载中...')
}, },
confirmElimination(row) { confirmElimination(row) {
//确认剔除座位 //确认剔除座位
...@@ -362,24 +367,19 @@ export default { ...@@ -362,24 +367,19 @@ export default {
<!-- 活动签到轨迹--> <!-- 活动签到轨迹-->
<Modal <Modal
v-model="signTimeLine.show" v-model="signTimeLine.show"
title="剔除占座" title="活动签到轨迹"
width="450" width="450"
@on-cancel="signTimeLine.show = false"> @on-cancel="signTimeLine.show = false">
<Timeline> <Timeline>
<TimelineItem v-for="(item,index) in signTimeLine.data" :key="index"> <TimelineItem v-for="(item,index) in [...signTimeLine.data]" :key="index">
<h3>【{{ dict.signOrSignOutStatus[item.sign_state] }}】</h3> <h3>【{{ dict.signOrSignOutStatus[item.sign_state] }}】</h3>
<p>地址:{{ item.address }}</p> <p>地址:{{ item.address }}</p>
<p>时间:{{ item.createtime }}</p> <p>时间:{{ item.createtime }}</p>
<viewer>
<viewer :images="[item.file_info].map(cur=>url+cur.path)">
<div v-for="(ite, index) in [item.file_info]" :key="index"> <div v-for="(ite, index) in [item.file_info]" :key="index">
<img :src="ite.path" fit="contain" width="120px" height="80px" @click="handleShowPreview([item.file_info])" /> <img :src="ite.path" width="120px" height="80px" />
</div> </div>
</viewer> </viewer>
</TimelineItem> </TimelineItem>
</Timeline> </Timeline>
</Modal> </Modal>
......
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
{ key: 'remark', title: '备注', align: 'center', minWidth: 150, show: true }, { key: 'remark', title: '备注', align: 'center', minWidth: 150, show: true },
{ key: 'end_time', title: '解除时间', align: 'center', minWidth: 150, show: true }, { key: 'end_time', title: '解除时间', align: 'center', minWidth: 150, show: true },
{ slot: 'state', title: '违规状态', align: 'center', minWidth: 150, show: true }, { slot: 'state', title: '违规状态', align: 'center', minWidth: 150, show: true },
{ slot: 'action', title: '操作', align: 'center', minWidth: 180, show: true, fixed: 'right' }, { slot: 'action', title: '操作', align: 'center', minWidth: 100, show: true, fixed: 'right' },
], ],
tableLoading: false, tableLoading: false,
......
...@@ -51,17 +51,15 @@ export default { ...@@ -51,17 +51,15 @@ export default {
{ key: 'time_split', title: '分割时间段(分钟)', align: 'center', minWidth: 150, show: true }, { key: 'time_split', title: '分割时间段(分钟)', align: 'center', minWidth: 150, show: true },
{ slot: 'generalSwitch', title: '房间状态', align: 'center', minWidth: 80, show: true }, { slot: 'generalSwitch', title: '房间状态', align: 'center', minWidth: 80, show: true },
{ slot: 'roomQrCode', title: '房间二维码', align: 'center', minWidth: 150, show: true }, { slot: 'roomQrCode', title: '房间二维码', align: 'center', minWidth: 150, show: true },
{ slot: 'action', title: '操作', align: 'center', minWidth: 240, show: true, fixed: 'right' }, { slot: 'action', title: '操作', align: 'center', minWidth: 180, show: true, fixed: 'right' },
], ],
tableLoading: false, tableLoading: false,
tableData:[], tableData:[],
tableSize: 'default', tableSize: 'default',
tableFullscreen: false, tableFullscreen: false,
dataCount: 0, dataCount: 0,
collapse: false, collapse: false,
flag:'', flag:'',
editModalshow: false, editModalshow: false,
editModalLoading: false, editModalLoading: false,
// 新增编辑表单项 // 新增编辑表单项
...@@ -69,8 +67,8 @@ export default { ...@@ -69,8 +67,8 @@ export default {
{ id: 'room_name', name: '房间名称', type: 'input', disabled: false, require: false, optList: [] }, { id: 'room_name', name: '房间名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'room_type_id', name: '房间类型', type: 'select', disabled: false, require: false, optList: [] }, { id: 'room_type_id', name: '房间类型', type: 'select', disabled: false, require: false, optList: [] },
{ id: 'room_address', name: '房间地址', type: 'textarea', disabled: false, require: false, optList: [] }, { id: 'room_address', name: '房间地址', type: 'textarea', disabled: false, require: false, optList: [] },
{ id: 'attendance_area_list', name: '房间坐标区域', type: 'area', disabled: false, require: false, optList: [] }, { id: 'attendance_area_list', name: '房间坐标区域', type: 'area', disabled: false, require: true, optList: [] },
{ id: 'service_interval_time', name: '开放时间区间', type: 'timerange', disabled: false, require: false, optList: [] }, { id: 'service_interval_time', name: '房间默认开放时间', type: 'timerange', disabled: false, require: false, optList: [] },
{ id: 'time_split', name: '分割时间段/分钟', type: 'input', disabled: false, require: false, optList: [] }, { id: 'time_split', name: '分割时间段/分钟', type: 'input', disabled: false, require: false, optList: [] },
// { id: 'capacity', name: '座位数量', type: 'input', disabled: false, require: false, optList: [] }, // { id: 'capacity', name: '座位数量', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'sex', name: '性别', type: 'select', disabled: false, require: false, optList: [ { id: 'sex', name: '性别', type: 'select', disabled: false, require: false, optList: [
...@@ -83,6 +81,8 @@ export default { ...@@ -83,6 +81,8 @@ export default {
formRule: { formRule: {
room_name: [{ required: true, message: '房间名称不能为空', trigger: 'blur' }], room_name: [{ required: true, message: '房间名称不能为空', trigger: 'blur' }],
room_type_id: [{ required: true, message: '房间类型不能为空', trigger: 'change' }], room_type_id: [{ required: true, message: '房间类型不能为空', trigger: 'change' }],
area: [{ required: true, message: '房间类型不能为空', trigger: 'change' }],
}, },
defaultFormData: { defaultFormData: {
"room_name": "", "room_name": "",
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
"room_type_name": "", "room_type_name": "",
"room_address": "", "room_address": "",
"sex": "不限", "sex": "不限",
"service_interval_time": "", "service_interval_time": '',
"time_split":'', "time_split":'',
"is_enable": 1, "is_enable": 1,
"is_del": 0, "is_del": 0,
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
{ slot: 'state', title: '状态', align: 'center', minWidth: 120, show: true }, { slot: 'state', title: '状态', align: 'center', minWidth: 120, show: true },
{ key: 'borrow_userid', title: '借用者id', align: 'center', minWidth: 120, show: false }, { key: 'borrow_userid', title: '借用者id', align: 'center', minWidth: 120, show: false },
{ key: 'return_userid', title: '归还者id', align: 'center', minWidth: 120, show: false }, { key: 'return_userid', title: '归还者id', align: 'center', minWidth: 120, show: false },
{ slot: 'action', title: '操作', align: 'center', minWidth: 150, show: false, fixed: 'right' }, { slot: 'action', title: '操作', align: 'center', minWidth: 110, show: false, fixed: 'right' },
], ],
keyBTRecordsTableData: [], keyBTRecordsTableData: [],
keyBTRecordsTableLoading: false, keyBTRecordsTableLoading: false,
...@@ -205,6 +205,7 @@ export default { ...@@ -205,6 +205,7 @@ export default {
// 查询条件初始化 // 查询条件初始化
created(){}, created(){},
mounted(){ mounted(){
this.getsSystemConfigurationActivitiesAndSplitTime()
// this.setMap() // this.setMap()
// 获取房间类型 // 获取房间类型
this.asc.getApiTypeGetOccupyseatList({name:'',page_index:1,page_size:100}).then(res => { this.asc.getApiTypeGetOccupyseatList({name:'',page_index:1,page_size:100}).then(res => {
...@@ -221,6 +222,16 @@ export default { ...@@ -221,6 +222,16 @@ export default {
this.getData() this.getData()
}, },
methods: { methods: {
getsSystemConfigurationActivitiesAndSplitTime(){
//获取系统配置活动和分割时间
api.getApiSysConfigGetSysConfigAll().then(res=>{
res.response.forEach(cur=>{
if (cur.id === 'service_interval_time_occupyseat')this.defaultFormData.service_interval_time = cur.value.split('-');
if (cur.id === 'time_split_occupyseat')this.defaultFormData.time_split = cur.value
})
})
},
setMap() { setMap() {
this.mapModal = true; this.mapModal = true;
this.initMap(); this.initMap();
...@@ -445,9 +456,14 @@ export default { ...@@ -445,9 +456,14 @@ export default {
this.tableLoading = true this.tableLoading = true
this.asc.postApiRoomGetRoomList(this.params).then(res => { this.asc.postApiRoomGetRoomList(this.params).then(res => {
// console.log('查询数据', res) // console.log('查询数据', res)
this.tableData = res.response.data this.tableData = res.response.data.map(cur=>{
return{
...cur,
sex:cur.sex ? cur.sex :'不限',
}
})
console.log("🚀🚀🚀,",this.tableData)
this.dataCount = res.response.data_count this.dataCount = res.response.data_count
this.tableLoading = false this.tableLoading = false
}) })
}, },
...@@ -502,6 +518,11 @@ export default { ...@@ -502,6 +518,11 @@ export default {
add(){ add(){
this.flag = 'add' this.flag = 'add'
this.$refs.ceditmodal.regionDot = [] this.$refs.ceditmodal.regionDot = []
this.regionDot = [
{lat:19.984440261076596,lng:110.3360903263092},
{lat:19.98417306653825,lng:110.33607959747314},
{lat:19.98439488845108,lng:110.33644437789917},
]
this.editModalshow = true this.editModalshow = true
this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '新增场地') this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '新增场地')
}, },
...@@ -519,7 +540,10 @@ export default { ...@@ -519,7 +540,10 @@ export default {
this.regionDot = res.response.attendance_area_list this.regionDot = res.response.attendance_area_list
this.$refs.ceditmodal.regionDot = this.regionDot; //赋值给子组件 this.$refs.ceditmodal.regionDot = this.regionDot; //赋值给子组件
//11 //11
this.$refs.ceditmodal.modalDetailsInit(res.response, 'room_type_name') this.$refs.ceditmodal.modalDetailsInit({
...res.response,
sex:res.response.sex?res.response.sex:'不限'
}, 'room_type_name')
this.editModalLoading = false this.editModalLoading = false
}) })
}, },
...@@ -550,8 +574,7 @@ export default { ...@@ -550,8 +574,7 @@ export default {
}, },
// 新增编辑提交 // 新增编辑提交
modalSubmit(val) { modalSubmit(val) {
if (!!val.attendance_area_list.length){
// console.log('modal提交', val)
hooks.publicConfirm(()=>hooks.myEncapsulationFunction(()=>{ hooks.publicConfirm(()=>hooks.myEncapsulationFunction(()=>{
if (this.flag == 'add'){ if (this.flag == 'add'){
return this.asc.postApiRoomRoomIns(val).then(res => { return this.asc.postApiRoomRoomIns(val).then(res => {
...@@ -574,6 +597,9 @@ export default { ...@@ -574,6 +597,9 @@ export default {
}) })
} }
})) }))
}else{
this.$Message.warning('房间区域不能为空')
}
}, },
// 删除 // 删除
rowDelete(row) { rowDelete(row) {
...@@ -630,7 +656,6 @@ export default { ...@@ -630,7 +656,6 @@ export default {
<!-- 场地管理 --> <!-- 场地管理 -->
<div> <div>
<Modal v-model="mapModal" fullscreen title="设置区域"> <Modal v-model="mapModal" fullscreen title="设置区域">
<div> <div>
<Select prefix="md-pin" style="width: 300px; margin-bottom: 10px; border: 1px solid #269aea;" filterable <Select prefix="md-pin" style="width: 300px; margin-bottom: 10px; border: 1px solid #269aea;" filterable
:remote-method="remoteMethod" @on-select="currentItem" clearable placeholder="输入地点名称、关键字"> :remote-method="remoteMethod" @on-select="currentItem" clearable placeholder="输入地点名称、关键字">
...@@ -640,7 +665,6 @@ export default { ...@@ -640,7 +665,6 @@ export default {
</Select> </Select>
</div> </div>
<div id="container" style="width: 100%;height: 100%"></div> <div id="container" style="width: 100%;height: 100%"></div>
<template #footer> <template #footer>
<Button @click="resetRegion">清除区域</Button> <Button @click="resetRegion">清除区域</Button>
<Button @click="setRegion" class="ivu-ml" type="primary">生成区域</Button> <Button @click="setRegion" class="ivu-ml" type="primary">生成区域</Button>
...@@ -693,15 +717,13 @@ export default { ...@@ -693,15 +717,13 @@ export default {
:width="800" :width="800"
@setMap="setMap" @setMap="setMap"
@onClose="editModalshow = false" @onClose="editModalshow = false"
@onSubmit="modalSubmit"></CEditModal> @onSubmit="modalSubmit">
</CEditModal>
</Card> </Card>
<Modal footer-hide v-model="room.show" width="350" :title="`房间名称:${room.row.room_name}`"> <Modal footer-hide v-model="room.show" width="350" :title="`房间名称:${room.row.room_name}`">
<div style="width: 100%;display: flex;justify-content: center" > <div style="width: 100%;display: flex;justify-content: center" >
<vue-qr class=" " :text="room.src" :size="300"></vue-qr> <vue-qr class=" " :text="room.src" :size="300"></vue-qr>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
......
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
{ key: 'name', title: '房间类型名称', align: 'center', minWidth: 150, show: true }, { key: 'name', title: '房间类型名称', align: 'center', minWidth: 150, show: true },
{ slot: 'is_sys', title: '是否系统创建', align: 'center', minWidth: 150, show: true }, { slot: 'is_sys', title: '是否系统创建', align: 'center', minWidth: 150, show: true },
{ slot: 'generalSwitch', title: '类型状态', align: 'center', minWidth: 80, show: true }, { slot: 'generalSwitch', title: '类型状态', align: 'center', minWidth: 80, show: true },
{ slot: 'actionAndDetails', title: '操作', align: 'center', minWidth: 180, show: true, fixed: 'right' }, { slot: 'actionAndDetails', title: '操作', align: 'center', Width: 150, show: true, fixed: 'right' },
], ],
tableLoading: false, tableLoading: false,
......
...@@ -406,7 +406,6 @@ export default { ...@@ -406,7 +406,6 @@ export default {
this.editModalLoading = false this.editModalLoading = false
}) })
}, },
modalSubmit(val) { modalSubmit(val) {
//基于叶子节点 获取房间类型 //基于叶子节点 获取房间类型
let typeData = hooks.findPathById(this.materialsTree,this.params.room_id); let typeData = hooks.findPathById(this.materialsTree,this.params.room_id);
......
...@@ -9,7 +9,7 @@ const Setting = { ...@@ -9,7 +9,7 @@ const Setting = {
* 基础配置 * 基础配置
* */ * */
// 网页标题的后缀 // 网页标题的后缀
titleSuffix: '占座管理系统', titleSuffix: '自习室位置预约',
// 路由模式,可选值为 history 或 hash // 路由模式,可选值为 history 或 hash
routerMode: 'hash', routerMode: 'hash',
// 应用的基路径 // 应用的基路径
......
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
util.cookies.set(config.occupancy.userInfo, res.response); util.cookies.set(config.occupancy.userInfo, res.response);
let userObj = res.response; let userObj = res.response;
var info = { var info = {
// name: idt.GetTokenParams(idt.GetToken()).name ||'', name: idt.GetTokenParams(idt.GetToken()).name ,
avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar', avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
// access: userObj.role_and_power.length == 0 ? [] : [userObj.role_and_power[0].role_id], // access: userObj.role_and_power.length == 0 ? [] : [userObj.role_and_power[0].role_id],
// rolelist: userObj.role_and_power.length == 0 ? [] : userObj.role_and_power, // rolelist: userObj.role_and_power.length == 0 ? [] : userObj.role_and_power,
...@@ -66,20 +66,6 @@ export default { ...@@ -66,20 +66,6 @@ export default {
.catch(err => { .catch(err => {
reject(err); reject(err);
}) })
// util.cookies.set('uuid', 'asc666');
// util.cookies.set('token', 'rooooo');
// 设置 vuex 用户信息
// var info = {
// name: 'asc666',
// avatar: 'https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar',
// access: [localStorage.getItem('menu') ? 'admin' : "xxx"]
// }
// // await
// dispatch('admin/user/set', info, {root: true});
// // 用户登录后从持久化数据加载一系列的设置
// dispatch('load');
// // 结束
// resolve();
}) })
}, },
/** /**
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或