GuoYuFu123 преди 6 години
родител
ревизия
ee3b02cea4

+ 44 - 18
src/components/config_point/step3_edit/auto_handle.vue

@@ -1,13 +1,11 @@
 <template>
-    <el-form ref='form' :model='form' label-width='120px'>
-        <el-form-item label='设备标识:'>
-            <el-input v-model='form.name'></el-input>
+    <el-form ref='form' :rules='rules' :model='form' label-width='140px'>
+        <el-form-item ref='form' label='设备标识' prop='EquipmentMark'>
+            <el-input v-model='form.EquipmentMark'></el-input>
         </el-form-item>
-        <el-form-item label='原始点位单位:'>
-            <el-select v-model='form.unit' placeholder='请选择'>
-                <el-option v-for='item in unitArr' :key='item.value' :label='item.label' :value='item.value'></el-option>
-            </el-select>
-            <p class='tip'>数据字典信息点-额定电压(v)</p>
+        <el-form-item label='原始点位值单位' prop='unit'>
+            <el-cascader :options='options' v-model='form.unit' @change='handleChange'></el-cascader>
+            <p class='tip'>数据字典信息点-{{unitObj ? (unitObj.infoPointName || '--') : '--'}}({{unitObj ? (unitObj.unit || '--') : '--'}})</p>
         </el-form-item>
     </el-form>
 </template>
@@ -17,19 +15,47 @@ export default {
     name: 'step3_auto-handle',
     data() {
         return {
+            options: [
+                {
+                    value: 'zhinan',
+                    label: '指南',
+                    children: [
+                        {
+                            value: 'shejiyuanze',
+                            label: '设计原则'
+                        },
+                        {
+                            value: 'daohang',
+                            label: '导航'
+                        }
+                    ]
+                }
+            ],
             form: {
-                name: '',
-                unit: '0'
+                EquipmentMark: '',
+                unit: []
             },
-            unitArr: [{
-                label: 'Kv',
-                value: '0'
-            },{
-                label: 'Cm',
-                value: '1'
-            }]
+            rules: {
+                EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }],
+                unit: [{ required: true, message: '请选择原始点位值单位', trigger: ['change', 'blur'] }]
+            }
         }
-    }
+    },
+    props: ['unitObj'],
+    methods: {
+        getForm(cb) {
+            this.$refs['form'].validate(valid => {
+                if (valid) {
+                    cb(this.form)
+                } else {
+                    cb(false)
+                }
+            })
+        },
+        handleChange(val) {
+            console.log(val)
+        }
+    },
 }
 </script>
 

+ 42 - 22
src/components/config_point/step3_edit/enum_handle.vue

@@ -1,11 +1,11 @@
 <template>
     <div class='edit-box'>
-        <el-form ref='form' :model='form' label-width='120px'>
-            <el-form-item label='设备标识:'>
-                <el-input v-model='form.name'></el-input>
+        <el-form ref='form' :rules='rules' :model='form' label-width='140px'>
+            <el-form-item label='设备标识' prop='EquipmentMark'>
+                <el-input v-model='form.EquipmentMark'></el-input>
             </el-form-item>
         </el-form>
-        <ul class='point-box'>
+        <ul class='point-box' v-if='pointArr.length'>
             <p class='character'>
                 <span>如果</span>
             </p>
@@ -16,20 +16,20 @@
                 <p>
                     <span class='name'>原始点位值 =</span>
                     <span class='value'>
-                        <el-input v-model='item.old'></el-input>
+                        <el-input v-model='item.from'></el-input>
                     </span>
                 </p>
                 <p>
                     <span class='name'>转换为标准值 =</span>
                     <span class='value'>
-                        <el-input v-model='item.new'></el-input>
+                        <el-input v-model='item.to'></el-input>
                     </span>
-                    <i class='el-icon-delete delete'></i>
+                    <i class='el-icon-delete delete' @click='deleteRow(index)'></i>
                 </p>
             </li>
         </ul>
         <div class='add-btn-box'>
-            <el-button type='primary'>+添加新转换规则</el-button>
+            <el-button type='primary' @click='addRules'>+添加新转换规则</el-button>
         </div>
     </div>
 </template>
@@ -40,15 +40,33 @@ export default {
     data() {
         return {
             form: {
-                name: ''
+                EquipmentMark: ''
             },
-            pointArr: [{
-                old: '',
-                new: ''
-            },{
-                old: '',
-                new: ''
-            }]
+            rules: {
+                EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }]
+            },
+            pointArr: []
+        }
+    },
+    methods: {
+        getForm(cb) {
+            this.$refs["form"].validate((valid) => {
+                if(valid){
+                    this.form.pointArr = this.pointArr;
+                    cb(this.form)
+                } else {
+                    cb(false)
+                }
+            })
+        },
+        addRules() {
+            this.pointArr.push(this.newRules())
+        },
+        newRules() {
+            return { from: '', to: '' }
+        },
+        deleteRow(index) {
+            this.pointArr.splice(index, 1)
         }
     }
 }
@@ -56,20 +74,20 @@ export default {
 
 <style scoped lang='scss'>
 .edit-box {
-    padding: 20px 0; 
+    padding: 20px 0;
     .tip {
         color: #ccc;
     }
     .point-box {
         margin-top: 45px;
         position: relative;
-        width: 600px;
+        width: 500px;
         .character {
             position: absolute;
             top: -25px;
-            left: 0;
+            left: -6px;
             font-size: 22px;
-            width: 600px;
+            width: 500px;
             text-align: left;
         }
         .nm {
@@ -78,10 +96,10 @@ export default {
         li {
             display: flex;
             justify-content: space-between;
-            margin-top:5px;
+            margin-top: 5px;
             p {
                 .name {
-                    padding-left: 80px;
+                    padding-left: 40px;
                 }
                 .value {
                     margin-left: 10px;
@@ -91,6 +109,8 @@ export default {
                 .delete {
                     margin-left: 5px;
                     cursor: pointer;
+                    position: relative;
+                    z-index: 99999;
                 }
             }
         }

+ 52 - 14
src/components/config_point/step3_edit/formula_handle.vue

@@ -1,24 +1,28 @@
 <template>
     <div class='edit-box'>
-        <el-form ref='form' :model='form' label-width='120px'>
-            <el-form-item label='设备标识'>
-                <el-input v-model='form.name'></el-input>
+        <el-form ref='form' :rules='rules' :model='form' label-width='140px'>
+            <el-form-item label='设备标识' prop='EquipmentMark'>
+                <el-input v-model='form.EquipmentMark'></el-input>
             </el-form-item>
         </el-form>
         <div class='formula-box'>
             <p>原始点位</p>
             <p class='xia-1'>👇</p>
-            <p>
+            <div>
                 截取:
                 <el-switch v-model='subStrVal' active-color='#13ce66' inactive-color='#ff4949'></el-switch>
-            </p>
+                <p class='sub-p'>
+                    <el-input-number v-model='from' :min='1' :max='10' label='描述文字' :disabled="!subStrVal"></el-input-number>位 - 第
+                    <el-input-number  v-model='to' :min='1' :max='10' label='描述文字' :disabled="!subStrVal" @change='subToChange'></el-input-number>位(从1开始)
+                </p>
+            </div>
             <p class='xia-2'>👇</p>
             <p>
                 数值计算:
                 <el-switch v-model='valCountVal' active-color='#13ce66' inactive-color='#ff4949'></el-switch>
             </p>
             <p>
-                <el-select class='mark' v-model="mark" placeholder="请选择">
+                <el-select class='mark' v-model="mark" placeholder="请选择" :disabled="!valCountVal">
                     <el-option
                     v-for="item in markArr"
                     :key="item.value"
@@ -26,7 +30,7 @@
                     :value="item.value">
                     </el-option>
                 </el-select>
-                <el-input class='mark-value' v-model='markValue'></el-input>
+                <el-input class='mark-value' v-model='markValue' :disabled="!valCountVal"></el-input>
             </p>
         </div>
     </div>
@@ -38,20 +42,51 @@ export default {
     data() {
         return {
             form: {
-                name: ''
+                EquipmentMark: '',
+            },
+            rules: {
+                EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }]
             },
             subStrVal: true,
+            from: 1,
+            to: 1,
             valCountVal: true,
-            mark:'0',
+            mark:'plus',
             markValue: '',
             markArr:[{
-                label: '✖',
-                value: '0'
-            },{
-                label: '➗',
-                value: '1'
+                label: '+',
+                value: 'plus'
             }]
         }
+    },
+    methods: {
+        getForm(cb) {
+            this.$refs["form"].validate((valid) => {
+                if(valid){
+                    if(this.subStrVal) {
+                        this.form.from = this.from;
+                        this.form.to = this.to;
+                    }
+                    if(this.valCountVal) {
+                        this.form.mark = this.mark;
+                        this.form.markValue = this.markValue;
+                    }
+                    cb(this.form)
+                } else {
+                    cb(false)
+                }
+            })
+        },
+        subToChange(val) {
+
+        }
+    },
+    watch: {
+        from(val) {
+            if(val > this.to) {
+                this.to = val
+            } 
+        }
     }
 }
 </script>
@@ -60,6 +95,9 @@ export default {
 .edit-box {
     .formula-box {
         padding-left: 40px;
+        .sub-p {
+            margin-top: 10px;
+        }
         .xia-2 {
             padding-left: 50px;
         }

+ 251 - 17
src/components/config_point/step3_edit/index.vue

@@ -33,9 +33,21 @@
             </ul>
         </div>
         <div class='right'>
-            <el-form class='form' :rules='rules' ref='form' :model='form' label-width='120px'>
-                <el-form-item label='对应数据字典' prop='name'>
-                    <el-input v-model='form.name'></el-input>
+            <el-form class='form' :rules='rules' ref='form' :model='form' label-width='140px'>
+                <el-form-item
+                    label='对应数据字典'
+                    prop='dict'
+                    :rules='[{ required: true, message: "请输入对应数据字典", trigger: "change" },{ validator: validateDict, trigger: ["blur", "change"] }]'
+                >
+                    <el-cascader
+                        style='width: 100%;'
+                        :options='options'
+                        v-model='form.dict'
+                        @change='handleChange'
+                        :props='props'
+                        filterable
+                        @active-item-change='handleItemChange'
+                    ></el-cascader>
                     <div class='dict'>
                         <p class='top'>
                             <i class='el-icon-plus'></i>
@@ -57,11 +69,11 @@
                     </el-select>
                 </el-form-item>
                 <!-- components -->
-                <no-handle v-if='form.DataRuleType == "无需处理,直接使用"'></no-handle>
-                <auto-handle v-else-if='form.DataRuleType == "需自动单位转换"'></auto-handle>
-                <enum-handle v-else-if='form.DataRuleType == "需按设置枚举转换"'></enum-handle>
-                <formula-handle v-else-if='form.DataRuleType == "需按公式转换"'></formula-handle>
-                <split-handle v-else></split-handle>
+                <no-handle ref='noHandle' v-if='form.DataRuleType == "无需处理,直接使用"'></no-handle>
+                <auto-handle ref='autoHandle' v-else-if='form.DataRuleType == "需自动单位转换"' :unitObj='unitObj'></auto-handle>
+                <enum-handle ref='enumHandle' v-else-if='form.DataRuleType == "需按设置枚举转换"'></enum-handle>
+                <formula-handle ref='formulaHandle' v-else-if='form.DataRuleType == "需按公式转换"'></formula-handle>
+                <split-handle ref='splitHandle' v-else></split-handle>
             </el-form>
             <div class='btn-box'>
                 <el-button type='primary' @click='save'>保存</el-button>
@@ -71,21 +83,33 @@
 </template>
 
 <script>
+//components
 import noHandle from './no_handle'
 import autoHandle from './auto_handle'
 import enumHandle from './enum_handle'
 import formulaHandle from './formula_handle'
 import splitHandle from './split_handle'
+//api
+import { getEquipmentAll, getQueryProperty } from 'fetch/data_plat'
+import { batchCreate } from 'fetch/point_http'
 export default {
     name: 'point_config_step3_edit',
     data() {
         return {
+            options: [],
+            optionObj: {},
+            infoDict: {}, //信息点字典
+            unitObj: {}, //传给自动单位转换的obj
+            props: {
+                value: 'code',
+                label: 'name',
+                children: 'content'
+            },
             form: {
-                name: '',
+                dict: [],
                 DataRuleType: '无需处理,直接使用'
             },
             rules: {
-                name: [{ required: true, message: '请输入对应数据字典', trigger: 'blur' }],
                 DataRuleType: [{ required: true, message: '请选择值处理方式', trigger: 'change' }]
             },
             textarea: '',
@@ -127,24 +151,234 @@ export default {
         splitHandle
     },
     methods: {
+        validateDict(rule, value, cb) {
+            if (value.length < 4) {
+                cb(new Error('请选到第四级(可能本设备没有信息点)'))
+            } else {
+                cb()
+            }
+        },
         //保存
         save() {
-            console.log('save-----')
-            console.log(this.form)
             this.$refs['form'].validate(valid => {
                 if (valid) {
-                    alert('submit!')
+                    var flag = this.form.DataRuleType
+                    switch (flag) {
+                        case '无需处理,直接使用':
+                            this.$refs['noHandle'].getForm(noHandle => {
+                                if (noHandle) {
+                                    this.saveForm(this.form, noHandle)
+                                } else {
+                                    this.errMsg()
+                                }
+                            })
+                            break
+                        case '需自动单位转换':
+                            this.$refs['autoHandle'].getForm(autoHandle => {
+                                if (autoHandle) {
+                                    this.saveForm(this.form, autoHandle)
+                                } else {
+                                    this.errMsg()
+                                }
+                            })
+                            break
+                        case '需按设置枚举转换':
+                            this.$refs['enumHandle'].getForm(enumHandle => {
+                                if (enumHandle) {
+                                    this.saveForm(this.form, enumHandle)
+                                } else {
+                                    this.errMsg()
+                                }
+                            })
+                            break
+                        case '需按公式转换':
+                            this.$refs['formulaHandle'].getForm(formulaHandle => {
+                                if (formulaHandle) {
+                                    this.saveForm(this.form, formulaHandle)
+                                } else {
+                                    this.errMsg()
+                                }
+                            })
+                            break
+                        case '需按拆分枚举转换':
+                            this.$refs['splitHandle'].getForm(splitHandle => {
+                                if (splitHandle) {
+                                    this.saveForm(this.form, splitHandle)
+                                } else {
+                                    this.errMsg()
+                                }
+                            })
+                            break
+                    }
                 } else {
-                    console.log('error submit!!')
+                    this.errMsg()
                     return false
                 }
             })
+        },
+        saveForm(basic, other) {
+            console.log(basic, other)
+            let type = basic.DataRuleType
+            let basicParams = {
+                System: basic.dict[0], //系统
+                Specialty: basic.dict[1], //专业
+                EquipmentType: basic.dict[2], //设备类
+                InfomationPoint: basic.dict[3], //信息点
+                DataRuleType: basic.DataRuleType //值处理方式
+            }
+            let otherParams = {}
+            switch (type) {
+                case '无需处理,直接使用':
+                    otherParams = {
+                        EquipmentMark: other.EquipmentMark
+                    }
+                    break
+                case '需自动单位转换':
+                    otherParams = {}
+                    break
+                case '需按设置枚举转换':
+                    let DataRuleContent2 = other.pointArr.length
+                        ? JSON.stringify([{ seq: 1, ruletype: 'type2', content: other.pointArr }])
+                        : undefined
+                    otherParams = {
+                        EquipmentMark: other.EquipmentMark,
+                        DataRuleContent: DataRuleContent2
+                    }
+                    break
+                case '需按公式转换':
+                    let subRule = other.from
+                        ? {
+                              seq: 1,
+                              ruletype: 'type4',
+                              content: [
+                                  {
+                                      from: other.from,
+                                      to: other.to
+                                  }
+                              ]
+                          }
+                        : undefined
+                    let countRule = other.mark
+                        ? {
+                              seq: 1,
+                              ruletype: 'type6',
+                              content: [
+                                  {
+                                      calculationtype: other.mark,
+                                      value: other.markValue
+                                  }
+                              ]
+                          }
+                        : undefined
+
+                    let DataRuleContent3 = []
+                    if (subRule) {
+                        DataRuleContent3.push(subRule)
+                    }
+                    if (countRule) {
+                        DataRuleContent3.push(countRule)
+                    }
+                    DataRuleContent3 = DataRuleContent3.length ? JSON.stringify(DataRuleContent3) : undefined
+                    otherParams = {
+                        EquipmentMark: other.EquipmentMark,
+                        DataRuleContent: DataRuleContent3
+                    }
+                    break
+                case '需按拆分枚举转换':
+                    let SplitPoints = other.devArr.length ? other.devArr : undefined
+                    let DataRuleContent4 = undefined;
+                    if (other.pointArr) {
+                        DataRuleContent4 = other.pointArr
+                            ? JSON.stringify([
+                                  {
+                                      seq: 1,
+                                      ruletype: 'type4',
+                                      content: other.pointArr
+                                  }
+                              ])
+                            : undefined
+                    }
+                    otherParams = {
+                        SplitPoints: SplitPoints,
+                        DataRuleContent: DataRuleContent4
+                    }
+                    break
+            }
+            let params = [Object.assign(basicParams, otherParams)]
+            console.log(params)
+            batchCreate(params, res=> {
+                console.log(res);
+            })
+        },
+        errMsg() {
+            this.$message({
+                message: '有必填项未填',
+                type: 'warning'
+            })
+        },
+        handleChange(arr) {
+            console.log(arr)
+            console.log(this.infoDict)
+            this.unitObj = this.infoDict[arr[3]]
+            console.log(this.unitObj)
+        },
+        handleItemChange(val) {
+            if (val.length == 3) {
+                let params = { type: val[2] }
+                getQueryProperty(params, res => {
+                    if (res.Result == 'success') {
+                        let data = res.Content
+                        let arr = data
+                            .filter(item => {
+                                return item.inputMode == 'L'
+                            })
+                            .map(item => {
+                                return {
+                                    code: item.infoPointCode,
+                                    name: item.infoPointName
+                                }
+                            })
+                        this.infoDict = {}
+                        data.forEach(item => {
+                            this.infoDict[item.infoPointCode] = item
+                        })
+                        this.optionObj = {}
+                        this.getOptionItem(this.options, val[2])
+
+                        if (arr.length) {
+                            this.optionObj.content = arr
+                        } else {
+                            this.optionObj.content = undefined
+                        }
+                    }
+                })
+            }
+        },
+        getOptionItem(arr, code) {
+            for (var i = 0; i < arr.length; i++) {
+                if (arr[i].code == code) {
+                    this.optionObj = arr[i]
+                }
+                if (arr[i].content && arr[i].content.length > 0) {
+                    this.getOptionItem(arr[i].content, code)
+                }
+            }
+        },
+        getEqAll() {
+            let params = { format: true }
+            getEquipmentAll(params, res => {
+                if (res.Result == 'success') {
+                    this.options = res.Content
+                }
+            })
+        },
+        init() {
+            //获取所有的设备
+            this.getEqAll()
         }
     },
     mounted() {
-        console.log('edit')
-        console.log(this.editData || '')
-        console.log(this.postJson)
+        this.init()
     }
 }
 </script>

+ 1 - 1
src/components/config_point/step3_edit/no_handle.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-form ref='form' :model='form' :rules='rules' label-width='120px'>
+    <el-form ref='form' :model='form' :rules='rules' label-width='140px'>
         <el-form-item label='设备标识' prop="EquipmentMark">
             <el-input v-model='form.EquipmentMark'></el-input>
         </el-form-item>

+ 76 - 28
src/components/config_point/step3_edit/split_handle.vue

@@ -1,22 +1,29 @@
 <template>
     <div class='edit-box'>
-        <el-form class='form' ref='form' :model='form' label-width='120px'>
-            <div class='dev-know'>
-                <el-form-item label='设备标识:'>
-                    <el-input v-model='form.name'></el-input>
+        <el-form v-if='form.devArr.length' class='form' ref='form' :model='form' label-width='140px'>
+            <div class='dev-know' v-for='(item,index) in form.devArr' :key='index'>
+                <el-form-item
+                    label='设备标识:'
+                    :prop='"devArr." + index + ".EquipmentMark"'
+                    :rules='{
+      required: true, message: "设备标识不能为空", trigger: "blur"
+    }'
+                >
+                    <el-input v-model='item.EquipmentMark'></el-input>
                 </el-form-item>
                 <p class='strsub'>
                     截取 第
-                    <el-input-number v-model='form.name' :min='1' :max='10' label='描述文字'></el-input-number>位 - 第
-                    <el-input-number v-model='form.name' :min='1' :max='10' label='描述文字'></el-input-number>位(从1开始)
+                    <el-input-number v-model='item.SplitStart' :min='1' :max='10' label='描述文字'></el-input-number>位 - 第
+                    <el-input-number v-model='item.SplitEnd' :min='1' :max='10' label='描述文字'></el-input-number>位(从1开始)
                 </p>
+                <i class='el-icon-minus del-sub-icon' @click="delDev(index)"></i>
             </div>
         </el-form>
         <p class='tranf-box'>
             需要将截取值转换为标准值:
             <el-switch v-model='tranfVal' active-color='#13ce66' inactive-color='#ff4949'></el-switch>
         </p>
-        <ul class='point-box'>
+        <ul class='point-box' v-if='pointArr.length'>
             <p class='character'>
                 <span>如果</span>
             </p>
@@ -27,20 +34,20 @@
                 <p>
                     <span class='name'>原始点位值 =</span>
                     <span class='value'>
-                        <el-input v-model='item.old'></el-input>
+                        <el-input v-model='item.from' :disabled='!tranfVal'></el-input>
                     </span>
                 </p>
                 <p>
                     <span class='name'>转换为标准值 =</span>
                     <span class='value'>
-                        <el-input v-model='item.new'></el-input>
+                        <el-input v-model='item.to' :disabled='!tranfVal'></el-input>
                     </span>
-                    <i class='el-icon-delete delete'></i>
+                    <i class='el-icon-delete delete' @click='deleteRules(index)'></i>
                 </p>
             </li>
         </ul>
         <div class='add-btn-box'>
-            <el-button type='primary'>+添加新转换规则</el-button>
+            <el-button type='primary' @click='addRules' :disabled='!tranfVal'>+添加新转换规则</el-button>
         </div>
     </div>
 </template>
@@ -51,19 +58,49 @@ export default {
     data() {
         return {
             form: {
-                name: ''
+                devArr: [
+                    {
+                        EquipmentMark: '',
+                        SplitStart: 1,
+                        SplitEnd: 2
+                    },{
+                        EquipmentMark: '',
+                        SplitStart: 1,
+                        SplitEnd: 2
+                    }
+                ]
             },
             tranfVal: true,
-            pointArr: [
-                {
-                    old: '',
-                    new: ''
-                },
-                {
-                    old: '',
-                    new: ''
+            pointArr: []
+        }
+    },
+    methods: {
+        getForm(cb) {
+            this.$refs["form"].validate((valid) => {
+                if(valid){
+                    if(this.tranfVal && this.pointArr.length) {
+                        this.form.pointArr = this.pointArr;
+                    }
+                    cb(this.form)
+                } else {
+                    cb(false)
                 }
-            ]
+            })
+        },
+        delDev(index) {
+            this.form.devArr.splice(index,1);
+        },
+        addRules() {
+            this.pointArr.push(this.newRules())
+        },
+        newRules() {
+            return { from: '', to: '' }
+        },
+        deleteRules(index) {
+            if (!this.tranfVal) {
+                return false
+            }
+            this.pointArr.splice(index, 1)
         }
     }
 }
@@ -73,10 +110,19 @@ export default {
 .edit-box {
     .form {
         .dev-know {
+            margin-top: 5px;
             background: #e6e6e6;
-            padding: 5px 5px 5px 0;
+            padding: 5px 50px 5px 0;
+            width: 470px;
+            position: relative;
+            .del-sub-icon {
+                position: absolute;
+                right: 15px;
+                top: 50px;
+                cursor: pointer;
+            }
             .strsub {
-                padding-left: 50px;
+                padding-left: 20px;
             }
         }
     }
@@ -85,15 +131,15 @@ export default {
         line-height: 80px;
     }
     .point-box {
-        margin-top: 35px;
+        margin-top: 40px;
         position: relative;
-        width: 600px;
+        width: 500px;
         .character {
             position: absolute;
-            top: -25px;
+            top: -40px;
             left: 0;
             font-size: 22px;
-            width: 600px;
+            width: 500px;
             text-align: left;
         }
         .nm {
@@ -105,7 +151,7 @@ export default {
             margin-top: 5px;
             p {
                 .name {
-                    padding-left: 80px;
+                    padding-left: 40px;
                 }
                 .value {
                     margin-left: 10px;
@@ -115,6 +161,8 @@ export default {
                 .delete {
                     margin-left: 5px;
                     cursor: pointer;
+                    position: relative;
+                    z-index: 99999;
                 }
             }
         }

+ 12 - 0
src/fetch/data_plat.js

@@ -0,0 +1,12 @@
+import { get, post, request } from './request'
+
+let dataForm = '/data-platform-3'
+
+//所有设备类型编码
+export function getEquipmentAll(params, success) {
+    return get(`${dataForm}/dict/query/equipment_all`, params, success)
+}
+//
+export function getQueryProperty(params, success) {
+    return get(`${dataForm}/infocode/query_property`, params, success)
+}

+ 8 - 0
src/fetch/point_http.js

@@ -1,6 +1,7 @@
 import {get, post, request } from './request'
 
 let point = '/pointconfig'
+let relation = '/relation'
 
 //添加数据源信息
 export function createDataSource(param, success) {
@@ -208,4 +209,11 @@ export function pointInfoJsMind(param, success) {
 export function pointTypeJsMind(param, success) {
     let data = param
     return post(`${point}/relation/check-original-equipment-type`, data, success)
+}
+
+/******************物理世界关系对应****************************************************** */
+//批量创建对应关系
+export function batchCreate(param, success) {
+    let data = param
+    return post(`${relation}/batch-create`, data, success)
 }

+ 2 - 2
src/views/config_point/steps/step3.vue

@@ -11,8 +11,8 @@
         <own-dialog :width="'1000px'" :dialogVisible="isDialogShow" @cancel="close">
             <dialog-main></dialog-main>
         </own-dialog>        
-        <own-dialog :width="'80%'" :dialogVisible="isEditDialogShow" @cancel="closeEdit">
-            <step3-edit :editData='editData'></step3-edit>
+        <own-dialog :width="'1000px'" :dialogVisible="isEditDialogShow" @cancel="closeEdit">
+            <step3-edit v-if="isEditDialogShow" :editData='editData'></step3-edit>
         </own-dialog>
     </div>
 </template>