ko.ko/CviLux_fe
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'feature/headquartersSetting' into feature/dockerSetting

Browse Source
This commit is contained in:
koko 2025-10-20 09:52:34 +08:00
commit 41d389880d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/directives/draggable.js
View File

@ -4,13 +4,14 @@ const moveModal = (elmnt) => {
pos2 = 0, pos2 = 0,
pos3 = 0, pos3 = 0,
pos4 = 0; pos4 = 0;
document.body.addEventListener("mousedown", dragMouseDown, { elmnt.addEventListener("mousedown", dragMouseDown, {
passive: false, passive: false,
}); });
function dragMouseDown(e) { function dragMouseDown(e) {
console.log("dragMouseDown", e); console.log("dragMouseDown", e);
e = e || window.event; e = e || window.event;
if (e.button !== 0) return;
e.preventDefault(); e.preventDefault();
// get the mouse cursor position at startup: // get the mouse cursor position at startup:
pos3 = e.clientX; pos3 = e.clientX;

6
src/views/AssetManagement/components/AssetSubListAddModal.vue
View File

@ -69,11 +69,11 @@ const onOk = async () => {
formData.delete("file"); formData.delete("file");
formData.append("id", props.formState.id); formData.append("id", props.formState.id);
if (props.formState.file[0]) { if (Array.isArray(props.formState.file) && props.formState.file[0]) {
formData.append("file", props.formState.file[0]); formData.append("file", props.formState.file[0]);
} }
if (props.formState.Device_image) { if (props.formState.device_image && props.formState.file.length !== 0) {
formData.append("Device_image", props.formState.Device_image); formData.append("device_image", props.formState.device_image);
} }
const res = await postAssetSubList(formData); const res = await postAssetSubList(formData);