Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -143,7 +143,7 @@
|
||||
|
||||
<script setup name="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()
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
|
||||
<script setup name="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 inboundBillList = ref([])
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
|
||||
<script setup name="MqttConfig">
|
||||
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 DepartmentCascaDer from '../../../components/DepartmentCascaDer/index.vue'
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
|
||||
<script setup name="MqttDevice">
|
||||
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 { listMqttDevice, getMqttDevice, delMqttDevice, addMqttDevice, updateMqttDevice } from "@/api/worn/mqttDevice";
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
<script setup name="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()
|
||||
console.log(levelTypeMenu, 'levelTypeMenu');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user