diff --git a/src/views/AssetManagement/components/AssetTableModalLeftInfo.vue b/src/views/AssetManagement/components/AssetTableModalLeftInfo.vue
index 657aab2..82eda92 100644
--- a/src/views/AssetManagement/components/AssetTableModalLeftInfo.vue
+++ b/src/views/AssetManagement/components/AssetTableModalLeftInfo.vue
@@ -3,10 +3,12 @@ import { ref, inject, onBeforeMount, onMounted, watch } from "vue";
import * as yup from "yup";
import "yup-phone-lite";
import AssetTableModalLeftInfoIoT from "./AssetTableModalLeftInfoIoT.vue";
+import AssetTableModalLeftInfoDept from "./AssetTableModalLeftInfoDept.vue";
import AssetTableModalLeftInfoGraph from "./AssetTableModalLeftInfoGraph.vue";
+import AssetTableModalLeftInfoMQTT from "./AssetTableModalLeftInfoMQTT.vue";
import { getOperationCompanyList } from "@/apis/operation";
+import { getIOTSchema } from "@/apis/asset";
import useSearchParam from "@/hooks/useSearchParam";
-import OperationTableModal from "@/views/operation/components/OperationTableModal.vue";
import dayjs from "dayjs";
import { useI18n } from "vue-i18n";
const { t } = useI18n();
@@ -28,6 +30,15 @@ let schema = {
.number()
.transform((value) => (Number.isNaN(value) ? null : value))
.nullable(true),
+ response_schema_id: yup
+ .number()
+ .transform((value) => (Number.isNaN(value) ? null : value))
+ .nullable(true),
+ department_id: yup
+ .number()
+ .transform((value) => (Number.isNaN(value) ? null : value))
+ .nullable(true),
+ topic: yup.string().nullable(true),
asset_number: yup.string().nullable(true),
sub_device: yup.array().nullable(true),
oriFile: yup.array().nullable(true),
@@ -41,7 +52,10 @@ onBeforeMount(() => {
brand: "",
device_model: "",
operation_id: 0,
+ response_schema_id: 0,
+ department_id: 0,
asset_number: "",
+ topic: "",
sub_device: [],
oriFile: [],
buying_date: "",
@@ -80,28 +94,25 @@ watch(formState, (newValue) => {
}
});
-const updateFileList = (files) => {
- formState.value = { ...formState.value, oriFile: files };
-};
-
const companyOptions = ref([]);
+const iotSchemaOptions = ref([]);
const getCompany = async () => {
const res = await getOperationCompanyList();
companyOptions.value = res.data.map((d) => ({ ...d, key: d.id }));
};
+const getIOTSchemaOptions = async () => {
+ const res = await getIOTSchema();
+ iotSchemaOptions.value = res.data.map((d) => ({ ...d, key: d.id }));
+};
onMounted(() => {
getCompany();
+ getIOTSchemaOptions();
});
-
-const openCompanyAddModal = () => {
- changeParams({ ...searchParams.value, work_type: 3 }); // 開啟company Add modal
- operation_action_item.showModal();
-};
-
+
{{ $t("assetManagement.device_name") }}
@@ -109,15 +120,8 @@ const openCompanyAddModal = () => {
-
- Mac
-
- {{ formErrorMsg.operate_text }}
-
-
+
+
Tag_Name ({{ $t("assetManagement.fill_text") }})
@@ -127,28 +131,19 @@ const openCompanyAddModal = () => {
-
-
-
{{ $t("assetManagement.device_coordinate") }}
-
- {{ formErrorMsg.device_coordinate }}
-
-
+
+
+
+
{{ $t("assetManagement.asset_number") }}
@@ -156,7 +151,7 @@ const openCompanyAddModal = () => {
-
+
{{ $t("assetManagement.buying_date") }}
@@ -164,7 +159,7 @@ const openCompanyAddModal = () => {
-
+
{{ $t("assetManagement.brand") }}
@@ -172,7 +167,7 @@ const openCompanyAddModal = () => {
-
+
{{ $t("assetManagement.modal") }}
@@ -180,7 +175,7 @@ const openCompanyAddModal = () => {
-
+
-
-
+
-
diff --git a/src/views/AssetManagement/components/AssetTableModalLeftInfoDept.vue b/src/views/AssetManagement/components/AssetTableModalLeftInfoDept.vue
new file mode 100644
index 0000000..093debb
--- /dev/null
+++ b/src/views/AssetManagement/components/AssetTableModalLeftInfoDept.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/AssetManagement/components/AssetTableModalLeftInfoMQTT.vue b/src/views/AssetManagement/components/AssetTableModalLeftInfoMQTT.vue
new file mode 100644
index 0000000..51b92ac
--- /dev/null
+++ b/src/views/AssetManagement/components/AssetTableModalLeftInfoMQTT.vue
@@ -0,0 +1,134 @@
+
+
+
+
+
+ MQTT Topic
+
+
+
+
+
+
+
+
+
+ -
+ {{ message.topic }} :
+
{{ message.message }}
+
+
+
+
+
+ {{ countdown }} seconds
+
+
+
+
+
+
+
+
+
diff --git a/src/views/AssetManagement/components/AssetTableModalRightInfo.vue b/src/views/AssetManagement/components/AssetTableModalRightInfo.vue
index dea4c70..1c4a059 100644
--- a/src/views/AssetManagement/components/AssetTableModalRightInfo.vue
+++ b/src/views/AssetManagement/components/AssetTableModalRightInfo.vue
@@ -74,10 +74,10 @@ const defaultOption = (map, data = []) => {
watch(currentFloor, (newValue) => {
if (newValue?.floor_map_name) {
const coordinates = totalCoordinates.value[newValue.floor_guid] || [];
+ if (coordinates.length === 0 || coordinates.every(coord => coord === "")) return;
const parsedCoordinates = coordinates.map((coord) => {
return JSON.parse(coord);
});
-
asset_floor_chart.value.updateSvg(
{
full_name: newValue?.floor_map_name,
@@ -209,8 +209,8 @@ const onCancel = () => {
-
-
+
+
+
+
{{ $t("assetManagement.device_coordinate") }}
+
+ {{ formErrorMsg.device_coordinate }}
+
{
};
const updateDataSource = (data) => {
- dataSource.value = data.map((d) => ({ ...d, key: d.uuid }));
+ dataSource.value = (data || []).map((d) => ({ ...d, key: d.uuid }));
};
const search = async () => {
diff --git a/src/views/operation/Operation.vue b/src/views/operation/Operation.vue
index 15bf0d3..987cb2d 100644
--- a/src/views/operation/Operation.vue
+++ b/src/views/operation/Operation.vue
@@ -19,7 +19,7 @@ const store = useBuildingStore();
const dataSource = ref([]);
const updateDataSource = (data) => {
- dataSource.value = data.map((d) => ({
+ dataSource.value = (data || []).map((d) => ({
...d,
key: d.id,
start_time: d?.start_time ? dayjs(d?.start_time).format("YYYY-MM-DD") : "",
diff --git a/src/views/operation/components/OperationActionButton.vue b/src/views/operation/components/OperationActionButton.vue
index 1508e8b..59885b4 100644
--- a/src/views/operation/components/OperationActionButton.vue
+++ b/src/views/operation/components/OperationActionButton.vue
@@ -81,7 +81,7 @@ watch(
:items="submitBtns"
:withLine="false"
:withBtnClass="true"
- class="ml-5 mr-8 xl:mr-10"
+ v-if="selectedWorkType?.work_type !== 3"
/>
diff --git a/src/views/operation/components/OperationSearchType.vue b/src/views/operation/components/OperationSearchType.vue
index 788b76c..5b55e48 100644
--- a/src/views/operation/components/OperationSearchType.vue
+++ b/src/views/operation/components/OperationSearchType.vue
@@ -116,7 +116,7 @@ watch(
} else if (newSearchParams.search_type === "serial") {
changeParams({
...searchParams.value,
- serial_number: newSerialNumber.value,
+ serial_number: newSerialNumber,
});
}
},
@@ -151,7 +151,7 @@ watch(
name="serial_number"
:class="twMerge(searchParams?.work_type === '3' ? '' : 'mr-3')"
:placeholder="searchParams?.work_type === '3' ? $t('operation.enter_text') : $t('operation.enter_serial')"
- :value="serial_number"
+ :value="searchParams"
/>
diff --git a/src/views/operation/components/OperationTableModal.vue b/src/views/operation/components/OperationTableModal.vue
index 6129bc1..6ce0a61 100644
--- a/src/views/operation/components/OperationTableModal.vue
+++ b/src/views/operation/components/OperationTableModal.vue
@@ -530,7 +530,7 @@ watch(
class="my-2"
name="email"
>
-
>{{ $t("operation.email") }}
+
{{ $t("operation.email") }}
{{ companyFormErrorMsg.email }}
diff --git a/src/views/system/System.vue b/src/views/system/System.vue
index 325065e..abea7f9 100644
--- a/src/views/system/System.vue
+++ b/src/views/system/System.vue
@@ -206,6 +206,9 @@ const getCurrentInfoModalData = async (e, position, value) => {
: "",
};
}
+
+ const immediateRes = await getSystemRealTime([value.device_number]);
+ realtimeData.value = immediateRes.data;
}
const mobile = isMobile(e);
selectedDevice.value = {
diff --git a/src/views/system/components/SystemInfoModalChart.vue b/src/views/system/components/SystemInfoModalChart.vue
new file mode 100644
index 0000000..b0d74fe
--- /dev/null
+++ b/src/views/system/components/SystemInfoModalChart.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("table.no_data") }}
+
+