From f23451be3160a2f8ad00e3e929c78197707c4f93 Mon Sep 17 00:00:00 2001
From: hear <70554662+Wzyyy98@users.noreply.github.com>
Date: Tue, 14 Nov 2023 17:22:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9ES7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(s7): 数据采集增加S7协议

* fix: s7点位死区校验
---
 public/images/DataCollect/gateway.png         | Bin 0 -> 4141 bytes
 public/images/DataCollect/s7.png              | Bin 0 -> 5986 bytes
 src/api/data-collect/collector.ts             |   9 +-
 src/utils/consts.ts                           |   1 +
 src/views/DataCollect/Channel/Save/index.vue  |  14 +-
 src/views/DataCollect/Channel/data.ts         |   1 +
 src/views/DataCollect/Channel/index.vue       |  13 +-
 src/views/DataCollect/Channel/type.d.ts       |   1 +
 .../Collector/Point/Save/DeathArea.vue        | 254 +++++++++++++
 .../Collector/Point/Save/SaveS7.vue           | 337 ++++++++++++++++++
 .../DataCollect/Collector/Point/index.vue     |  46 ++-
 .../DataCollect/Collector/Tree/Save/index.vue |  49 ++-
 src/views/DataCollect/Collector/data.ts       | 104 +++++-
 13 files changed, 805 insertions(+), 24 deletions(-)
 create mode 100644 public/images/DataCollect/gateway.png
 create mode 100644 public/images/DataCollect/s7.png
 create mode 100644 src/views/DataCollect/Collector/Point/Save/DeathArea.vue
 create mode 100644 src/views/DataCollect/Collector/Point/Save/SaveS7.vue

diff --git a/public/images/DataCollect/gateway.png b/public/images/DataCollect/gateway.png
new file mode 100644
index 0000000000000000000000000000000000000000..50fc4f636872f23a7f3540f03ba97722632c8f14
GIT binary patch
literal 4141
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

literal 0
HcmV?d00001

diff --git a/public/images/DataCollect/s7.png b/public/images/DataCollect/s7.png
new file mode 100644
index 0000000000000000000000000000000000000000..5707d4ec135f8acaff00068e9368c7d1b2dfa0c2
GIT binary patch
literal 5986
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
Q2LJ#707*qoM6N<$f<%RFRR910

literal 0
HcmV?d00001

diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts
index 8ab956f5..84234c06 100644
--- a/src/api/data-collect/collector.ts
+++ b/src/api/data-collect/collector.ts
@@ -54,8 +54,7 @@ export const queryPointNoPaging = (data: any) =>
 
 export const scanOpcUAList = (data: any) =>
     server.get(
-        `/data-collect/opc/channel/${data.id}/nodes?nodeId=${
-            data?.nodeId || ''
+        `/data-collect/opc/channel/${data.id}/nodes?nodeId=${data?.nodeId || ''
         }`,
     );
 
@@ -63,4 +62,8 @@ export const queryTypeList = () => server.get(`/data-collect/opc/data-types`);
 
 export const getProviders = () => server.get('/data-collect/channel/gateway/codec/providers')
 
-export const getStates = () => server.get('/dictionary/running-state/items')
\ No newline at end of file
+export const getStates = () => server.get('/dictionary/running-state/items')
+
+export const getSnapTypes = () => server.get('/s7/client/s7codecs/list')
+
+export const getArea = () => server.get('/s7/client/s7area/list')
\ No newline at end of file
diff --git a/src/utils/consts.ts b/src/utils/consts.ts
index c2561832..c87d2cae 100644
--- a/src/utils/consts.ts
+++ b/src/utils/consts.ts
@@ -57,4 +57,5 @@ export const protocolList = [
     { label: 'OPC_UA', value: 'OPC_UA', alias: 'opc-ua' },
     { label: 'MODBUS_TCP', value: 'MODBUS_TCP', alias: 'Modbus/TCP' },
     { label: 'COLLECTOR_GATEWAY', value: 'COLLECTOR_GATEWAY', alias: 'GATEWAY' },
+    { label: 'S7', value: 'snap7', alias: 'snap7' },
 ]
diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index 2b63c814..42ee9a87 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -171,6 +171,12 @@
                     v-model:value="formData.configuration.password"
                 />
             </j-form-item>
+            <!-- <j-form-item
+                v-if="formData.provider === 'snap7'"
+                :name="['configuration', 'connect']"
+            >
+                <j-input v-model:value="formData.configuration.connect"/>
+            </j-form-item> -->
             <j-form-item label="说明" name="description">
                 <j-textarea
                     placeholder="请输入说明"
@@ -239,6 +245,12 @@ const handleOk = async () => {
       params.configuration.deviceName = formData.value.configuration.deviceName
     }
 
+    if(params?.provider === 'snap7'){
+        params.configuration={
+            connect : false
+        }
+    }
+
     params.circuitBreaker = {
       type: 'Ignore'
     }
@@ -304,7 +316,7 @@ const getProvidersList = async () => {
     if (resp.status === 200) {
         const arr = resp.result
             .filter(
-                (item: any) =>  ['GATEWAY', 'Modbus/TCP', 'opc-ua'].includes(item.name),
+                (item: any) =>  ['GATEWAY', 'Modbus/TCP', 'opc-ua','snap7'].includes(item.name),
             )
             .map((it: any) => it.name);
         const providers: any = protocolList.filter((item: any) =>
diff --git a/src/views/DataCollect/Channel/data.ts b/src/views/DataCollect/Channel/data.ts
index 68a8fe0c..61f0f3d6 100644
--- a/src/views/DataCollect/Channel/data.ts
+++ b/src/views/DataCollect/Channel/data.ts
@@ -17,6 +17,7 @@ export const FormState: FormDataType = {
         password: '',
         deviceId: undefined,
         deviceName: undefined,
+        connect:false,
     },
     description: '',
 };
diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue
index 3e27726b..2b857813 100644
--- a/src/views/DataCollect/Channel/index.vue
+++ b/src/views/DataCollect/Channel/index.vue
@@ -43,7 +43,7 @@
                         >
                             <template #img>
                                 <slot name="img">
-                                    <img :src="getImage('/channel.png')" />
+                                    <img :src="ImageMap.get(slotProps.provider)" />
                                 </slot>
                             </template>
                             <template #content>
@@ -157,6 +157,17 @@ const params = ref<Record<string, any>>({});
 const visible = ref(false);
 const current = ref({});
 
+const opcImage = getImage('/DataCollect/device-opcua.png');
+const modbusImage = getImage('/DataCollect/device-modbus.png');
+const s7Image = getImage('/DataCollect/s7.png')
+const gatewayImage = getImage('/DataCollect/gateway.png')
+const ImageMap = new Map()
+ImageMap.set('OPC_UA',opcImage)
+ImageMap.set('MODBUS_TCP',modbusImage)
+ImageMap.set('snap7',s7Image)
+ImageMap.set('COLLECTOR_GATEWAY',gatewayImage)
+
+
 const columns = [
     {
         title: '通道名称',
diff --git a/src/views/DataCollect/Channel/type.d.ts b/src/views/DataCollect/Channel/type.d.ts
index 7d683f08..d6085d40 100644
--- a/src/views/DataCollect/Channel/type.d.ts
+++ b/src/views/DataCollect/Channel/type.d.ts
@@ -10,6 +10,7 @@ export interface ConfigurationType {
     authType: string | undefined,
     deviceId: string | undefined,
     deviceName: string | undefined,
+    connect:boolean | undefined
 }
 
 export interface FormDataType {
diff --git a/src/views/DataCollect/Collector/Point/Save/DeathArea.vue b/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
new file mode 100644
index 00000000..ccb6e5c4
--- /dev/null
+++ b/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
@@ -0,0 +1,254 @@
+
+<template>
+    <div class="top"><j-switch v-model:checked="deathArea" @change="handleDeathArea"></j-switch></div>
+    <div v-if="deathArea">
+        <div class="content">
+            <j-radio-group v-model:value="tag" @change="handleTag">
+                <j-space>
+                    <j-radio-button value="currentValue">固定值</j-radio-button>
+                    <j-radio-button value="this['currentValue'] - this['lastValue']">百分比</j-radio-button>
+                </j-space>
+            </j-radio-group>
+            <j-tooltip v-if="tag !== 'currentValue'" title="最近一次采集到的值与上一次采集值比对，数值浮动在百分比以内时将被过滤">
+                <AIcon type="QuestionCircleOutlined" style="margin-left: 10px;font-size: 18px;color: rgb(153, 153, 153)" />
+            </j-tooltip>
+        </div>
+        <j-form-item-rest>
+            <div v-if="tag === 'currentValue'" class="fixed">
+                <j-row :gutter="5" align="middle">
+                    <j-col>
+                        <j-input-number v-model:value="_value[0].value" style="width: 100%" placeholder="请输入值"
+                            :max="_value[1] ? _value[1].value : 999999" :min="1" @change="handleChange" />
+                    </j-col>
+                    <j-col>
+                        <j-select v-model:value="_value[0].termType" :showArrow="false" :options="termTypeOptions"
+                            placeholder="符号" @change="handleChange" />
+                    </j-col>
+                    <template v-if="swap === 'range'">
+                        <j-col>点位值</j-col>
+                        <j-col>
+                            <j-select :showArrow="false" v-model:value="_value[1].termType" :options="termTypeOptions"
+                                placeholder="符号" @change="handleChange" />
+                        </j-col>
+                        <j-col>
+                            <j-input-number v-model:value="_value[1].value" style="width: 100%" placeholder="请输入值"
+                                :min="_value[0].value" @change="handleChange" />
+                        </j-col>
+
+                    </template>
+                    <j-button @click="handleSwap">
+                        <AIcon type="SwapOutlined" />
+                    </j-button>
+                </j-row>
+            </div>
+            <div v-else class="percent">
+                <div class="percent-title">点位值</div>
+                <j-input-number v-model:value="percentValue" style="width: 200px" addon-after="%" placeholder="请输入值"
+                    :min="1" @change="handlePercent" :max="65535" />
+            </div>
+        </j-form-item-rest>
+
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { Form } from 'ant-design-vue';
+
+const formItemContext = Form.useInjectFormItemContext()
+
+const props = defineProps({
+    value: {
+        type: Array,
+        default: () => [{}]
+    }
+})
+
+const emits = defineEmits(['update:value', 'change']);
+const _value = ref<any>(props.value)
+const deathArea = ref(false);
+const tag = ref<string>('currentValue')
+const swap = ref<string>('fix')
+const percentValue = ref()
+
+
+const termTypeOptions = computed(() => {
+    if (_value.value?.length === 1) {
+        return [
+            { label: '=', value: 'neq' },
+            { label: '>', value: 'lte' },
+            { label: '<', value: 'gte' },
+            { label: '≥', value: 'lt' },
+            { label: '≤', value: 'gt' },
+        ];
+    } else {
+        return [
+            { label: '<', value: 'gte' },
+            { label: '≤', value: 'gt' },
+        ];
+    }
+});
+
+const handleDeathArea = (e: any) => {
+    if (e) {
+        _value.value = [{
+            column: 'currentValue',
+            value: undefined,
+            termType: undefined,
+            type: 'and',
+        }]
+    } else {
+        _value.value = []
+    }
+    handleChange()
+}
+
+const handleSwap = () => {
+    if (swap.value === 'fix') {
+        swap.value = 'range'
+        _value.value = [
+            {
+                column: 'currentValue',
+                value: '',
+                termType: undefined,
+                type: 'or',
+            },
+            {
+                column: 'currentValue',
+                value: '',
+                termType: undefined,
+                type: 'or',
+            },
+        ]
+    } else {
+        swap.value = 'fix'
+        _value.value = [{
+            column: 'currentValue',
+            value: undefined,
+            termType: undefined,
+            type: 'and',
+        }]
+    }
+    handleChange()
+}
+
+const handleTag = (e: any) => {
+    if (e.target.value === 'currentValue') {
+        swap.value = 'fix'
+        _value.value = [{
+            column: 'currentValue',
+            value: undefined,
+            termType: undefined,
+            type: 'and',
+        }]
+    } else {
+        _value.value = [
+            {
+                column: `this['currentValue'] - this['lastValue']*init/100`,
+                value: 0,
+                termType: 'lt',
+                type: 'or',
+            },
+            {
+                column: `this['currentValue'] - this['lastValue']*0/100`,
+                value: 0,
+                termType: 'gt',
+                type: 'or',
+            }
+        ]
+    }
+    handleChange()
+}
+
+const handlePercent = (e: any) => {
+    if (e) {
+        _value.value = [
+            {
+                column: `this['currentValue'] - this['lastValue'] * ${e}/100`,
+                value: 0,
+                termType: 'lt',
+                type: 'or',
+            },
+            {
+                column: `this['currentValue'] - this['lastValue'] * ${e + 100}/100`,
+                value: 0,
+                termType: 'gt',
+                type: 'or',
+            }
+        ]
+    }else{
+        _value.value = [
+            {
+                column: `this['currentValue'] - this['lastValue'] * 1/100`,
+                value: 0,
+                termType: 'lt',
+                type: 'or',
+            },
+            {
+                column: `this['currentValue'] - this['lastValue'] * 1/100`,
+                value: 0,
+                termType: 'gt',
+                type: 'or',
+            }
+        ]
+    }
+    handleChange()
+}
+
+const handlePercentProps = (arr: any) => {
+    const obj = arr.find((item: any) => item.termType === 'lt')
+    const val = obj.column.split('*')[1].split('/')[0]
+    percentValue.value = val !== 'init' ? val : undefined
+}
+
+const handleChange = () => {
+    emits('update:value', _value.value)
+    emits('change', _value.value)
+    formItemContext.onFieldChange()
+}
+
+watch(
+    () => props.value,
+    (val: any) => {
+        if (val && val.length !== 0) {
+            deathArea.value = true
+            if (val && val[0]?.column === 'currentValue') {
+                tag.value = 'currentValue'
+                _value.value = val
+                if (val.length === 2) {
+                    swap.value = 'range'
+                }
+            } else {
+                handlePercentProps(val)
+                tag.value = `this['currentValue'] - this['lastValue']`
+            }
+        }
+
+
+
+    },
+    { deep: true, immediate: true }
+)
+
+
+</script>
+
+<style scoped lang='less'>
+.top {
+    padding: 12px 0;
+}
+
+
+.fixed {
+    padding: 12px 0;
+}
+
+.percent {
+    display: flex;
+    align-items: center;
+    padding: 12px;
+
+    .percent-title {
+        margin-right: 10px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
new file mode 100644
index 00000000..4cc6cd5d
--- /dev/null
+++ b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
@@ -0,0 +1,337 @@
+<template >
+    <j-modal :title="data.id ? '编辑' : '新增'" :visible="true" width="700px" @cancel="handleCancel">
+        <j-form :model="form" layout="vertical" ref="formRef">
+            <j-form-item label="点位名称" name="name">
+                <j-input placeholder="请输入点位名称" v-model:value="form.name" />
+            </j-form-item>
+            <j-form-item label="地址区域" :name="['configuration', 'daveArea']" :rules="{
+                required: true,
+                message: '请选择地址区域',
+                trigger: 'change',
+            }">
+                <j-select v-model:value="form.configuration.daveArea" show-search placeholder="请选择地址区域"
+                    @change="daveAreaChange">
+                    <j-select-option v-for="item in dataAreaFilterList" :key="item.id" :value="item.id">{{
+                        item.name }}</j-select-option>
+                </j-select>
+            </j-form-item>
+            <j-form-item label="地址编号" :name="['configuration', 'areaNumber']" v-show="form.configuration.daveArea == 'DB'"
+                :rules="{
+                    required: true,
+                    message: '请输入地址编号',
+                    trigger: 'blur',
+                }">
+                <j-input-number v-model:value="form.configuration.areaNumber" :maxlength="64" style="width: 100%"
+                    :max="65535" autocomplete="off" :disabled="form.configuration.daveArea == 'DB' && deviceType == 'S200'"
+                    placeholder="请输入地址编号" />
+            </j-form-item>
+            <j-form-item label="数据类型" :name="['configuration', 'type']" :rules="{
+                required: true,
+                message: '请选择数据类型',
+                trigger: 'change',
+            }">
+                <j-select v-model:value="form.configuration.type" show-search placeholder="请选择数据类型"
+                    @change="chooseS7DataType">
+                    <j-select-option v-for="item in dataTypesList" :key="item.id" :value="item.id">{{
+                        item.name }}</j-select-option>
+                </j-select>
+            </j-form-item>
+
+            <j-form-item v-if="!disabled" label="字符串长度（byte）" :name="['configuration', 'bytes']" :rules="{
+                required: true,
+                message: '请输入0~65535之间的正整数',
+                trigger: 'blur',
+            }">
+                <j-input-number type="number" style="width: 100%" addon-after="字节" v-model:value="form.configuration.bytes"
+                    placeholder="请输入字符串长度" :precision="0" :controls="false" :maxlength="64" :disabled="disabled" />
+            </j-form-item>
+
+            <j-form-item v-if="form.type == 'Bool'" label="位偏移量（bit）" :name="['configuration', 'bits']" :rules="{
+                required: true,
+                message: '请输入0~7之间的正整数',
+                trigger: 'blur',
+            }">
+                <j-input-number type="number" style="width: 100%" addon-after="位" v-model:value="form.configuration.bits"
+                    placeholder="请输入位偏移量" :precision="0" :min="0" :max="7" :controls="false" :maxlength="2" />
+            </j-form-item>
+
+            <j-form-item label="偏移量" :name="['configuration', 'offset']" :rules="{
+                required: true,
+                message: '请输入0~65535之间的正整数',
+                trigger: 'blur',
+            }">
+                <j-input-number type="number" style="width: 100%" v-model:value="form.configuration.offset"
+                    placeholder="请输入偏移量" :precision="0" :min="0" :max="65535" :controls="false" :maxlength="64" />
+            </j-form-item>
+            <j-form-item label="缩放因子" :name="['configuration', 'scaleFactor']">
+                <j-input-number type="number" style="width: 100%" v-model:value="form.configuration.scaleFactor"
+                    placeholder="缩放因子" :min="0" :max="65535" :controls="false" :maxlength="64" />
+            </j-form-item>
+            <j-form-item label="小数保留位数" :name="['configuration', 'scale']">
+                <j-input-number type="number" style="width: 100%" v-model:value="form.configuration.scale"
+                    placeholder="缩放因子" :precision="0" :min="1" :max="65535" :controls="false" :maxlength="64" />
+            </j-form-item>
+            <j-form-item label="访问类型" name="accessModes" :rules="{
+                required: true,
+                message: '请选择访问类型',
+            }">
+                <j-card-select multiple :showImage="false" v-model:value="form.accessModes" :options="[
+                    { label: '读', value: 'read' },
+                    { label: '写', value: 'write' },
+                ]
+                    " :column="2" />
+            </j-form-item>
+            <j-form-item :name="['configuration', 'terms']" :rules="[{
+                validator: Area,
+                trigger: 'change',
+            }]">
+                <template #label>
+                    <j-space>
+                        <span>点位死区</span><span class="explain">点位死区范围内的异常数据将被过滤（请勿配置非数值类型）</span>
+                    </j-space>
+                </template>
+                <DeathArea v-model:value="form.configuration.terms" />
+            </j-form-item>
+            <j-form-item label="轮询任务" :name="['configuration', 'interval']">
+                <p>
+                    采集频率<span style="margin-left: 5px; color: #9d9ea1; font-size: 12px">采集频率为0时不执行轮询任务</span>
+                </p>
+                <j-radio-group v-model:value="form.configuration.interval">
+                    <j-space>
+                        <j-radio-button :value="3000">3000ms</j-radio-button>
+                        <j-radio-button :value="6000">6000ms</j-radio-button>
+                        <j-radio-button :value="9000">9000ms</j-radio-button>
+                        <j-radio-button :value="Number(form.configuration.interval)" @click="intervalRef.visible = true">
+                            {{
+                                ![3000, 6000, 9000].includes(form.configuration.interval)
+                                ? form.configuration.interval + 'ms'
+                                : '自定义'
+                            }}
+                        </j-radio-button>
+                    </j-space>
+                </j-radio-group>
+            </j-form-item>
+            <j-form-item name="features">
+                <j-checkbox-group v-model:value="form.features">
+                    <j-checkbox value="changedOnly">只推送变化的数据</j-checkbox>
+                </j-checkbox-group>
+            </j-form-item>
+        </j-form>
+        <j-modal title="采集频率" :visible="intervalRef.visible" @cancel="handleCancelInterval" @ok="handleInterval">
+            <j-form ref="formRef2" name="virtual-form" layout="vertical" :model="intervalRef">
+                <j-form-item label="采集频率" name="interval" :rules="[
+                    { required: true, message: '请输入采集频率' },
+                ]">
+                    <j-input-number type="tel" addonAfter="ms" v-model:value="intervalRef.interval" placeholder="请输入采集频率"
+                        :controls="false" :precision="0" :maxlength="64" />
+                </j-form-item>
+            </j-form>
+        </j-modal>
+        <template #footer>
+            <j-button key="back" @click="handleCancel">取消</j-button>
+            <PermissionButton key="submit" type="primary" :loading="loading" @click="handleOk" style="margin-left: 8px"
+                :hasPermission="`DataCollect/Collector:${data.id ? 'update' : 'add'}`">
+                确认
+            </PermissionButton>
+        </template>
+    </j-modal>
+</template>
+<script lang="ts" setup>
+import {
+    savePoint,
+    updatePoint,
+    _validateField,
+    getArea,
+    getSnapTypes
+} from '@/api/data-collect/collector';
+import type { FormInstance } from 'ant-design-vue';
+import DeathArea from './DeathArea.vue';
+import { randomString } from '@/utils/utils';
+
+const props = defineProps({
+    data: {
+        type: Object,
+        default: () => { },
+    }
+});
+
+const dataAreaFilter = {
+    S200: [
+        'RELAY',
+        'HIGH_SPEED',
+        'SYSTEM_FLAGS',
+        'ANALOG_INPUTS',
+        'ANALOG_OUTPUTS',
+        'I',
+        'Q',
+        'M',
+        'IEC_COUNTERS',
+        'IEC_TIMERS',
+    ],
+    S1200: ['I', 'Q', 'M', 'DB'],
+    S1500: ['I', 'Q', 'M', 'DB'],
+    S300: ['I', 'Q', 'M', 'DB', 'C', 'T'],
+    S400: ['I', 'Q', 'M', 'DB', 'C', 'T'],
+};
+const emit = defineEmits(['change']);
+const loading = ref(false);
+const formRef = ref<FormInstance>();
+const formRef2 = ref<FormInstance>();
+const deviceType = ref<string>('S200');
+const dataTypesList = ref<any[]>([]);
+const daveAreaList = ref<any>([]);
+
+
+
+const form = ref<any>({
+    name: props.data.name || '',
+    configuration: props.data.configuration || {
+        type: undefined,
+        interval: 3000,
+        areaNumber: undefined,
+        terms: []
+    },
+    accessModes: [],
+    features: [],
+    description: props.data.description || '',
+    // inheritBreaker: true,
+    // pointKey: randomString(9)
+});
+const intervalRef = reactive({
+    visible: false,
+    interval: 3000,
+})
+
+
+/**选择S7点位数据类型 */
+const disabled = ref(true);
+const chooseS7DataType = (val: string) => {
+    const result: any = dataTypesList.value.find((item: any) => item.id == val);
+    form.value.configuration.bytes = result.length;
+    disabled.value = result.length != 0;
+};
+
+const daveAreaChange = (val: string) => {
+    if (val === 'DB') {
+        form.value.configuration.areaNumber = 1;
+    } else {
+        form.value.configuration.areaNumber = 0;
+    }
+}
+
+/**
+ * 获取地区信息
+ */
+const getAreaList = async () => {
+    const res = await getArea();
+    if (res.success) {
+        daveAreaList.value = res.result;
+    }
+};
+getAreaList();
+
+/**
+ * 获取数据类型
+ */
+const getTypes = async () => {
+    const res: any = await getSnapTypes();
+    dataTypesList.value = res.result;
+};
+getTypes();
+
+const dataAreaFilterList = computed(() => {
+    let result = daveAreaList.value.filter((item: any) =>
+        dataAreaFilter[deviceType.value].includes(item.id),
+    );
+    if (deviceType.value == 'S200') {
+        result.push({
+            id: 'DB',
+            name: '变量存储区（V）',
+            address: '',
+        });
+    }
+    return result;
+});
+
+const handleInterval = async () => {
+    const res = await formRef2.value?.validate()
+    if (res) {
+        form.value.configuration.interval = res.interval
+        intervalRef.visible = false
+    }
+};
+const handleCancelInterval = () => {
+    intervalRef.visible = false
+    intervalRef.interval = 3000
+}
+
+
+const handleOk = async () => {
+    const res = await formRef.value?.validate();
+    
+    const params = {
+        ...res,
+        inheritBreaker: true,
+        pointKey: props.data.pointKey || randomString(9),
+        provider:props.data.provider,
+        collectorId:props.data.collectorId,
+        accessModes:res?.accessModes.filter((item:any)=>item)
+    }
+    loading.value = true;
+    const response = !props.data.id
+        ? await savePoint(params).catch(() => { })
+        : await updatePoint(props.data.id, { ...props.data, ...params }).catch(() => { });
+    emit('change', response?.status === 200);
+    loading.value = false;
+};
+
+const handleCancel = () => {
+    emit('change', false);
+};
+
+const Area = (_: any, value: any): Promise<any> =>
+    new Promise(async (resolve, reject) => {
+        console.log('value',value)
+        if(value.length === 0){
+            return resolve('')
+        }else if(value.length === 1){
+            return value[0].value && value[0].termType ? resolve('') : reject('请配置点位死区');
+        }else{
+            if(value[0].column === 'currentValue'){
+                // value.forEach((item:any) => {
+                //     if(item.termType && item.value){
+                //        return resolve('')
+                //     }else{
+                //         return reject('请配置点位死区')
+                //     }
+                // });
+                const pass = value.every((item:any)=>item.termType && item.value)
+                return pass ? resolve(''):reject('请配置点位死区')
+            }else{
+                value.forEach((item:any) => {
+                    if(item.column ===`this['currentValue'] - this['lastValue']*init/100`){
+                        return reject('请配置点位死区')
+                    }else{
+                        return resolve('')
+                    }
+                });
+            }
+        }
+    });
+
+onMounted(() => {
+    form.value.features = props.data.features?.map((item:any)=>item.value)
+    if(props.data.accessModes?.length!==0){
+        form.value.accessModes = props.data.accessModes?.map((item:any)=>item.value)
+    }
+})
+
+
+</script>
+
+<style lang="less" scoped>
+.explain {
+    color: #adadad;
+    font-size: 12px;
+}
+</style>
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 97b2f0e4..e2dc0fc7 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -20,7 +20,7 @@
                     <template #headerTitle>
                         <j-space>
                             <PermissionButton
-                                v-if="['MODBUS_TCP', 'COLLECTOR_GATEWAY'].includes(data?.provider)"
+                                v-if="['MODBUS_TCP', 'COLLECTOR_GATEWAY','snap7'].includes(data?.provider)"
                                 type="primary"
                                 @click="handlAdd"
                                 hasPermission="DataCollect/Collector:add"
@@ -150,13 +150,7 @@
                                 </div>
                             </template>
                             <template #img>
-                                <img
-                                    :src="
-                                        slotProps.provider === 'OPC_UA'
-                                            ? opcImage
-                                            : modbusImage
-                                    "
-                                />
+                                <img :src="ImageMap.get(slotProps.provider)"/>
                             </template>
                             <template #content>
                                 <div class="card-box-content">
@@ -319,6 +313,7 @@
             :data="current"
             @change="saveChange"
         />
+        <SaveS7 v-if="visible.saveS7"  :data="current" @change="saveChange"/>
         <Scan v-if="visible.scan" :data="current" @change="saveChange" />
     </j-spin>
 </template>
@@ -345,6 +340,7 @@ import { getWebSocket } from '@/utils/websocket';
 import { map } from 'rxjs/operators';
 import dayjs from 'dayjs';
 import { responsiveArray } from 'ant-design-vue/lib/_util/responsiveObserve';
+import SaveS7 from './Save/SaveS7.vue';
 
 const props = defineProps({
     data: {
@@ -357,12 +353,22 @@ const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 const opcImage = getImage('/DataCollect/device-opcua.png');
 const modbusImage = getImage('/DataCollect/device-modbus.png');
+const s7Image = getImage('/DataCollect/s7.png')
+const gatewayImage = getImage('/DataCollect/gateway.png')
+const ImageMap = new Map()
+ImageMap.set('OPC_UA',opcImage)
+ImageMap.set('MODBUS_TCP',modbusImage)
+ImageMap.set('snap7',s7Image)
+ImageMap.set('COLLECTOR_GATEWAY',gatewayImage)
+
+
 const visible = reactive({
     saveModBus: false,
     saveOPCUA: false,
     writePoint: false,
     batchUpdate: false,
     scan: false,
+    saveS7:false
 });
 const current: any = ref({});
 const accessModesOption = ref();
@@ -474,16 +480,28 @@ const clickBatch = () => {
 };
 
 const handlAdd = () => {
-    visible.saveModBus = true;
-    current.value = {
-        collectorId: props.data?.id,
-        provider: props.data?.provider || 'MODBUS_TCP',
-    };
+    if( props.data?.provider === 'snap7'){
+        console.log(props.data)
+        visible.saveS7 = true
+        current.value = {
+            collectorId: props.data?.id,
+            provider: props.data?.provider
+        }
+    }else{
+        visible.saveModBus = true;
+        current.value = {
+            collectorId: props.data?.id,
+            provider: props.data?.provider || 'MODBUS_TCP',
+        };
+    }
+   
 };
 const handlEdit = (data: any) => {
     if (data?.provider === 'OPC_UA') {
         visible.saveOPCUA = true;
-    } else {
+    } else if(data?.provider === 'snap7'){
+        visible.saveS7 = true
+    }else{
         visible.saveModBus = true;
     }
     current.value = cloneDeep(data);
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 9f05d88c..57e961a7 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -39,6 +39,33 @@
                     placeholder="请输入采集器名称"
                     v-model:value="formData.name"
                 />
+              
+            </j-form-item>
+            <j-form-item  v-if="provider === 'snap7'" label="IP" :name="['configuration', 'host']" :rules="LeftTreeRules.host" >
+              <j-input v-model:value="formData.configuration.host" autocomplete="off" placeholder="请输入通道IP" :disabled="false"/>
+            </j-form-item>
+            <j-form-item v-if="provider === 'snap7'" label="端口" :name="['configuration', 'port']" :rules="LeftTreeRules.port">
+              <j-input-number style="width: 100%" v-model:value="formData.configuration.port" autocomplete="off" placeholder="请输入通道端口"/>
+            </j-form-item>
+            <j-form-item v-if="provider === 'snap7'" label="机架号" :name="['configuration', 'rack']" :rules="LeftTreeRules.rack">
+              <j-input-number style="width: 100%" v-model:value="formData.configuration.rack" autocomplete="off" placeholder="请输入机架号" :maxlength="64" />
+            </j-form-item>
+            <j-form-item v-if="provider === 'snap7'" label="型号" :name="['configuration', 'type']" :rules="LeftTreeRules.type">
+              <j-select v-model:value="formData.configuration.type" placeholder="请选择型号" @change="typeChange">
+                <j-select-option v-for="item in typeOptions" :key="item.value" :value="item.value">{{ item.label }}</j-select-option>
+              </j-select>
+            </j-form-item>
+            <j-form-item v-if="provider === 'snap7'" label="槽位" :name="['configuration', 'slot']" :rules="LeftTreeRules.slot">
+              <j-input-number style="width: 100%" v-model:value="formData.configuration.slot" autocomplete="off" placeholder="请输入槽位" :maxlength="64" :disabled="formData.configuration.type == 'S200' || formData.configuration.type == 'S1200'"/>
+            </j-form-item>
+            <j-form-item v-if="provider === 'snap7'" label="超时时间（毫秒）" :name="['configuration', 'timeout']" :rules="LeftTreeRules.timeout">
+              <j-input-number style="width: 100%" v-model:value="formData.configuration.timeout" autocomplete="off" placeholder="请输入超时时间" :maxlength="64" />
+            </j-form-item>
+            <j-form-item v-if="provider === 'snap7'" label="数据读取方式" :name="['configuration', 'serializable']">
+              <j-radio-group v-model:value="formData.configuration.serializable">
+                <j-radio-button :value="false">并行</j-radio-button>
+                <j-radio-button :value="true">串行</j-radio-button>
+              </j-radio-group>
             </j-form-item>
             <j-form-item
                 v-if="provider === 'COLLECTOR_GATEWAY'"
@@ -133,6 +160,7 @@
             </p>
             </div>
             <j-form-item
+                v-if="provider !== 'snap7'"
                 :name="['configuration', 'requestTimeout']"
                 :rules="LeftTreeRules.requestTimeout"
             >
@@ -196,6 +224,14 @@ const props = defineProps({
 
 const emit = defineEmits(['change']);
 
+const typeOptions = ref([
+  {value: 'S200', label: 'S7-200'},
+  {value: 'S300', label: 'S7-300'},
+  {value: 'S400', label: 'S7-400'},
+  {value: 'S1200', label: 'S7-1200'},
+  {value: 'S1500', label: 'S7-1500'},
+])
+
 const id = props.data.id;
 const formRef = ref<FormInstance>();
 const provider = ref()
@@ -248,16 +284,17 @@ const endianData = computed(() => {
     }
 });
 
-const formData = ref({
+const formData = ref<any>({
     channelId: undefined,
     name: '',
     collectorProvider: undefined,
     configuration: {
         unitId: '',
-        type: 'LowerFrequency',
+        type: undefined,
         endian: 'BIG',
         endianIn: 'BIG',
         requestTimeout: 2000,
+        serializable:false,
         inheritBreakerSpec: {
           type: 'LowerFrequency',
         }
@@ -347,10 +384,16 @@ const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
 
+const typeChange = (val:any)=>{
+  if(val == 'S200' || val == 'S1200') {
+    formData.value.configuration.slot = 1
+  }
+}
+
 watch(
     () => formData.value.channelId,
     (value) => {
-        const dt = _channelListAll.value.find((item) => item.id === value);
+        const dt:any = _channelListAll.value.find((item:any) => item.id === value);
         visibleUnitId.value = visibleEndian.value =
             dt?.provider && ['MODBUS_TCP', 'COLLECTOR_GATEWAY'].includes(dt?.provider);
     },
diff --git a/src/views/DataCollect/Collector/data.ts b/src/views/DataCollect/Collector/data.ts
index 79b179cc..06f6fd08 100644
--- a/src/views/DataCollect/Collector/data.ts
+++ b/src/views/DataCollect/Collector/data.ts
@@ -22,6 +22,28 @@ export const getState = (record: any) => {
 };
 
 export const regOnlyNumber = new RegExp(/^\d+$/);
+export const regular = {
+    // IPV4 IPV6 域名
+    IP_Domain: /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^(?:(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){6})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:::(?:(?:(?:[0-9a-fA-F]{1,4})):){5})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:(?:[0-9a-fA-F]{1,4})):){4})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,1}(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:(?:[0-9a-fA-F]{1,4})):){3})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,2}(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:(?:[0-9a-fA-F]{1,4})):){2})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,3}(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:[0-9a-fA-F]{1,4})):)(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,4}(?:(?:[0-9a-fA-F]{1,4})))?::)(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,5}(?:(?:[0-9a-fA-F]{1,4})))?::)(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,6}(?:(?:[0-9a-fA-F]{1,4})))?::))))$/,
+    // IP地址
+    IP_URL: /^((2((5[0-5])|([0-4]\d)))|([0-1]?\d{1,2}))(\.((2((5[0-5])|([0-4]\d)))|([0-1]?\d{1,2}))){3}$/,
+    // 英文或者数字或者-或者_
+    EN_NUMBER: /^[A-Za-z0-9_-]+$/,
+    // 服务器地址
+    HTTP_URL: /^http:|https:\/\/([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/,
+    // 域名
+    DOMAIN_NAME: /^(?:(?:(?:[a-zA-z\-]+)\:\/{1,3})?(?:[a-zA-Z0-9])(?:[a-zA-Z0-9-\.]){1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+|\[(?:(?:(?:[a-fA-F0-9]){1,4})(?::(?:[a-fA-F0-9]){1,4}){7}|::1|::)\]|(?:(?:[0-9]{1,3})(?:\.[0-9]{1,3}){3}))(?:\:[0-9]{1,5})?$/,
+    // 数字
+    // NUMBER: /^[0-9]*[1-9][0-9]*$/,
+    NUMBER: /^([1-9]\d*|[0]{1,1})$/,
+    // 正数、负数、小数
+    ASSIGNMENT: /^(\-)?\d+(\.\d+)?$/,
+    //密码验证
+    PASSWORD: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,}$/,
+    //IP子网掩码
+    IP_MASK: /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\/\d{1,2})?$/,
+    CronRegEx: new RegExp('^\\s*($|#|\\w+\\s*=|(\\?|\\*|(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?(?:,(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?)*)\\s+(\\?|\\*|(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?(?:,(?:[0-5]?\\d)(?:(?:-|\\/|\\,)(?:[0-5]?\\d))?)*)\\s+(\\?|\\*|(?:[01]?\\d|2[0-3])(?:(?:-|\\/|\\,)(?:[01]?\\d|2[0-3]))?(?:,(?:[01]?\\d|2[0-3])(?:(?:-|\\/|\\,)(?:[01]?\\d|2[0-3]))?)*)\\s+(\\?|\\*|(?:0?[1-9]|[12]\\d|3[01])(?:(?:-|\\/|\\,)(?:0?[1-9]|[12]\\d|3[01]))?(?:,(?:0?[1-9]|[12]\\d|3[01])(?:(?:-|\\/|\\,)(?:0?[1-9]|[12]\\d|3[01]))?)*)\\s+(\\?|\\*|(?:[1-9]|1[012])(?:(?:-|\\/|\\,)(?:[1-9]|1[012]))?(?:L|W)?(?:,(?:[1-9]|1[012])(?:(?:-|\\/|\\,)(?:[1-9]|1[012]))?(?:L|W)?)*|\\?|\\*|(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(?:(?:-)(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC))?(?:,(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(?:(?:-)(?:JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC))?)*)\\s+(\\?|\\*|(?:[0-6])(?:(?:-|\\/|\\,|#)(?:[0-6]))?(?:L)?(?:,(?:[0-6])(?:(?:-|\\/|\\,|#)(?:[0-6]))?(?:L)?)*|\\?|\\*|(?:MON|TUE|WED|THU|FRI|SAT|SUN)(?:(?:-)(?:MON|TUE|WED|THU|FRI|SAT|SUN))?(?:,(?:MON|TUE|WED|THU|FRI|SAT|SUN)(?:(?:-)(?:MON|TUE|WED|THU|FRI|SAT|SUN))?)*)(|\\s)+(\\?|\\*|(?:|\\d{4})(?:(?:-|\\/|\\,)(?:|\\d{4}))?(?:,(?:|\\d{4})(?:(?:-|\\/|\\,)(?:|\\d{4}))?)*))$',)
+  }
 
 export const checkProviderData = {
     int8: 1,
@@ -150,6 +172,73 @@ export const OPCUARules = {
     description: [{ max: 200, message: '最多可输入200个字符' }],
 };
 
+const validatorUrl = (rule:any, value:any, callback:any)  => {
+    const reg = regular.DOMAIN_NAME
+    const reg1 = regular.IP_URL
+    if(value === undefined || value === '' || value === null) {
+      return Promise.reject("请输入通道Ip")
+    } else {
+      if(reg.test(value) === false && reg1.test(value) === false) {
+        return Promise.reject("请输入正确的域名或ip地址")
+      }
+      return Promise.resolve()
+    }
+  }
+  /**
+ * 校验通道端口
+ */
+const validator1 = (rule:any, value:any, callback:any)  => {
+    if(value === undefined || value === '' || value === null) {
+      return Promise.reject("请输入通道端口")
+    } else {
+      if(value < 0 || value > 65535) {
+        return Promise.reject("请输入0~65535的整数")
+      }
+      return Promise.resolve()
+    }
+  }
+  
+  /**
+   * 校验机架号
+   */
+  const validator2 = (rule:any, value:any, callback:any)  => {
+    if(value === undefined || value === '' || value === null) {
+      return Promise.reject("请输入机架号")
+    } else {
+      if(value < 0 || value > 65535) {
+        return Promise.reject("请输入0~65535的整数")
+      }
+      return Promise.resolve()
+    }
+  }
+  
+  /**
+   *  校验槽位
+   */
+  const validator3 = (rule:any, value:any, callback:any)  => {
+    if(value === undefined || value === '' || value === null) {
+      return Promise.reject("请输入槽位")
+    } else {
+      if(value < 0 || value > 65535) {
+        return Promise.reject("请输入0~65535的整数")
+      }
+      return Promise.resolve()
+    }
+  }
+  
+  /**
+   *  校验超时时间
+   */
+  const validator4 = (rule:any, value:any, callback:any)  => {
+    if(value === undefined || value === '' || value === null) {
+      return Promise.reject("请输入超时时间")
+    } else {
+      if(value < 0 || value > 65535) {
+        return Promise.reject("请输入0~65535的整数")
+      }
+      return Promise.resolve()
+    }
+  }
 export const LeftTreeRules = {
     channelId: [{ required: true, message: '请选择所属通道', trigger: 'blur' }],
     name: [
@@ -163,7 +252,7 @@ export const LeftTreeRules = {
             message: '请输入0-255之间的正整数',
         },
     ],
-    type: [{ required: true, message: '请选择处理方式', trigger: 'blur' }],
+    // type: [{ required: true, message: '请选择处理方式', trigger: 'blur' }],
     endian: [
         { required: true, message: '请选择双字高低位切换', trigger: 'blur' },
     ],
@@ -172,7 +261,16 @@ export const LeftTreeRules = {
     ],
     requestTimeout:[
         { pattern: /^\d+$/, message:'请输入2000-60000的正整数',trigger: 'change'}
-    ]
+    ],
+    host: [
+        { required: true, trigger: 'blur', validator: validatorUrl, },
+    ],
+    port: [{ required: true, trigger: 'blur' , validator: validator1}],
+    rack: [{ required: true, trigger: 'blur', validator: validator2 }],
+    slot: [{ required: true, trigger: 'blur', validator: validator3 }],
+    timeout: [{ required: true, trigger: 'blur', validator: validator4 }],
+    type: [{required: true, trigger: 'change', message: '请选择型号'}],
+    serializable: [{required: true, trigger: 'change', message: '请选择型号'}],
 };
 
 export const FormTableColumns = [
@@ -216,3 +314,5 @@ export const FormTableColumns = [
         width: 50,
     },
 ];
+
+