YUSHENG/yusheng-admin
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
yziiy
2026-01-22 10:09:52 +08:00
parent ffa5964e3f
commit 3cbdfd5c33
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/http/config.ts
View File

@@ -1,7 +1,7 @@
export const URL = "https://yushengapi.qxyushen.top"; // export const URL = "https://yushengapi.qxyushen.top";
// 预测版 // 预测版
// export const URL = "https://vsyusheng.qxhs.xyz"; // export const URL = "https://vsyusheng.qxhs.xyz";
// 测试 // 测试
// export const URL = "https://test.vespa.qxyushen.top"; export const URL = "https://test.vespa.qxyushen.top";
// 声网appId 在这里换 // 声网appId 在这里换
export const appIdBySw = "02f7339ec98947deaeab173599891932"; export const appIdBySw = "02f7339ec98947deaeab173599891932";

17
src/views/room/roomList/form.vue
View File

@@ -20,8 +20,7 @@ const formRules = ref({
is_show_room: [{ required: true, message: '请选择', trigger: 'change' }], is_show_room: [{ required: true, message: '请选择', trigger: 'change' }],
is_robot_num: [{ required: true, message: '请选择', trigger: 'change' }], is_robot_num: [{ required: true, message: '请选择', trigger: 'change' }],
robot_num: [{ required: true, message: '请输入机器人数量', trigger: 'blur' }], robot_num: [{ required: true, message: '请输入机器人数量', trigger: 'blur' }],
start_time: [{ required: true, message: '请选择开始时间', trigger: 'change' }], beginTime: [{ required: true, message: '请选择营业时间', trigger: 'change' }],
end_time: [{ required: true, message: '请选择结束时间', trigger: 'change' }]
}); });
const props = defineProps(["formInline", "roomDetail"]); const props = defineProps(["formInline", "roomDetail"]);
const typeList = ref([]) const typeList = ref([])
@@ -50,8 +49,7 @@ const newFormInline = ref(
robot_num: "", robot_num: "",
is_open_blind_box_turntable: "", is_open_blind_box_turntable: "",
sort: "", sort: "",
start_time: "", beginTime: ""
end_time: ""
} }
); );
function getRef() { function getRef() {
@@ -164,13 +162,10 @@ defineExpose({ getRef });
<el-form-item label="机器人数量" prop="robot_num" v-if="newFormInline.is_robot_num == 1"> <el-form-item label="机器人数量" prop="robot_num" v-if="newFormInline.is_robot_num == 1">
<el-input-number v-model="newFormInline.robot_num" :min="1" :max="20"></el-input-number> <el-input-number v-model="newFormInline.robot_num" :min="1" :max="20"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="房间开始时间" prop="start_time"> <el-form-item label="房间营业时间" prop="beginTime">
<el-date-picker clearable v-model="newFormInline.start_time" type="datetime" :placeholder="`请选择开始时间`" <el-time-picker is-range v-model="newFormInline.beginTime" range-separator="至" start-placeholder="开始时间"
format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" /> end-placeholder="结束时间" format="HH:mm:ss" value-format="HH:mm:ss" placeholder="选择时间范围">
</el-form-item> </el-time-picker>
<el-form-item label="房间结束时间" prop="end_time">
<el-date-picker clearable v-model="newFormInline.end_time" type="datetime" :placeholder="`请选择结束时间`"
format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>

11
src/views/room/roomList/hook.tsx
View File

@@ -249,8 +249,7 @@ export function useData() {
robot_num: data?.robot_num ?? "", robot_num: data?.robot_num ?? "",
is_open_blind_box_turntable: data?.is_open_blind_box_turntable ?? "", is_open_blind_box_turntable: data?.is_open_blind_box_turntable ?? "",
sort: data?.sort ?? "", sort: data?.sort ?? "",
start_time: data?.start_time || '', beginTime: [data?.start_time || '', data?.end_time || '']
end_time: data?.end_time || ''
} }
}, },
width: "40%", width: "40%",
@@ -260,10 +259,14 @@ export function useData() {
const FormRef = formRef.value.getRef(); const FormRef = formRef.value.getRef();
const curData = options.props.formInline; const curData = options.props.formInline;
const updateData = async form => { const updateData = async form => {
const { code } = await updateRoomData({ const sendFormData = {
...form, ...form,
start_time: form.beginTime ? form.beginTime[0] : '',
end_time: form.beginTime ? form.beginTime[1] : '',
room_id: rowData.room_id room_id: rowData.room_id
}); }
delete sendFormData.beginTime
const { code } = await updateRoomData(sendFormData);
if (code) { if (code) {
message("修改成功", { type: "success" }); message("修改成功", { type: "success" });
onSearch(searchForm.value); onSearch(searchForm.value);

4
vite.config.ts
View File

@@ -39,8 +39,8 @@ export default ({ mode }: ConfigEnv): UserConfigExport => {
// "Access-Control-Allow-Origin", // "Access-Control-Allow-Origin",
// "http://adminvs.qxhs.xyz" // "http://adminvs.qxhs.xyz"
// ); // );
res.setHeader('Access-Control-Allow-Origin', 'http://yushenggliht.qxyushen.top'); // res.setHeader('Access-Control-Allow-Origin', 'http://yushenggliht.qxyushen.top');
// res.setHeader('Access-Control-Allow-Origin', 'https://test.vespa.qxyushen.top'); res.setHeader('Access-Control-Allow-Origin', 'https://test.vespa.qxyushen.top');
res.setHeader( res.setHeader(
"Access-Control-Allow-Methods", "Access-Control-Allow-Methods",
"GET, POST, PUT, DELETE, OPTIONS" "GET, POST, PUT, DELETE, OPTIONS"