Commit 15d4f575 by 周田

mod(接上

parent be7027a9
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<template #title>{{ item }}</template> <template #title>{{ item }}</template>
<div style="margin: auto; width: 90%"> <div style="margin: auto; width: 90%">
<collapse-table <collapse-table
v-if="protocolCmd !== undefined" v-if="props.protocolCmd !== undefined"
class="mt-4" class="mt-4"
:info="deviceProtocol!" :info="props.deviceProtocol!"
:name="item" :name="item"
:protocol-cmd="protocolCmd!" /> :protocol-cmd="props.protocolCmd!" />
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
...@@ -17,39 +17,20 @@ ...@@ -17,39 +17,20 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted } from 'vue' import { ref, watch } from 'vue'
import CollapseTable from "./CollapseTable.vue"; import CollapseTable from "./CollapseTable.vue";
import { DeviceProtocol, ProtocolCmd } from "@/dao/device";
import type { DeviceProtocolResponse, ProtocolCmdResponse } from './types'; import type { DeviceProtocolResponse, ProtocolCmdResponse } from './types';
const protocol_names = ref<string[]>([]); type propsType = {
const deviceProtocol = ref<DeviceProtocolResponse>() deviceProtocol: DeviceProtocolResponse,
const protocolCmd = ref<ProtocolCmdResponse>() protocolCmd: ProtocolCmdResponse
function getDeviceProtocol() {
DeviceProtocol()
.then((res) => {
deviceProtocol.value = res
protocol_names.value = res.fields
})
.catch((err) => {
console.log(err)
})
} }
const props = defineProps<propsType>()
function getProtocolCmd() { const protocol_names = ref<string[]>([]);
ProtocolCmd() watch(() => props.deviceProtocol, (val) => {
.then((res) => { let { fields } = val
protocolCmd.value = res protocol_names.value = fields
})
.catch((err) => {
console.log(err);
})
}
onMounted(() => {
getDeviceProtocol()
getProtocolCmd()
}) })
</script> </script>
......
...@@ -6,8 +6,11 @@ ...@@ -6,8 +6,11 @@
</div> </div>
</div> </div>
<!-- 下拉列表 --> <!-- 折叠面板 -->
<kit-collapse class="mt-4"></kit-collapse> <kit-collapse
class="mt-4"
:device-protocol="deviceProtocol!"
:protocol-cmd="protocolCmd!" />
<el-dialog title="新增协议" v-model="isShow"> <el-dialog title="新增协议" v-model="isShow">
<el-form> <el-form>
...@@ -27,32 +30,45 @@ ...@@ -27,32 +30,45 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted } from 'vue'; import { ref, onBeforeMount } from 'vue';
import KitCollapse from "@/components/protocol/KitCollapse"; import KitCollapse from '@/components/protocol/KitCollapse.vue';
import { GetProtocolVersion, GetCurrentVersion } from '@/dao/protocol'; import { GetProtocolVersion, GetCurrentVersion } from '@/dao/protocol';
import { useProtocolVersionStore } from '@/stores/allProtocolVersion'; import { useProtocolVersionStore } from '@/stores/allProtocolVersion';
import { DeviceProtocol, ProtocolCmd } from "@/dao/device";
import type { DeviceProtocolResponse, ProtocolCmdResponse } from '@/components/protocol/types';
const isShow = ref<boolean>(false) const isShow = ref<boolean>(false)
const formLabelWidth = '140px' const formLabelWidth = '140px'
const store = useProtocolVersionStore() const store = useProtocolVersionStore()
onMounted(() => {
onBeforeMount(() => {
GetProtocolVersion() GetProtocolVersion()
.then(res => { .then(res => {
store.protocolVersions.push(...res) store.protocolVersions.push(...res)
}) })
GetCurrentVersion() GetCurrentVersion()
.then(res => { .then(res => {
store.currentVersions = res store.currentVersions = res
}) })
DeviceProtocol()
.then((res) => {
deviceProtocol.value = res
})
ProtocolCmd()
.then((res) => {
protocolCmd.value = res
})
}) })
const protocolName = ref<string>('') const protocolName = ref<string>('')
const addProtocol = () => { const addProtocol = () => {
isShow.value = false isShow.value = false
console.log(protocolName.value) deviceProtocol.value!.fields.push(protocolName.value)
deviceProtocol.value![protocolName.value] = []
} }
const deviceProtocol = ref<DeviceProtocolResponse>()
const protocolCmd = ref<ProtocolCmdResponse>()
</script> </script>
<style scoped> <style scoped>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment