Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-04-20 09:11:50 +08:00
6 changed files with 5 additions and 5 deletions

View File

@@ -143,7 +143,7 @@
<script setup name="Code"> <script setup name="Code">
import { listCode, getCode, delCode, addCode, updateCode } from "@/api/unique/code" import { listCode, getCode, delCode, addCode, updateCode } from "@/api/unique/code"
import { getDictLabel, statusMenu } from '@/untils' import { getDictLabel, statusMenu } from '@/utils/until'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()

View File

@@ -133,7 +133,7 @@
<script setup name="InboundBill"> <script setup name="InboundBill">
import { listInboundBill, getInboundBill, delInboundBill, addInboundBill, updateInboundBill } from "@/api/worn/inboundBill" import { listInboundBill, getInboundBill, delInboundBill, addInboundBill, updateInboundBill } from "@/api/worn/inboundBill"
import { getColor, getBillType } from '@/untils' import { getColor, getBillType } from '@/utils/until'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const inboundBillList = ref([]) const inboundBillList = ref([])

View File

@@ -177,7 +177,7 @@
<script setup name="MqttConfig"> <script setup name="MqttConfig">
import { listDept } from '@/api/system/dept' import { listDept } from '@/api/system/dept'
import { getDictLabel, getDeptIdPath } from '@/untils' import { getDictLabel, getDeptIdPath } from '@/utils/until'
import { addMqttConfig, delMqttConfig, getMqttConfig, listMqttConfig, updateMqttConfig } from "@/api/worn/mqttConfig" import { addMqttConfig, delMqttConfig, getMqttConfig, listMqttConfig, updateMqttConfig } from "@/api/worn/mqttConfig"
import DepartmentCascaDer from '../../../components/DepartmentCascaDer/index.vue' import DepartmentCascaDer from '../../../components/DepartmentCascaDer/index.vue'

View File

@@ -145,7 +145,7 @@
<script setup name="MqttDevice"> <script setup name="MqttDevice">
import { listDept } from '@/api/system/dept' import { listDept } from '@/api/system/dept'
import { getDictLabel, getDeptIdPath } from '@/untils' import { getDictLabel, getDeptIdPath } from '@/utils/until'
import DepartmentCascaDer from '../../../components/DepartmentCascaDer/index.vue' import DepartmentCascaDer from '../../../components/DepartmentCascaDer/index.vue'
import { listMqttDevice, getMqttDevice, delMqttDevice, addMqttDevice, updateMqttDevice } from "@/api/worn/mqttDevice"; import { listMqttDevice, getMqttDevice, delMqttDevice, addMqttDevice, updateMqttDevice } from "@/api/worn/mqttDevice";

View File

@@ -101,7 +101,7 @@
<script setup name="MqttEvent"> <script setup name="MqttEvent">
import { listMqttEvent, getMqttEvent, delMqttEvent, addMqttEvent, updateMqttEvent } from "@/api/worn/mqttEvent" import { listMqttEvent, getMqttEvent, delMqttEvent, addMqttEvent, updateMqttEvent } from "@/api/worn/mqttEvent"
import { levelTypeMenu, getDictLabel } from '@/untils' import { levelTypeMenu, getDictLabel } from '@/utils/until'
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
console.log(levelTypeMenu, 'levelTypeMenu'); console.log(levelTypeMenu, 'levelTypeMenu');