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

V20240724保存

上级 aeaf1529
流水线 #28015 已通过 ,包含阶段
in 37 second
.ivu-modal-close .ivu-icon-ios-close[data-v-1240b046]{color:red;font-weight:700}
\ No newline at end of file
.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} .tiledContainer[data-v-6f8cfbc8]{width:100%;min-height:566px;padding-top:10px}.tiledContainer .tiledContainer-h[data-v-6f8cfbc8]{width:100%;height:50px;background-color:#f8f8fa;padding:10px;display:flex;justify-content:space-between;align-content:center}.tiledContainer .tiledContainer-c[data-v-6f8cfbc8]{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-6f8cfbc8]{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-6f8cfbc8]:hover{transition:border;transition-duration:.2s;transition-timing-function:unset;border:1px solid #1e93ff}.tiledContainer .tiledContainer-item:hover .item_[data-v-6f8cfbc8]{cursor:pointer;margin-right:5px;width:50px;height:50px}.demo-split[data-v-6f8cfbc8]{height:calc(100vh - 112px)}.demo-split .demo-split-pane-L[data-v-6f8cfbc8]{padding:10px;height:100%;background-color:#fff}.demo-split .demo-split-pane-R[data-v-6f8cfbc8]{padding-left:24px}.bottom[data-v-6f8cfbc8],.top[data-v-6f8cfbc8]{text-align:center}.center[data-v-6f8cfbc8]{width:300px;margin:10px auto;overflow:hidden}.center-left[data-v-6f8cfbc8]{float:left}.center-right[data-v-6f8cfbc8]{float:right}
\ No newline at end of file \ 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
<!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> <!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.b8c1148c.js></script></body></html>
\ No newline at end of file \ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
import { type AxiosRequestConfig } from "axios";
/**
* 获取域名
* /api/Common/GetDomainName
*/
export declare function getApiCommonGetDomainName(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 获取域名
* /api/Common/GetDomainName
*/
export function getApiCommonGetDomainName(config) {
return request.get(`/api/Common/GetDomainName`, config);
}
...@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect"; ...@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect";
export * from "./getApiCommonGetTypeAndRoomList"; export * from "./getApiCommonGetTypeAndRoomList";
export * from "./postApiCommonImageUpLoad"; export * from "./postApiCommonImageUpLoad";
export * from "./getApiCommonGetMaxAndMinOccupyseat"; export * from "./getApiCommonGetMaxAndMinOccupyseat";
export * from "./getApiCommonGetDomainName";
...@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect"; ...@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect";
export * from "./getApiCommonGetTypeAndRoomList"; export * from "./getApiCommonGetTypeAndRoomList";
export * from "./postApiCommonImageUpLoad"; export * from "./postApiCommonImageUpLoad";
export * from "./getApiCommonGetMaxAndMinOccupyseat"; export * from "./getApiCommonGetMaxAndMinOccupyseat";
export * from "./getApiCommonGetDomainName";
import { type AxiosRequestConfig } from "axios";
/**
* 暂时离开超时
* /api/TimeTask/DepartureTimeout
*/
export declare function getApiTimeTaskDepartureTimeout(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 暂时离开超时
* /api/TimeTask/DepartureTimeout
*/
export function getApiTimeTaskDepartureTimeout(config) {
return request.get(`/api/TimeTask/DepartureTimeout`, config);
}
import { type AxiosRequestConfig } from "axios"; import { type AxiosRequestConfig } from "axios";
/** /**
* 未签到加入不良记录 * 未签到签退加入不良记录
* /api/TimeTask/NotSigned * /api/TimeTask/NotSigned
*/ */
export declare function getApiTimeTaskNotSigned(config?: AxiosRequestConfig): import("axios").AxiosPromise<{ export declare function getApiTimeTaskNotSigned(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
......
import request from "@/plugins/request"; import request from "@/plugins/request";
/** /**
* 未签到加入不良记录 * 未签到签退加入不良记录
* /api/TimeTask/NotSigned * /api/TimeTask/NotSigned
*/ */
export function getApiTimeTaskNotSigned(config) { export function getApiTimeTaskNotSigned(config) {
......
export * from "./getApiTimeTaskOccupyseatUseReminder"; export * from "./getApiTimeTaskOccupyseatUseReminder";
export * from "./getApiTimeTaskNotSigned"; export * from "./getApiTimeTaskNotSigned";
export * from "./getApiTimeTaskDepartureTimeout";
export * from "./getApiTimeTaskOccupyseatUseReminder"; export * from "./getApiTimeTaskOccupyseatUseReminder";
export * from "./getApiTimeTaskNotSigned"; export * from "./getApiTimeTaskNotSigned";
export * from "./getApiTimeTaskDepartureTimeout";
...@@ -52,7 +52,7 @@ class ConfigDict { ...@@ -52,7 +52,7 @@ class ConfigDict {
//活动状态 //活动状态
'0': 'blue', '0': 'blue',
'1': 'success', '1': 'success',
'2': 'primary', '2': 'default',
'3': 'error', '3': 'error',
'9': 'default', '9': 'default',
} }
......
...@@ -36,6 +36,42 @@ export function blobFileDown(res) { ...@@ -36,6 +36,42 @@ export function blobFileDown(res) {
window.URL.revokeObjectURL(href); //释放掉blob对象 window.URL.revokeObjectURL(href); //释放掉blob对象
} }
export function setSession(value,key){
//设置session
window.sessionStorage.setItem(key,JSON.stringify(value));
}
export function getSession(key1){
//获取session
let info = JSON.parse(window.sessionStorage.getItem(key1));
return info ? info :{};
}
export function setStorage(value,key){
//设置Storage
window.localStorage.setItem(key,JSON.stringify(value));
}
export function getStorage(key){
//获取Storage
let info = JSON.parse(window.localStorage.getItem(key));
return info ? info :{};
}
export function saveForm(ok, cancel) { export function saveForm(ok, cancel) {
// 公共弹窗删除 // 公共弹窗删除
......
...@@ -82,7 +82,9 @@ export default { ...@@ -82,7 +82,9 @@ export default {
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' }], area: [{ required: true, message: '房间类型不能为空', trigger: 'change' }],
room_address: [{ required: true, message: '房间地址不能为空', trigger: 'change' }],
time_split: [{ type:'string', required: true, message: '分割时间段不能为空', trigger: 'change' }],
service_interval_time: [{type:'array', required: true, message: '房间默认开放时间不能为空', trigger: 'change' }],
}, },
defaultFormData: { defaultFormData: {
"room_name": "", "room_name": "",
...@@ -517,7 +519,7 @@ export default { ...@@ -517,7 +519,7 @@ export default {
// 新增 // 新增
add(){ add(){
this.flag = 'add' this.flag = 'add'
this.$refs.ceditmodal.regionDot = [] this.$refs.ceditmodal.regionDot = [];
this.regionDot = [ this.regionDot = [
{lat:19.984440261076596,lng:110.3360903263092}, {lat:19.984440261076596,lng:110.3360903263092},
{lat:19.98417306653825,lng:110.33607959747314}, {lat:19.98417306653825,lng:110.33607959747314},
...@@ -563,7 +565,7 @@ export default { ...@@ -563,7 +565,7 @@ 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.modalInit('edit', res.response) this.$refs.ceditmodal.modalInit('edit', {...res.response,time_split:String(res.response.time_split)})
this.editModalLoading = false this.editModalLoading = false
}).catch((e)=>{ }).catch((e)=>{
...@@ -636,19 +638,11 @@ export default { ...@@ -636,19 +638,11 @@ export default {
qrCode(row){ qrCode(row){
//生成钥匙二维码 //生成钥匙二维码
this.room.row = row this.room.row = row
this.room.src = `/occupyseat/wx/#/scanRoomQrcode?room_id=${row.room_id}` this.room.src = `${hooks.getStorage('doMain')}/SRFlowIfream/view/index.html?links=${hooks.getStorage('doMain')}/occupyseat/wx/#/scanRoomQrcode?room_id=${row.room_id}`
// this.room.src = `/occupyseat/wx/#/scanRoomQrcode?room_id=${row.room_id}`
this.room.show = true this.room.show = true
}, },
} }
} }
</script> </script>
...@@ -732,4 +726,5 @@ export default { ...@@ -732,4 +726,5 @@ export default {
color: red; color: red;
font-weight: 700; font-weight: 700;
} }
</style> </style>
...@@ -302,7 +302,8 @@ export default { ...@@ -302,7 +302,8 @@ export default {
qrCode(row){ qrCode(row){
//生成钥匙二维码 //生成钥匙二维码
this.room.row = row this.room.row = row
this.room.src = `/occupyseat/wx/#/scanRoomQrcode?seat_id=${row.seat_id}` this.room.src = `${hooks.getStorage('doMain')}/SRFlowIfream/view/index.html?links=${hooks.getStorage('doMain')}/occupyseat/wx/#/scanRoomQrcode?seat_id=${row.seat_id}`
// this.room.src = `/occupyseat/wx/#/scanRoomQrcode?seat_id=${row.seat_id}`
this.room.show = true this.room.show = true
}, },
......
...@@ -6,6 +6,7 @@ import router from '@/router'; ...@@ -6,6 +6,7 @@ import router from '@/router';
import Setting from '@/setting'; import Setting from '@/setting';
import Vue from "vue"; import Vue from "vue";
import * as config from '@/config/index' import * as config from '@/config/index'
import * as hooks from '@/hook/index'
import { AccountLogin, AccountRegister } from '@api/account'; import { AccountLogin, AccountRegister } from '@api/account';
import { Modal } from 'view-design'; import { Modal } from 'view-design';
...@@ -41,15 +42,15 @@ export default { ...@@ -41,15 +42,15 @@ export default {
await api.getApiGetTokenInfo().then(async res => { await api.getApiGetTokenInfo().then(async res => {
// 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置 // 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置
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],
// rolelist: userObj.role_and_power.length == 0 ? [] : userObj.role_and_power,
// currentRole: userObj.role_and_power[0].role_id,
// currentRoleName: userObj.role_and_power[0].role_name,
} }
api.getApiCommonGetDomainName().then(doMain=>{
hooks.setStorage(doMain.response,'doMain')
})
// 获取动态菜单 // 获取动态菜单
// if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, {root: true}); // if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, {root: true});
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或