chuwu преди 5 години
родител
ревизия
1b3f176667

+ 9 - 5
index.html

@@ -1,11 +1,15 @@
 <!DOCTYPE html>
 <html>
-  <head>
+
+<head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1112731_mlnvbky5ghl.css">
     <title>sagacloud-admin</title>
-  </head>
-  <body>
+</head>
+
+<body>
     <div id="app"></div>
-  </body>
-</html>
+</body>
+
+</html>

+ 0 - 4
src/assets/scss/reset.scss

@@ -34,10 +34,6 @@ $size1: 12px; //辅助文字大小
     }
 }
 
-.el-loading-mask {
-    z-index: 499;
-}
-
 //文字色
 @each $i,
 $color in $colorList {

+ 15 - 0
src/assets/style/style.scss

@@ -0,0 +1,15 @@
+.iconwushuju {
+    display: block;
+    width: 100px;
+    height: 100px;
+    font-size: 50px;
+    margin: auto;
+}
+
+.right {
+    text-align: right;
+}
+
+.el-loading-mask {
+    z-index: 499;
+}

+ 4 - 1
src/components/config_point/data_origin.vue

@@ -9,7 +9,10 @@
         </div>
         <div class="doughnut-view">
             <doughnut v-if="renderData.Sum" width="200" height="200" :name="renderData.Name" :renderData="echartsData" :id="id"></doughnut>
-            <div v-else class="center">暂无数据</div>
+            <div v-else class="center">
+                <i class="iconwushuju iconfont"></i>
+                暂无数据
+            </div>
         </div>
         <slot></slot>
     </div>

+ 1 - 0
src/components/config_point/examine_main.vue

@@ -17,6 +17,7 @@
                 </div>
             </div>
             <div v-else class="center">
+                <i class="iconwushuju iconfont"></i>
                 暂无数据
             </div>
         </div>

+ 4 - 1
src/components/config_point/find_keyword.vue

@@ -18,7 +18,10 @@
         <div class="find-data">
             <div class="left-view saga-border">
                 <doughnut v-if="!!sum" type="left" :name="dataName" width="200" height="200" :renderData="echartsData"></doughnut>
-                <div v-else class="center">暂无数据</div>
+                <div v-else class="center">
+                    <i class="iconwushuju iconfont"></i>
+                    暂无数据
+                </div>
             </div>
             <div class="right-view saga-border">
                 <div class="find-tags" v-for="(tag,index) in tagList" :key="index">

+ 6 - 6
src/components/config_point/select_one.vue

@@ -12,15 +12,15 @@
             <li v-for="(item,index) in renderData" :key="index">
                 <div @click="checkItem(item,index)" :class="index == active ? 'saga-active-select': ''" class="select-item border-bottom pointer">
                     <span v-if="isSelected" :class="{'is-checked': item[isCheckInfo]}" class="el-checkbox__input">
-                            <span class="el-checkbox__inner"></span>
+                                <span class="el-checkbox__inner"></span>
                     </span>
                     {{overString(item[infosKey])}}
                     <i v-if="isDel" @click.stop="delItem(item)" class="el-icon-error saga-delete pointer"></i>
                 </div>
             </li>
         </ul>
-        <div class="center" v-else>
-            暂无数据
+        <div v-else class="center">
+            <i class="iconwushuju iconfont"></i> 暂无数据
         </div>
     </div>
 </template>
@@ -61,8 +61,8 @@
                 this.$emit("check", item)
                 this.active = index
             },
-            delItem(item){
-                this.$emit('deleteItem',item)
+            delItem(item) {
+                this.$emit('deleteItem', item)
             },
             change() {
                 this.$emit("check", this.renderData[this.active])
@@ -122,7 +122,7 @@
     }
     .saga-delete {
         display: none;
-        float:right;
+        float: right;
         line-height: 31px;
         padding-right: 10px;
         box-sizing: border-box;

+ 12 - 0
src/components/config_point/step3_edit/formula_handle.vue

@@ -65,6 +65,18 @@ export default {
                 {
                     label: '+',
                     value: 'plus'
+                },
+                {
+                    label: '-',
+                    value: 'minus'
+                },
+                {
+                    label: '*',
+                    value: 'time'
+                },
+                {
+                    label: '/',
+                    value: 'divide'
                 }
             ]
         }

+ 141 - 150
src/components/config_point/step3_edit/split_handle.vue

@@ -2,14 +2,9 @@
     <div class='edit-box'>
         <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
-                    v-if='devFlag'
-                    label='设备标识:'
-                    :prop='"devArr." + index + ".EquipmentMark"'
-                    :rules='{
-      required: true, message: "设备标识不能为空", trigger: "blur"
-    }'
-                >
+                <el-form-item v-if='devFlag' 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'>
@@ -31,24 +26,16 @@
                 <span class='right'>那么</span>
                 <li v-for='(item,index) in form.pointArr' :key='index'>
                     <p>
-                        <el-form-item
-                            label='原始点位值'
-                            :prop='"pointArr." + index + ".from"'
-                            :rules='{
-      required: tranfVal?true: false, message: "不能为空", trigger: "blur"
-    }'
-                        >
+                        <el-form-item label='原始点位值' :prop='"pointArr." + index + ".from"' :rules='{
+          required: tranfVal?true: false, message: "不能为空", trigger: "blur"
+        }'>
                             <el-input v-model='item.from' :disabled='!tranfVal'></el-input>
                         </el-form-item>
                     </p>
                     <p>
-                        <el-form-item
-                            label='转换为标准值'
-                            :prop='"pointArr." + index + ".to"'
-                            :rules='{
-      required: tranfVal?true: false, message: "不能为空", trigger: "blur"
-    }'
-                        >
+                        <el-form-item label='转换为标准值' :prop='"pointArr." + index + ".to"' :rules='{
+          required: tranfVal?true: false, message: "不能为空", trigger: "blur"
+        }'>
                             <el-input v-model='item.to' :disabled='!tranfVal'></el-input>
                         </el-form-item>
                         <i v-if='index > 0' class='el-icon-delete delete' @click='deleteRow(index)'></i>
@@ -63,156 +50,160 @@
 </template>
 
 <script>
-export default {
-    name: 'step3_auto-handle',
-    data() {
-        return {
-            form: {
-                devArr: [
-                    {
+    export default {
+        name: 'step3_auto-handle',
+        data() {
+            return {
+                form: {
+                    devArr: [{
                         EquipmentMark: '',
                         SplitStart: 1,
                         SplitEnd: 1
-                    }
-                ],
-                pointArr: []
-            },
-            tranfVal: true
-        }
-    },
-    props: {
-        devFlag: {
-            default: true,
-            type: Boolean
-        },
-        splitHandleShow: {}
-    },
-    methods: {
-        getForm(cb) {
-            this.$refs['form'].validate(valid => {
-                if (valid) {
-                    this.form.tranfVal = this.tranfVal;
-                    cb(this.form)                    
-                } else {
-                    cb(false)
-                }
-            })
-        },
-        addDevs() {
-            this.form.devArr.push(this.newDevs())
-        },
-        newDevs() {
-            return {
-                EquipmentMark: '',
-                SplitStart: 1,
-                SplitEnd: 1
+                    }],
+                    pointArr: []
+                },
+                tranfVal: true
             }
         },
-        delDev(index) {
-            this.form.devArr.splice(index, 1)
-        },
-        addRules() {
-            this.form.pointArr.push(this.newRules())
-        },
-        newRules() {
-            return { from: '', to: '' }
+        props: {
+            devFlag: {
+                default: true,
+                type: Boolean
+            },
+            splitHandleShow: {}
         },
-        deleteRow(index) {
-            if (!this.tranfVal) {
-                return false
+        methods: {
+            getForm(cb) {
+                this.$refs['form'].validate(valid => {
+                    if (valid) {
+                        this.form.tranfVal = this.tranfVal;
+                        cb(this.form)
+                    } else {
+                        cb(false)
+                    }
+                })
+            },
+            addDevs() {
+                this.form.devArr.push(this.newDevs())
+            },
+            newDevs() {
+                return {
+                    EquipmentMark: '',
+                    SplitStart: 1,
+                    SplitEnd: 1
+                }
+            },
+            delDev(index) {
+                this.form.devArr.splice(index, 1)
+            },
+            addRules() {
+                this.form.pointArr.push(this.newRules())
+            },
+            newRules() {
+                return {
+                    from: '',
+                    to: ''
+                }
+            },
+            deleteRow(index) {
+                if (!this.tranfVal) {
+                    return false
+                }
+                this.form.pointArr.splice(index, 1)
+            },
+            init() {
+                this.form.pointArr = [{
+                    from: '',
+                    to: ''
+                }]
             }
-            this.form.pointArr.splice(index, 1)
         },
-        init() {
-            this.form.pointArr = [{ from: '', to: '' }]
-        }
-    },
-    watch: {
-        splitHandleShow: {
-            immediate: true,
-            deep: true,
-            handler(val) {
-                if(val) {                    
-                    this.form = val;
-                    // console.log(this.form)
-                } else {
-                    this.init()   
+        watch: {
+            splitHandleShow: {
+                immediate: true,
+                deep: true,
+                handler(val) {
+                    if (val) {
+                        this.form = val;
+                        // console.log(this.form)
+                    } else {
+                        this.init()
+                    }
                 }
             }
         }
     }
-}
 </script>
 
 <style scoped lang='scss'>
-.edit-box {
-    .form {
-        .dev-know {
-            margin-top: 5px;
-            background: #e6e6e6;
-            padding: 5px 50px 5px 0;
-            width: 470px;
-            position: relative;
-            .del-sub-icon {
-                position: absolute;
-                right: 15px;
-                top: 50px;
-                cursor: pointer;
-            }
-            .strsub {
-                padding-left: 20px;
+    .edit-box {
+        .form {
+            .dev-know {
+                margin-top: 5px;
+                background: #e6e6e6;
+                padding: 5px 50px 5px 0;
+                width: 470px;
+                position: relative;
+                .del-sub-icon {
+                    position: absolute;
+                    right: 15px;
+                    top: 50px;
+                    cursor: pointer;
+                }
+                .strsub {
+                    padding-left: 20px;
+                }
             }
         }
-    }
-    .tranf-box {
-        height: 50px;
-        line-height: 80px;
-    }
-    .point-box {
-        margin-top: 45px;
-        position: relative;
-        width: 500px;
-        .left,
-        .right {
-            font-size: 20px;
-        }
-        .left {
-            position: absolute;
-            top: -25px;
-            left: -11px;
-        }
-        .right {
-            position: absolute;
-            top: -25px;
-            left: 260px;
+        .tranf-box {
+            height: 50px;
+            line-height: 80px;
         }
-        li {
-            display: flex;
-            justify-content: space-between;
-            margin-top: 5px;
+        .point-box {
+            margin-top: 45px;
             position: relative;
-            p {
-                .name {
-                    padding-left: 40px;
-                }
-                .value {
-                    margin-left: 10px;
-                    display: inline-block;
-                    width: 80px;
-                }
+            width: 500px;
+            .left,
+            .right {
+                font-size: 20px;
+            }
+            .left {
+                position: absolute;
+                top: -25px;
+                left: -11px;
             }
-            .delete {
-                top: 5px;
-                right: -20px;
-                cursor: pointer;
+            .right {
                 position: absolute;
-                z-index: 99999;
+                top: -25px;
+                left: 260px;
+            }
+            li {
+                display: flex;
+                justify-content: space-between;
+                margin-top: 5px;
+                position: relative;
+                p {
+                    .name {
+                        padding-left: 40px;
+                    }
+                    .value {
+                        margin-left: 10px;
+                        display: inline-block;
+                        width: 80px;
+                    }
+                }
+                .delete {
+                    top: 5px;
+                    right: -20px;
+                    cursor: pointer;
+                    position: absolute;
+                    z-index: 99999;
+                }
             }
         }
+        .add-btn-box {
+            margin-top: 20px;
+            text-align: center;
+        }
     }
-    .add-btn-box {
-        margin-top: 20px;
-        text-align: center;
-    }
-}
 </style>

+ 3 - 1
src/main.js

@@ -12,6 +12,8 @@ Vue.use(ElementUI, { size: "small", zIndex: 1000 })
 
 import './framework/style/layout.scss'
 
+import '@/assets/style/style.scss'
+
 import componentsPlugin from '@/framework/plugins/components'
 Vue.use(componentsPlugin)
 
@@ -24,4 +26,4 @@ new Vue({
     store,
     components: { App },
     template: '<App/>'
-})
+})

+ 8 - 2
src/utils/handsontable/delType.js

@@ -3,8 +3,14 @@ let tagsFun = (instance, td, row, col, prop, value, cellProperties) => {
     if (!!value) {
         let arr = value || [],
             dom = ``;
-        arr.map(item => {
-            dom += `<span style="display: inline-block;line-height:25px;padding: 0px 10px;background: #FFF5E4;border: 1px solid #F5A623;border-radius: 100px;font-size: 12px;color: #F5A623;text-align: center;">${item}</span>`
+        arr.map((item, index) => {
+            if (index > 2) {
+
+            } else if (index == 2) {
+                dom += '<span>...</span>'
+            } else {
+                dom += `<span style="display: inline-block;line-height:20px;height: 20px;box-sizing:border-box;padding: 0px 10px;background: #FFF5E4;border: 1px solid #F5A623;border-radius: 100px;font-size: 12px;color: #F5A623;text-align: center;margin: 4px 4px 0 0;">${item}</span>`
+            }
         })
         td.innerHTML = dom
         return td;

+ 36 - 4
src/views/data_admin/buildGraphy/index.vue

@@ -3,8 +3,22 @@
  -->
 <template>
   <div id="graphy">
-    <div class="graphy-left">
+    <!-- <div class="graphy-left">
       <graphy-tree v-if="show" :param="param" @change="getPoint"></graphy-tree>
+    </div> -->
+    <div class='condition'>
+        <p>
+            <span>建筑楼层</span>
+            <el-select v-model='buildVlaue' placeholder='请选择' clearable>
+                <el-option
+                    v-for='item in options'
+                    :key='item.Code'
+                    :label='item.Name'
+                    @active-item-change="handleItemChange"
+                    filterable
+                ></el-option>
+            </el-select>
+        </p>
     </div>
     <div class="graphy-main">
       <graphy-canvas v-if="show" :param="param" @getDetails="getDetails" @resetPoint="resetPoint" ref="canvas"></graphy-canvas>
@@ -27,7 +41,7 @@ import graphyTree from "./graphyTree";
 import graphyTabs from "./graphyTabs";
 import graphyCanvas from "./graphyCanvas";
 import {mapGetters, mapActions} from 'vuex';
-import {getPT} from "@/api/scan/request"; //获取点位坐标
+import {getPT,getBuildSelect} from "@/api/scan/request"; //获取点位坐标
 import Handsontable from "handsontable-pro"
 import 'handsontable-pro/dist/handsontable.full.css'
 import zhCN from 'handsontable-pro/languages/zh-CN';
@@ -49,13 +63,16 @@ export default {
         UserId: this.userId, //用户id
         fllorName: ""
       },
+      options: [],
       map: null,
       pointId: null,
       show:false,
+      buildVlaue: []
     };
   },
   mounted() { 
     this.changeValue()
+    this.getList()
   },
   computed: {
     ...mapGetters("peojMess", [
@@ -65,16 +82,31 @@ export default {
     ])
   },
   methods: {
+      //获取建筑列表
+      getList(){
+          getBuildSelect(this.param).then(res => {
+              console.log(res)
+              this.options = res.data.BuildList.map(item => {
+                  return {
+                      Code: item.BuildId,
+                      Name: item.BuildLocalName,
+                      children: []
+                  }
+              })
+          })
+      },
+      handleItemChange(val){
+          console.log(val,'val')
+      },
     changeValue(){
       this.$set(this.param,'ProjId',this.projectId)
-      console.log(this.param)
       this.$set(this.param,'UserId',this.userId)
       this.$set(this.pointParam,'ProjId',this.projectId)
       this.$set(this.pointParam,'UserId',this.userId)
-      console.log(this.pointParam)
       this.show = true
     },
     getPoint(data) {
+        console.log(data)
       this.pointParam.FloorId = data.code;
       this.pointParam.fllorName = data.name;
       this.$refs.tabs.reset(this.pointParam, data.map);

+ 6 - 3
src/views/point/config_point/steps/step1.vue

@@ -3,7 +3,7 @@
         <div class="btns-view">
             <el-button style="float:right;margin-top:4px;margin-left:10px;" @click="saveData">保存</el-button>
             <el-button style="float:right;margin-top:4px;" @click="addRow">新增行</el-button>
-            <el-button style="float:right;margin-top:4px;" @click="downData">下载数据</el-button>
+            <el-button style="float:right;margin-top:4px;" @click="downData">导出配置点位表</el-button>
             <el-button style="float:right;margin-top:4px;" @click="updateExcel = true">导入Excel</el-button>
             <el-button style="float:right;margin-top:4px;" @click="downloadExcel = true">导出Excel模板</el-button>
             <el-checkbox style="float:right;line-height:40px;" @change="getData" v-model="checked">只显示使用的原始点位</el-checkbox>
@@ -11,7 +11,10 @@
         </div>
         <div id="handsontableSteps1" v-loading="isLoading">
             <handsontable-component v-if="!!allData.length" @delete="delePoint" ref="handsontable" @mouseDown="clickTable" @change="changeHand"></handsontable-component>
-            <div v-else class="center">暂无数据</div>
+            <div v-else class="center">
+                <i class="iconwushuju iconfont"></i>
+                暂无数据
+            </div>
         </div>
         <own-dialog :width="'500px'" :index="true" title="位置标签" :dialogVisible="localtionDialog" @cancel="closeFalg">
             <localtion-falg :renderData="renderData" @changeTag="changeLoc"></localtion-falg>
@@ -30,7 +33,7 @@
                 <el-radio class="radio-left" v-model="radio" label="2">默认不使用导入的全部原始点位</el-radio>
             </div>
         </own-dialog>
-        <div class="center">
+        <div class="right">
             <pagination :page="pages" @change="changePage"></pagination>
         </div>
     </div>

+ 19 - 11
src/views/point/config_point/steps/step2.vue

@@ -11,9 +11,12 @@
             </div>
         </div>
         <div id="handsontableSteps1" v-loading="isLoading">
-            <handsontable-component @delete="delePoint" @mouseDown="clickTable" @change="changeHand" ref="handsontable"></handsontable-component>
+            <handsontable-component v-if="!!pages.total" @delete="delePoint" @mouseDown="clickTable" @change="changeHand" ref="handsontable"></handsontable-component>
+            <div v-else class="center">
+                <i class="iconwushuju iconfont"></i> 暂无数据
+            </div>
         </div>
-        <div class="center">
+        <div class="right">
             <pagination :page="pages" @change="changePage"></pagination>
         </div>
         <own-dialog :width="'60%'" :title="title" :dialogVisible="isDialogShow" @cancel="close">
@@ -24,9 +27,9 @@
             <examine-main></examine-main>
         </own-dialog>
         <!-- <own-dialog :width="'1000px'" :index="true" title="关键内容设别——检查&微调" :dialogVisible="examineDialog" @cancel="close"> -->
-            <!-- <find-keyword ref="findKeyword" :type="type"></find-keyword> -->
-            <!-- <examine-main></examine-main>
-        </own-dialog> -->
+        <!-- <find-keyword ref="findKeyword" :type="type"></find-keyword> -->
+        <!-- <examine-main></examine-main>
+            </own-dialog> -->
         <own-dialog :width="'500px'" :index="true" title="位置标签" :dialogVisible="localtionDialog" @cancel="localFalgChange">
             <localtion-falg :renderData="renderData" @changeTag="changeLoc"></localtion-falg>
         </own-dialog>
@@ -106,8 +109,8 @@
                     this.localtionDialog = true
                 }
             },
-            changeLoc(val){
-               this.renderData.LocationFlag = val
+            changeLoc(val) {
+                this.renderData.LocationFlag = val
                 this.changeFlag = false
             },
             //修改提示
@@ -177,10 +180,10 @@
              */
             discern(num) {
                 if (num == 1) {
-                    this.title = "关键内识别——批量识别设备类型关键字"
+                    this.title = "关键内识别——批量识别设备类型关键字"
                     this.type = "type"
                 } else if (num == 2) {
-                    this.title = "关键内识别——批量识别设备参数关键字"
+                    this.title = "关键内识别——批量识别设备参数关键字"
                     this.type = "arguments"
                 }
                 this.isChangeData()
@@ -194,7 +197,7 @@
                 this.examineDialog = false
                 this.isChangeData()
             },
-            localFalgChange(){
+            localFalgChange() {
                 this.localtionDialog = false
             },
             //判断是否修改,修改调用修改接口,否则调用获取最新数据
@@ -288,9 +291,14 @@
                             }
                         }
                     }
-                    this.hot = this.$refs.handsontable.init(settings)
                     this.pages.total = res.Total
                     this.isLoading = false
+                    if (!this.pages.total) {
+                        return false
+                    }
+                    this.$nextTick(_ => {
+                        this.hot = this.$refs.handsontable.init(settings)
+                    })
                     console.log(this.hot)
                 })
             },

+ 21 - 20
src/views/point/config_point/steps/step3.vue

@@ -8,16 +8,16 @@
         <div id="handsontableSteps1" v-if="pages.total">
             <handsontable-component @mouseDown="clickEdit" ref="handsontable"></handsontable-component>
         </div>
-        <div v-else>
-            暂无数据
+        <div v-else class="center">
+            <i class="iconwushuju iconfont"></i> 暂无数据
         </div>
         <!-- <div class="center">
-            <pagination :page="pages" @change="changePage"></pagination>
-        </div> -->
+                <pagination :page="pages" @change="changePage"></pagination>
+            </div> -->
         <own-dialog :width="'1000px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化设备标识' " :dialogVisible="isDialogShow" @cancel="close">
             <dialog-main v-if="!isDataform"></dialog-main>
             <steps-main v-if="isDataform"></steps-main>
-        </own-dialog>        
+        </own-dialog>
         <own-dialog :width="'1000px'" :dialogVisible="isEditDialogShow" @cancel="closeEdit">
             <step3-edit v-if="isEditDialogShow" :editData='editData' @refresh='refreshData'></step3-edit>
         </own-dialog>
@@ -52,8 +52,8 @@
                 hot: null,
                 isDataform: false,
                 /************point3_step_edit*********************** */
-                isEditDialogShow: false,                          
-                editData:{},                              //编辑数据
+                isEditDialogShow: false,
+                editData: {}, //编辑数据
                 pages: {
                     size: 10,
                     sizes: [10, 30, 50, 100],
@@ -61,7 +61,7 @@
                     currentPage: 0
                 },
             }
-        }, 
+        },
         computed: {
             ...mapGetters("project", [
                 "projectId",
@@ -84,16 +84,15 @@
             close() {
                 this.isDialogShow = false
             },
-
             //只显示为标准化的点位标识
-            changeChecked(){
-                if(this.checked){
+            changeChecked() {
+                if (this.checked) {
                     getNoDealPoint({
                         type: this.protocolType,
                         data: {
                             DataSourceId: this.datasourceId
                         }
-                    },res => {
+                    }, res => {
                         let content = res.Content
                         let settings = {
                             data: content,
@@ -110,11 +109,10 @@
                         this.pages.total = res.Total
                         console.log(this.hot)
                     })
-                }else{
+                } else {
                     this.getData()
                 }
             },
-
             //页面显示num1为标准化设备标识,2为对应数据字典
             dialogShow(num) {
                 if (num == 1) {
@@ -128,7 +126,6 @@
             changePage() {
                 this.getData()
             },
-            
             /**
              * 表格点击事件
              * @param {当前条数据} rowData
@@ -136,13 +133,17 @@
              * 
              * down something
              */
-            clickEdit(rowData,row){
+            clickEdit(rowData, row) {
                 let activeCell = this.hot.getActiveEditor()
                 console.log(activeCell.prop)
                 if (activeCell.prop == "Point.Infos.edit") {
                     this.isEditDialogShow = true;
                     this.editData = rowData;
-                }               
+                }
+                if(activeCell.prop == "Infos.edit"){
+                    this.editData = {Point: rowData,RelationList: []};
+                    this.isEditDialogShow = true;
+                }
             },
             closeEdit() {
                 this.isEditDialogShow = false;
@@ -160,7 +161,7 @@
                 }
                 queryPointRela(param, res => {
                     let content = res.Content.map(item => {
-                        if(item.RelationList.length){
+                        if (item.RelationList.length) {
                             item.Point.DataRuleType = item.RelationList[0].DataRuleType
                             item.Point.PhysicalRelated = item.RelationList[0].EquipmentType + '-' + item.RelationList[0].InfomationPoint
                         }
@@ -178,7 +179,7 @@
                         maxRows: res.Content.length
                     }
                     this.pages.total = res.Total
-                    if(this.pages.total){
+                    if (this.pages.total) {
                         this.$nextTick(_ => {
                             this.hot = this.$refs.handsontable.init(settings)
                         })
@@ -206,7 +207,7 @@
     #handsonStep2 {
         flex: 1;
         display: flex;
-        flex-flow:column;
+        flex-flow: column;
         .btns-view {
             height: 40px;
             line-height: 40px;

+ 1 - 1
src/views/point/config_point/steps/step4.vue

@@ -2,7 +2,7 @@
     <div class="h100 steps4">
         <div class="btns-view">
             <el-button @click="checkedAll">获取展开点位数据</el-button>
-            <el-button>获取全部点位数据</el-button>
+            <el-button @click="clickTabs">获取全部点位数据</el-button>
         </div>
         <div class="center point-border">
             <el-radio-group v-model="activeIndex" @change="clickTabs">