Pārlūkot izejas kodu

格式化代码

chuwu 6 gadi atpakaļ
vecāks
revīzija
5bd9128b4f

+ 9 - 4
package-lock.json

@@ -4492,7 +4492,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4907,7 +4908,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4963,6 +4965,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5006,12 +5009,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

+ 6 - 5
src/App.vue

@@ -1,10 +1,11 @@
 <template>
-  <div id="app">
-    <keep-alive>
-      <router-view/>
-    </keep-alive>
-  </div>
+    <div id="app">
+        <keep-alive>
+            <router-view/>
+        </keep-alive>
+    </div>
 </template>
 
 <style lang="scss">
+
 </style>

+ 25 - 19
src/components/common/bread_crumb.vue

@@ -1,26 +1,32 @@
 <template>
-  <el-breadcrumb separator-class="el-icon-arrow-right">
-    <template v-for="item in brandArr">
-      <el-breadcrumb-item :to="{ path: item.path }">{{item.name}}</el-breadcrumb-item>
-    </template>
+    <el-breadcrumb separator-class="el-icon-arrow-right">
+        <template v-for="item in brandArr">
+          <el-breadcrumb-item :to="{ path: item.path }">{{item.name}}</el-breadcrumb-item>
+</template>
   </el-breadcrumb>
 </template>
 <script>
-import { mapGetters, mapActions } from "vuex";
-export default {
-  data() { return {} },
-  computed: {
-    ...mapGetters("bread", [
-      "isShow",
-      "brandArr"
-    ])
-  },
-  created() {
-    console.log(this.isShow, this.brandArr)
-  },
-  mounted() { },
-  methods: {}
-}
+    import {
+        mapGetters,
+        mapActions
+    } from "vuex";
+    export default {
+        data() {
+            return {}
+        },
+        computed: {
+            ...mapGetters("bread", [
+                "isShow",
+                "brandArr"
+            ])
+        },
+        created() {
+            console.log(this.isShow, this.brandArr)
+        },
+        mounted() {},
+        methods: {}
+    }
 </script>
 <style>
+
 </style>

+ 63 - 63
src/components/common/handsontable.vue

@@ -4,72 +4,72 @@
 -->
 
 <template>
-  <div style="height: 100%;">
-    <div :id="id"></div>
-  </div>
+    <div style="height: 100%;">
+        <div :id="id"></div>
+    </div>
 </template>
 <script>
-
-import Handsontable from "handsontable-pro"
-import './../../../node_modules/handsontable-pro/dist/handsontable.full.css'
-import zhCN from 'handsontable-pro/languages/zh-CN';
-
-export default {
-  props: {
-    id: {
-      type: String,
-      default: function createRandomId() {
-        return (Math.random() * 10000000).toString(16).substr(0, 4) + '-' + (new Date()).getTime() + '-' + Math.random().toString().substr(2, 5);
-      }
-    },
-    // settings: {//必填
-    //   type: Object
-    // }
-  },
-  data() { return {} },
-  created() { },
-  mounted() {
-    // console.log(handsontable)
-    // this.init()
-  },
-  methods: {
-
-    getElement() {
-      return {
-        width: document.getElementById(this.id).clientWidth,
-        height: document.getElementById(this.id).parentNode.clientHeight
-      }
-    },
-    init(settings) {
-      console.log("init")
-      var hotElement = document.getElementById(this.id)
-      var hotSettings = Object.assign({
-        width: this.getElement().width,
-        rowHeaders: true,
-        colHeaders: true,
-        filters: true,
-        height: this.getElement().height,
-        columnSorting: true, //添加排序
-        sortIndicator: true, //添加排序
-        renderAllRows: true,
-        autoColumnSize: true,
-        language: "zh-CN",
-        manualColumnResize: true,
-        manualColumnMove: true,
-        dropdownMenu: [
-          "filter_by_condition",
-          "filter_action_bar"
-        ]
-      }, settings);
-      console.log(hotSettings, settings)
-      var hot = new Handsontable(hotElement, hotSettings);
-      let pro = document.getElementById("hot-display-license-info");
-      if (!!pro) {
-        pro.parentNode.removeChild(pro);
-      }
+    import Handsontable from "handsontable-pro"
+    import './../../../node_modules/handsontable-pro/dist/handsontable.full.css'
+    import zhCN from 'handsontable-pro/languages/zh-CN';
+    export default {
+        props: {
+            id: {
+                type: String,
+                default: function createRandomId() {
+                    return (Math.random() * 10000000).toString(16).substr(0, 4) + '-' + (new Date()).getTime() + '-' + Math.random().toString().substr(2, 5);
+                }
+            },
+            // settings: {//必填
+            //   type: Object
+            // }
+        },
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {
+            // console.log(handsontable)
+            // this.init()
+        },
+        methods: {
+            getElement() {
+                return {
+                    width: document.getElementById(this.id).clientWidth,
+                    height: document.getElementById(this.id).parentNode.clientHeight
+                }
+            },
+            init(settings) {
+                console.log("init")
+                var hotElement = document.getElementById(this.id)
+                var hotSettings = Object.assign({
+                    width: this.getElement().width,
+                    rowHeaders: true,
+                    colHeaders: true,
+                    filters: true,
+                    height: this.getElement().height,
+                    columnSorting: true, //添加排序
+                    sortIndicator: true, //添加排序
+                    renderAllRows: true,
+                    autoColumnSize: true,
+                    language: "zh-CN",
+                    manualColumnResize: true,
+                    manualColumnMove: true,
+                    dropdownMenu: [
+                        "filter_by_condition",
+                        "filter_action_bar"
+                    ]
+                }, settings);
+                console.log(hotSettings, settings)
+                var hot = new Handsontable(hotElement, hotSettings);
+                let pro = document.getElementById("hot-display-license-info");
+                if (!!pro) {
+                    pro.parentNode.removeChild(pro);
+                }
+            }
+        }
     }
-  }
-}
 </script>
 <style lang="scss" scoped>
+
 </style>

+ 46 - 43
src/components/common/jsmind.vue

@@ -1,50 +1,53 @@
 <template>
-  <div class="h100">
-    <div :id="id" style="width:100%;height:100%;"></div>
-  </div>
+    <div class="h100">
+        <div :id="id" style="width:100%;height:100%;"></div>
+    </div>
 </template>
 <script>
-import "assets/js/jsmind.js"
-import "assets/css/jsmind.css"
-export default {
-  name: "jsMindComponent",
-  props: {
-    id: {
-      type: String,
-      default: function createRandomId() {
-        return (Math.random() * 10000000).toString(16).substr(0, 4) + '-' + (new Date()).getTime() + '-' + Math.random().toString().substr(2, 5);
-      }
-    },
-  },
-  data() { return {} },
-  created() {
-    console.log(111)
-  },
-  mounted() {
-    console.log(jsMind)
-  },
-  methods: {
-    initData(options, data) {
-      let option = Object.assign({
-        container: this.id,
-        editable: true,
-        theme: 'orange'
-      }, options)
-      var el = {
-        container: this.id,
-        editable: true, //是否启用编辑
-        theme: "greensea", //主题
-        mode: "side", //显示模式
-        support_html: true //是否支持节点里的HTML元素
-      };
-      console.log(document.getElementById(this.id).clientWidth, document.getElementById(this.id).clientHeight)
-      var jm = new jsMind(el)
-      jm.show(data)
-      console.log(jm)
-      //   return jm
+    import "assets/js/jsmind.js"
+    import "assets/css/jsmind.css"
+    export default {
+        name: "jsMindComponent",
+        props: {
+            id: {
+                type: String,
+                default: function createRandomId() {
+                    return (Math.random() * 10000000).toString(16).substr(0, 4) + '-' + (new Date()).getTime() + '-' + Math.random().toString().substr(2, 5);
+                }
+            },
+        },
+        data() {
+            return {}
+        },
+        created() {
+            console.log(111)
+        },
+        mounted() {
+            console.log(jsMind)
+        },
+        methods: {
+            initData(options, data) {
+                let option = Object.assign({
+                    container: this.id,
+                    editable: true,
+                    theme: 'orange'
+                }, options)
+                var el = {
+                    container: this.id,
+                    editable: true, //是否启用编辑
+                    theme: "greensea", //主题
+                    mode: "side", //显示模式
+                    support_html: true //是否支持节点里的HTML元素
+                };
+                console.log(document.getElementById(this.id).clientWidth, document.getElementById(this.id).clientHeight)
+                var jm = new jsMind(el)
+                jm.show(data)
+                console.log(jm)
+                //   return jm
+            }
+        }
     }
-  }
-}
 </script>
 <style lang="scss" scoped>
+
 </style>

+ 57 - 58
src/components/config_point/cut_string.vue

@@ -1,66 +1,65 @@
 <template>
-  <div class="flex">
-    <template v-for="(item,index) in stringArr">
-      <span
-        @click="checkItem(item,index)"
-        :class="{'bg': (arr.indexOf(index) > -1)} "
-        class="cut-string saga-border pointer border-hover"
-      >{{item}}</span>
-    </template>
+    <div class="flex">
+        <template v-for="(item,index) in stringArr">
+          <span
+            @click="checkItem(item,index)"
+            :class="{'bg': (arr.indexOf(index) > -1)} "
+            class="cut-string saga-border pointer border-hover"
+          >{{item}}</span>
+</template>
   </div>
 </template>
 <script>
-export default {
-  props: {
-    string: {
-      type: String,
-      default: "大家看法的帅哥"
-    }
-  },
-  data() {
-    return {
-      stringArr: this.string.split(""),
-      obj: {},
-      arr: []
-    }
-  },
-  created() {
-  },
-  mounted() { },
-  methods: {
-    checkItem(item, index) {
-      this.obj[index] = item
-      this.arr.push(index)
-    },
-    clear() {
-      this.stringArr = this.string.split("")
-      this.obj = {}
-      this.arr = []
-    },
-    getData() {
-      let string = ""
-      for (let key in this.obj) {
-        string += this.obj[key]
-      }
-      console.log(string)
-      return string
+    export default {
+        props: {
+            string: {
+                type: String,
+                default: "大家看法的帅哥"
+            }
+        },
+        data() {
+            return {
+                stringArr: this.string.split(""),
+                obj: {},
+                arr: []
+            }
+        },
+        created() {},
+        mounted() {},
+        methods: {
+            checkItem(item, index) {
+                this.obj[index] = item
+                this.arr.push(index)
+            },
+            clear() {
+                this.stringArr = this.string.split("")
+                this.obj = {}
+                this.arr = []
+            },
+            getData() {
+                let string = ""
+                for (let key in this.obj) {
+                    string += this.obj[key]
+                }
+                console.log(string)
+                return string
+            }
+        },
+        watch: {
+            string: function() {
+                this.clear()
+            }
+        }
     }
-  },
-  watch: {
-    string: function () {
-      this.clear()
-    }
-  }
-}
 </script>
 <style lang="scss" scoped>
-.cut-string {
-  width: 50px;
-  height: 50px;
-  text-align: center;
-  line-height: 50px;
-}
-.bg {
-  background: red;
-}
+    .cut-string {
+        width: 50px;
+        height: 50px;
+        text-align: center;
+        line-height: 50px;
+    }
+    .bg {
+        background: red;
+    }
 </style>

+ 39 - 39
src/components/config_point/data_origin.vue

@@ -1,49 +1,49 @@
 <template>
-  <div class="saga-fill">
-    <div class="saga-title center h1">{{reanderData.name}}</div>
-    <div class="center h3">通讯协议:{{reanderData.name}}</div>
-    <div class="padding10 bg-F5">
-      <p class="p-over2 h5">{{reanderData.note}}</p>
+    <div class="saga-fill">
+        <div class="saga-title center h1">{{reanderData.name}}</div>
+        <div class="center h3">通讯协议:{{reanderData.name}}</div>
+        <div class="padding10 bg-F5">
+            <p class="p-over2 h5">{{reanderData.note}}</p>
+        </div>
+        <div class="doughnut-view">
+            <doughnut width="200" height="200" :id="id"></doughnut>
+        </div>
+        <slot></slot>
     </div>
-    <div class="doughnut-view">
-      <doughnut width="200" height="200" :id="id"></doughnut>
-    </div>
-    <slot></slot>
-  </div>
 </template>
 <script>
-
-import doughnut from "components/echarts/doughnut"
-
-export default {
-  name: "dataOrgin",
-  components: {
-    doughnut
-  },
-  props: {
-    id: {
-      type: String
-    },
-    reanderData: {
-      type: Object,
-      default: function () {
-        return {}
-      }
+    import doughnut from "components/echarts/doughnut"
+    export default {
+        name: "dataOrgin",
+        components: {
+            doughnut
+        },
+        props: {
+            id: {
+                type: String
+            },
+            reanderData: {
+                type: Object,
+                default: function() {
+                    return {}
+                }
+            }
+        },
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {},
+        methods: {}
     }
-  },
-  data() { return {} },
-  created() { },
-  mounted() { },
-  methods: {}
-}
 </script>
 
 <style lang="scss" scoped>
-.doughnut-view {
-  height: 300px;
-  width: 100%;
-  padding: 5px;
-  box-sizing: border-box;
-}
+    .doughnut-view {
+        height: 300px;
+        width: 100%;
+        padding: 5px;
+        box-sizing: border-box;
+    }
 </style>
 

+ 16 - 13
src/components/config_point/dialog_main.vue

@@ -1,20 +1,23 @@
 <!--steps3的左侧-->
 <template>
-  <div>
-    <select-one></select-one>
-  </div>
+    <div>
+        <select-one></select-one>
+    </div>
 </template>
 <script>
-import selectOne from "components/config_point/select_one"
-export default {
-  data() { return {} },
-  created() { },
-  mounted() { },
-  methods: {},
-  components: {
-    selectOne
-  }
-}
+    import selectOne from "components/config_point/select_one"
+    export default {
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {},
+        methods: {},
+        components: {
+            selectOne
+        }
+    }
 </script>
 <style lang="scss" scoped>
+
 </style>

+ 120 - 136
src/components/config_point/ip_input.vue

@@ -1,143 +1,127 @@
 <template>
-  <ul class="ipAdress">
-    <li v-for="(item,index) in ipAdress" class="saga-border">
-      <input
-        type="text"
-        @input="checkIpVal(item,index)"
-        @keyup="turnIpPOS(item,index,$event)"
-        v-model="item.value"
-        ref="ipInput"
-        @blur="setDefaultVal(item)"
-      >
-      <!-- <div></div> -->
-    </li>
-    <span>:</span>
-    <li class="saga-border">
-      <input
-        type="text"
-        @input="checkIpVal(value,4)"
-        @keyup="turnIpPOS(value,4,$event)"
-        v-model="value.value"
-        ref="ipInput"
-        @blur="setDefaultVal(value)"
-      >
-      <!-- <div></div> -->
-    </li>
-  </ul>
+    <ul class="ipAdress">
+        <li v-for="(item,index) in ipAdress" class="saga-border">
+            <input type="text" @input="checkIpVal(item,index)" @keyup="turnIpPOS(item,index,$event)" v-model="item.value" ref="ipInput" @blur="setDefaultVal(item)">
+            <!-- <div></div> -->
+        </li>
+        <span>:</span>
+        <li class="saga-border">
+            <input type="text" @input="checkIpVal(value,4)" @keyup="turnIpPOS(value,4,$event)" v-model="value.value" ref="ipInput" @blur="setDefaultVal(value)">
+            <!-- <div></div> -->
+        </li>
+    </ul>
 </template>
 <script>
-export default {
-  name: "ipInput",
-  data() {
-    return {
-      ipAdress: [{
-        value: ''
-      }, {
-        value: ''
-      }, {
-        value: ''
-      }, {
-        value: ''
-      }],
-      value: [{
-        value: ''
-      }]
-    }
-  },
-  created() { },
-  mounted() { },
-  methods: {
-    //methods
-    checkIpVal(item, index) {
-      let self = this;
-      //确保每个值都处于0-255
-      let val = item.value;
-      //当输入的是空格时,值赋为空
-      val = val.trim();
-      val = parseInt(val, 10);
-      if (isNaN(val)) {
-        val = ''
-      } else {
-        if (index == 4) {
-          val = val < 0 ? 0 : val;
-          val = val > 65535 ? 65535 : val;
-        } else {
-          val = val < 0 ? 0 : val;
-          val = val > 255 ? 255 : val;
-        }
-      }
-      item.value = val;
-    },
-    turnIpPOS(item, index, event) {
-      let self = this;
-      let e = event || window.event;
-      //左箭头向左跳转,左一不做任何措施
-      if (e.keyCode == 37) {
-        if (index == 0) { } else {
-          self.$refs.ipInput[index - 1].focus();
-        }
-      }
-      //删除键把当前数据删除完毕后会跳转到前一个input,左一不做任何处理
-      if (e.keyCode == 8) {
-        let val = item.value;
-        if (index == 0) { } else {
-          self.$refs.ipInput[index - 1].focus();
+    export default {
+        name: "ipInput",
+        data() {
+            return {
+                ipAdress: [{
+                    value: ''
+                }, {
+                    value: ''
+                }, {
+                    value: ''
+                }, {
+                    value: ''
+                }],
+                value: [{
+                    value: ''
+                }]
+            }
+        },
+        created() {},
+        mounted() {},
+        methods: {
+            //methods
+            checkIpVal(item, index) {
+                let self = this;
+                //确保每个值都处于0-255
+                let val = item.value;
+                //当输入的是空格时,值赋为空
+                val = val.trim();
+                val = parseInt(val, 10);
+                if (isNaN(val)) {
+                    val = ''
+                } else {
+                    if (index == 4) {
+                        val = val < 0 ? 0 : val;
+                        val = val > 65535 ? 65535 : val;
+                    } else {
+                        val = val < 0 ? 0 : val;
+                        val = val > 255 ? 255 : val;
+                    }
+                }
+                item.value = val;
+            },
+            turnIpPOS(item, index, event) {
+                let self = this;
+                let e = event || window.event;
+                //左箭头向左跳转,左一不做任何措施
+                if (e.keyCode == 37) {
+                    if (index == 0) {} else {
+                        self.$refs.ipInput[index - 1].focus();
+                    }
+                }
+                //删除键把当前数据删除完毕后会跳转到前一个input,左一不做任何处理
+                if (e.keyCode == 8) {
+                    let val = item.value;
+                    if (index == 0) {} else {
+                        self.$refs.ipInput[index - 1].focus();
+                    }
+                }
+                //右箭头、回车键、空格键、冒号均向右跳转,右一不做任何措施
+                if (e.keyCode == 39 || e.keyCode == 13 || e.keyCode == 32 || e.keyCode == 190) {
+                    if (index == 4) {} else {
+                        self.$refs.ipInput[index + 1].focus();
+                    }
+                }
+            },
+            setDefaultVal(item) {
+                //当input失去焦点,而ip没有赋值时,会自动赋值为0
+                let self = this;
+                let val = item.value;
+                if (val == '') {
+                    item.value = '0';
+                }
+            },
         }
-      }
-      //右箭头、回车键、空格键、冒号均向右跳转,右一不做任何措施
-      if (e.keyCode == 39 || e.keyCode == 13 || e.keyCode == 32 || e.keyCode == 190) {
-        if (index == 4) { } else {
-          self.$refs.ipInput[index + 1].focus();
-        }
-      }
-    },
-    setDefaultVal(item) {
-      //当input失去焦点,而ip没有赋值时,会自动赋值为0
-      let self = this;
-      let val = item.value;
-      if (val == '') {
-        item.value = '0';
-      }
-    },
-  }
-}
+    }
 </script>
 <style lang="scss" scoped>
-.ipAdress {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  height: 100%;
-  margin-right: 10px;
-  justify-content: space-around;
-}
-.ipAdress li {
-  position: relative;
-  //   height: 23px;
-  margin: 2px;
-}
-ul[class="ipAdress"] input[type="text"] {
-  border: none;
-  width: 100%;
-  //   height: 23px;
-  text-align: center;
-  background: transparent;
-}
-.ipAdress li div {
-  position: absolute;
-  bottom: 2px;
-  right: 0;
-  border-radius: 50%;
-  background: #0190fe;
-  width: 2px;
-  height: 2px;
-}
-/*只需要3个div*/
-.ipAdress li:last-child div {
-  display: none;
-}
-/*取消掉默认的input focus状态*/
-.ipAdress input:focus {
-  outline: none;
-}
+    .ipAdress {
+        display: flex;
+        align-items: center;
+        width: 100%;
+        height: 100%;
+        margin-right: 10px;
+        justify-content: space-around;
+    }
+    .ipAdress li {
+        position: relative; //   height: 23px;
+        margin: 2px;
+    }
+    ul[class="ipAdress"] input[type="text"] {
+        border: none;
+        width: 100%; //   height: 23px;
+        text-align: center;
+        background: transparent;
+    }
+    .ipAdress li div {
+        position: absolute;
+        bottom: 2px;
+        right: 0;
+        border-radius: 50%;
+        background: #0190fe;
+        width: 2px;
+        height: 2px;
+    }
+    /*只需要3个div*/
+    .ipAdress li:last-child div {
+        display: none;
+    }
+    /*取消掉默认的input focus状态*/
+    .ipAdress input:focus {
+        outline: none;
+    }
 </style>

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

@@ -1,41 +1,41 @@
 <template>
-  <div class="select-own-one">
-    <p>{{name}}</p>
-  </div>
+    <div class="select-own-one">
+        <p>{{name}}</p>
+    </div>
 </template>
 <script>
-export default {
-  name: "select_one",
-  props: {
-    name: {
-      type: String,
-      default: "原始点位描述"
-    },
-    isOK: {
-      type: Boolean,
-      default: false
-    },
-    rendData: {
-      type: Array,
-      default: function () {
-        return [
-          {
-            name: "222"
-          }
-        ]
-      }
+    export default {
+        name: "select_one",
+        props: {
+            name: {
+                type: String,
+                default: "原始点位描述"
+            },
+            isOK: {
+                type: Boolean,
+                default: false
+            },
+            rendData: {
+                type: Array,
+                default: function() {
+                    return [{
+                        name: "222"
+                    }]
+                }
+            }
+        },
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {},
+        methods: {}
     }
-  },
-  data() { return {} },
-  created() { },
-  mounted() { },
-  methods: {}
-}
 </script>
 <style lang="scss" scoped>
-.select-own-one {
-  height: 100%;
-  width: 160px;
-  overflow-y: auto;
-}
+    .select-own-one {
+        height: 100%;
+        width: 160px;
+        overflow-y: auto;
+    }
 </style>

+ 105 - 92
src/components/echarts/doughnut.vue

@@ -1,104 +1,117 @@
 <template>
-  <div style="width:100%;height:100%;" :id="id"></div>
+    <div style="width:100%;height:100%;" :id="id">
+    </div>
 </template>
 <script>
-import echarts from "echarts"
-export default {
-  name: "doughnut",
-  props: {
-    id: {
-      type: String
-    },
-    reanderData: {
-      type: Object,
-      default: function () {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      myCharts: null
-    }
-  },
-  created() { },
-  mounted() {
-    this.drawDoughnut()
-  },
-  methods: {
-    drawDoughnut() {
-      let options = {
-        tooltip: {
-          trigger: 'item',
-          formatter: "{a} <br/>{b}: {c} ({d}%)"
+    import echarts from "echarts"
+    export default {
+        name: "doughnut",
+        props: {
+            id: {
+                type: String
+            },
+            reanderData: {
+                type: Object,
+                default: function() {
+                    return {}
+                }
+            }
         },
-        legend: {
-          orient: 'horizontal',
-          x: 'center', // 'center'
-          data: ['1', '2', '3']
+        data() {
+            return {
+                myCharts: null
+            }
         },
-        graphic: {
-          type: 'text',
-          left: 'center',
-          top: 'center',
-          style: {
-            text: '数据源\n1111',
-            textAlign: 'center',
-            fill: '#000',
-            width: 30,
-            height: 30
-          }
+        created() {},
+        mounted() {
+            this.drawDoughnut()
         },
-        series: [
-          {
-            name: '数据来源',
-            type: 'pie',
-            radius: ['40%', '60%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false,
-                  textStyle: { color: '#3c4858', fontSize: "9" },
-                  //   formatter: function (val) {   //让series 中的文字进行换行
-                  //     return val.name.split("-").join("\n");                  }
-                },
-                title: {
-                  text: 'aaaa'
-                },
-                labelLine: {
-                  show: false,
-                  lineStyle: { color: '#3c4858' }
+        methods: {
+            drawDoughnut() {
+                let options = {
+                    tooltip: {
+                        trigger: 'item',
+                        formatter: "{a} <br/>{b}: {c} ({d}%)"
+                    },
+                    legend: {
+                        orient: 'horizontal',
+                        x: 'center', // 'center'
+                        data: ['1', '2', '3']
+                    },
+                    graphic: {
+                        type: 'text',
+                        left: 'center',
+                        top: 'center',
+                        style: {
+                            text: '数据源\n1111',
+                            textAlign: 'center',
+                            fill: '#000',
+                            width: 30,
+                            height: 30
+                        }
+                    },
+                    series: [{
+                        name: '数据来源',
+                        type: 'pie',
+                        radius: ['40%', '60%'],
+                        itemStyle: {
+                            normal: {
+                                label: {
+                                    show: false,
+                                    textStyle: {
+                                        color: '#3c4858',
+                                        fontSize: "9"
+                                    },
+                                    //   formatter: function (val) {   //让series 中的文字进行换行
+                                    //     return val.name.split("-").join("\n");                  }
+                                },
+                                title: {
+                                    text: 'aaaa'
+                                },
+                                labelLine: {
+                                    show: false,
+                                    lineStyle: {
+                                        color: '#3c4858'
+                                    }
+                                }
+                            },
+                            emphasis: {
+                                shadowBlur: 5,
+                                shadowOffsetX: 0,
+                                shadowColor: 'rgba(0, 0, 0, 0.5)',
+                                textColor: '#000'
+                            }
+                        },
+                        data: [{
+                                value: 20,
+                                name: "1"
+                            },
+                            {
+                                value: 20,
+                                name: "2"
+                            },
+                            {
+                                value: 15,
+                                name: "3"
+                            }
+                        ]
+                    }],
+                    color: ['#9DA2D6', '#FBACA1', '#FFE37F']
                 }
-              },
-              emphasis: {
-                shadowBlur: 5,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)',
-                textColor: '#000'
-              }
+                this.myCharts = echarts.init(document.getElementById(this.id))
+                this.myCharts.setOption(options)
             },
-            data: [
-              { value: 20, name: "1" },
-              { value: 20, name: "2" },
-              { value: 15, name: "3" }
-            ]
-          }
-        ],
-        color: ['#9DA2D6', '#FBACA1', '#FFE37F']
-      }
-      this.myCharts = echarts.init(document.getElementById(this.id))
-      this.myCharts.setOption(options)
-    },
-  },
-  watch: {
-    reanderData: {
-      deep: true,
-      handler: function () {
-        this.drawDoughnut()
-      }
+        },
+        watch: {
+            reanderData: {
+                deep: true,
+                handler: function() {
+                    this.drawDoughnut()
+                }
+            }
+        }
     }
-  }
-}
 </script>
 <style>
+
 </style>

+ 62 - 67
src/components/el_pack/dialog.vue

@@ -1,76 +1,71 @@
 
 
 <template>
-  <el-dialog
-    :title="title"
-    :close-on-press-escape="escape"
-    :close-on-click-modal="isModel"
-    :visible.sync="dialogVisible"
-    :width="width"
-    :before-close="cancel"
-  >
-    <slot></slot>
-    <span v-if="!!footer" slot="footer" class="dialog-footer">
-      <el-button @click="cancel">{{footer.cancel ? footer.cancel : "取 消"}}</el-button>
-      <el-button type="primary" @click="confirm">{{footer.confirm ? footer.confirm : "确 定"}}</el-button>
-    </span>
-  </el-dialog>
+    <el-dialog :title="title" :close-on-press-escape="escape" :close-on-click-modal="isModel" :visible.sync="dialogVisible" :width="width" :before-close="cancel">
+        <slot></slot>
+        <span v-if="!!footer" slot="footer" class="dialog-footer">
+          <el-button @click="cancel">{{footer.cancel ? footer.cancel : "取 消"}}</el-button>
+          <el-button type="primary" @click="confirm">{{footer.confirm ? footer.confirm : "确 定"}}</el-button>
+        </span>
+    </el-dialog>
 </template>
 <script>
-export default {
-  /**
-   * props //#endregion
-   * @param width  宽度,选填。默认40%,非必填
-   * @param dialogVisible  dialog是否显示,必填,默认false
-   * @param footer   dialog的下级footer的文案{cancel:'',confirm: ''}默认undefind,非必填
-   * @param isModel  model层点击隐藏dialog,非必填,默认true
-   * @param escape  键盘点击esc隐藏dialog,非必填,默认true
-   * @param title  表头文案,默认‘必填’
-   * 
-   * @event cancel 取消事件,父组件必填
-   * @event confirm 确定事件,非必填
-   */
-  name: "ownDialog",
-  props: {
-    width: {
-      type: String,
-      default: "40%"
-    },
-    dialogVisible: {
-      type: Boolean,
-      default: false
-    },
-    footer: {
-      type: [Object, undefined],
-      default: undefined
-    },
-    isModel: {
-      type: Boolean,
-      default: true
-    },
-    escape: {
-      type: Boolean,
-      default: true
-    },
-    title: {
-      type: String,
-      default: "提示"
+    export default {
+        /**
+         * props //#endregion
+         * @param width  宽度,选填。默认40%,非必填
+         * @param dialogVisible  dialog是否显示,必填,默认false
+         * @param footer   dialog的下级footer的文案{cancel:'',confirm: ''}默认undefind,非必填
+         * @param isModel  model层点击隐藏dialog,非必填,默认true
+         * @param escape  键盘点击esc隐藏dialog,非必填,默认true
+         * @param title  表头文案,默认‘必填’
+         * 
+         * @event cancel 取消事件,父组件必填
+         * @event confirm 确定事件,非必填
+         */
+        name: "ownDialog",
+        props: {
+            width: {
+                type: String,
+                default: "40%"
+            },
+            dialogVisible: {
+                type: Boolean,
+                default: false
+            },
+            footer: {
+                type: [Object, undefined],
+                default: undefined
+            },
+            isModel: {
+                type: Boolean,
+                default: true
+            },
+            escape: {
+                type: Boolean,
+                default: true
+            },
+            title: {
+                type: String,
+                default: "提示"
+            }
+        },
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {
+        },
+        methods: {
+            cancel() {
+                this.$emit("cancel")
+            },
+            confirm() {
+                this.$emit("confirm")
+            }
+        }
     }
-  },
-  data() { return {} },
-  created() { },
-  mounted() {
-
-  },
-  methods: {
-    cancel() {
-      this.$emit("cancel")
-    },
-    confirm() {
-      this.$emit("confirm")
-    }
-  }
-}
 </script>
 <style lang="scss" scoped>
+
 </style>

+ 14 - 16
src/views/Home.vue

@@ -1,21 +1,19 @@
 <template>
-  <div class="home">
-    <el-input v-model="testData"></el-input>
-    <router-link to="/about">to</router-link>
-  </div>
+    <div class="home">
+        <el-input v-model="testData"></el-input>
+        <router-link to="/about">to</router-link>
+    </div>
 </template>
 
 <script>
-// @ is an alias to /src
-
-export default {
-  name: 'home',
-  components: {
-  },
-  data(){
-      return {
-          testData: ""
-      }
-  }
-}
+    // @ is an alias to /src
+    export default {
+        name: 'home',
+        components: {},
+        data() {
+            return {
+                testData: ""
+            }
+        }
+    }
 </script>

+ 66 - 79
src/views/config_point/edit_origin/index.vue

@@ -1,86 +1,73 @@
 <template>
-  <div>
-    <bread></bread>
-    <h3 class="center">{{formData.originName}}</h3>
-    <el-input
-      type="textarea"
-      class="dcenter block"
-      style="width:600px;margin-bottom: 10px;"
-      v-model="formData.note"
-      placeholder="数据源的说明再次编辑维护..."
-    ></el-input>
-    <el-form label-width="120px" style="width:600px;" :model="formData" class="dcenter">
-      <el-form-item label="协议类型">
-        <el-select v-model="formData.comProtocol" filterable placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="主机IP地址">
-        <ip-input></ip-input>
-      </el-form-item>
-      <el-form-item label="用户名/密码">
-        <el-input style="display:inline-block;width:100px;"></el-input>/
-        <el-input style="display:inline-block;width:100px;"></el-input>
-      </el-form-item>
-      <el-form-item label="ProgID">
-        <el-input style="display:inline-block;width:100px;"></el-input>
-      </el-form-item>
-    </el-form>
-  </div>
+    <div>
+        <bread></bread>
+        <h3 class="center">{{formData.originName}}</h3>
+        <el-input type="textarea" class="dcenter block" style="width:600px;margin-bottom: 10px;" v-model="formData.note" placeholder="数据源的说明再次编辑维护..."></el-input>
+        <el-form label-width="120px" style="width:600px;" :model="formData" class="dcenter">
+            <el-form-item label="协议类型">
+                <el-select v-model="formData.comProtocol" filterable placeholder="请选择">
+                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="主机IP地址">
+                <ip-input></ip-input>
+            </el-form-item>
+            <el-form-item label="用户名/密码">
+                <el-input style="display:inline-block;width:100px;"></el-input>/
+                <el-input style="display:inline-block;width:100px;"></el-input>
+            </el-form-item>
+            <el-form-item label="ProgID">
+                <el-input style="display:inline-block;width:100px;"></el-input>
+            </el-form-item>
+        </el-form>
+    </div>
 </template>
 <script>
-
-import ipInput from "components/config_point/ip_input"
-import bread from "components/common/bread_crumb"
-
-export default {
-  data() {
-    return {
-      formData: {
-        "comProtocol": "",//协议类型
-        "originName": "2323",
-        "ip": ["", "", "", ""],//ip
-        "port": "",//端口号,有些协议类型没有该信息
-        "userName": "",//用户名
-        "password": "",//密码
-        "progID": "",//progID
-        note: ""
-      },
-      options: [{
-        value: 'Modbus TCP',
-        label: 'Modbus TCP'
-      }, {
-        value: 'BACNet IP',
-        label: 'BACNet IP'
-      }, {
-        value: 'OPT',
-        label: 'OPT'
-      }, {
-        value: 'KNX',
-        label: 'KNX'
-      }, {
-        value: 'MQTT',
-        label: 'MQTT'
-      }, {
-        value: 'AMQP',
-        label: 'AMQP'
-      }]
+    import ipInput from "components/config_point/ip_input"
+    import bread from "components/common/bread_crumb"
+    export default {
+        data() {
+            return {
+                formData: {
+                    "comProtocol": "", //协议类型
+                    "originName": "2323",
+                    "ip": ["", "", "", ""], //ip
+                    "port": "", //端口号,有些协议类型没有该信息
+                    "userName": "", //用户名
+                    "password": "", //密码
+                    "progID": "", //progID
+                    note: ""
+                },
+                options: [{
+                    value: 'Modbus TCP',
+                    label: 'Modbus TCP'
+                }, {
+                    value: 'BACNet IP',
+                    label: 'BACNet IP'
+                }, {
+                    value: 'OPT',
+                    label: 'OPT'
+                }, {
+                    value: 'KNX',
+                    label: 'KNX'
+                }, {
+                    value: 'MQTT',
+                    label: 'MQTT'
+                }, {
+                    value: 'AMQP',
+                    label: 'AMQP'
+                }]
+            }
+        },
+        components: {
+            ipInput,
+            bread
+        },
+        created() {},
+        mounted() {},
+        methods: {}
     }
-  },
-  components: {
-    ipInput,
-    bread
-  },
-  created() {
-  },
-  mounted() { },
-  methods: {}
-}
 </script>
 <style>
+
 </style>

+ 76 - 80
src/views/config_point/index.vue

@@ -1,91 +1,87 @@
 <template>
-  <div class="saga-config-point">
-    <h3 class="center">{{projectName}}</h3>
-    <p class="center">此项目包括{{list.length}}个数据源</p>
-    <div class="saga-origin-list dcenter w">
-      <!-- <el-row> -->
-      <div class="disIne border-hover saga-list-item margin5" v-for="(item,index) in list">
-        <data-origin :id="'origin' + index" :reanderData="item">
-          <el-button @click="maintenance(item)" type="text">维护点位</el-button>
-          <el-button @click="goEdit(item)" type="text">编辑数据源</el-button>
-        </data-origin>
-      </div>
-      <div class="disIne saga-list-item margin5 center pointer" @click="addItem">
-        <i class="add-icon margin50">+</i>
-      </div>
-      <router-view></router-view>
-      <!-- </el-row> -->
+    <div class="saga-config-point">
+        <h3 class="center">{{projectName}}</h3>
+        <p class="center">此项目包括{{list.length}}个数据源</p>
+        <div class="saga-origin-list dcenter w">
+            <!-- <el-row> -->
+            <div class="disIne border-hover saga-list-item margin5" v-for="(item,index) in list">
+                <data-origin :id="'origin' + index" :reanderData="item">
+                    <el-button @click="maintenance(item)" type="text">维护点位</el-button>
+                    <el-button @click="goEdit(item)" type="text">编辑数据源</el-button>
+                </data-origin>
+            </div>
+            <div class="disIne saga-list-item margin5 center pointer" @click="addItem">
+                <i class="add-icon margin50">+</i>
+            </div>
+            <router-view></router-view>
+            <!-- </el-row> -->
+        </div>
     </div>
-  </div>
 </template>
 <script>
-import dataOrigin from "components/config_point/data_origin"
-export default {
-  components: {
-    dataOrigin
-  },
-  data() {
-    return {
-      projectName: "项目名称",
-      list: [
-        {
-          name: "111",
-          id: "222",
-          note: "21324234324234342343423423312312312312312321312312325345fdsafsdfsddgfshgdfsgehjfvdsbjfasbdfkdbsthjgdbgavksdbgfvjksdafbgdistghbdkbagvaksdbgkjd"
+    import dataOrigin from "components/config_point/data_origin"
+    export default {
+        components: {
+            dataOrigin
         },
-      ]
-    }
-  },
-  created() { },
-  mounted() { },
-  methods: {
-    addItem() {
-      this.$router.push({
-        path: "configPoint/editOrigin"
-      })
-    },
-    goEdit(item) {
-      this.$router.push({
-        path: "configPoint/editOrigin",
-        query: {
-          key: item.id
+        data() {
+            return {
+                projectName: "项目名称",
+                list: [{
+                    name: "111",
+                    id: "222",
+                    note: "21324234324234342343423423312312312312312321312312325345fdsafsdfsddgfshgdfsgehjfvdsbjfasbdfkdbsthjgdbgavksdbgfvjksdafbgdistghbdkbagvaksdbgkjd"
+                }, ]
+            }
+        },
+        created() {},
+        mounted() {},
+        methods: {
+            addItem() {
+                this.$router.push({
+                    path: "configPoint/editOrigin"
+                })
+            },
+            goEdit(item) {
+                this.$router.push({
+                    path: "configPoint/editOrigin",
+                    query: {
+                        key: item.id
+                    }
+                })
+            },
+            maintenance(item) {
+                this.$router.push({
+                    path: "configPoint/steps",
+                })
+            }
         }
-      })
-    },
-    maintenance(item) {
-      this.$router.push({
-        path: "configPoint/steps",
-      })
     }
-  }
-}
 </script>
 <style lang="scss" scoped>
-.saga-config-point {
-  height: 100%;
-  overflow-y: auto;
-  .add-icon {
-    font-size: 40px;
-  }
-  .margin50 {
-    display: block;
-    height: 100%;
-    line-height: 8;
-  }
-  .saga-origin-list {
-    display: flex;
-    flex-wrap: wrap;
-    // justify-content: space-around;
-    height: calc(100% - 90px);
-    .saga-list-item {
-      width: 320px;
-      height: 475px;
-      border-radius: 22px;
-      border: 6px solid #dee3f3;
-      //   &:hover {
-      //     border-color: #409eff;
-      //   }
+    .saga-config-point {
+        height: 100%;
+        overflow-y: auto;
+        .add-icon {
+            font-size: 40px;
+        }
+        .margin50 {
+            display: block;
+            height: 100%;
+            line-height: 8;
+        }
+        .saga-origin-list {
+            display: flex;
+            flex-wrap: wrap; // justify-content: space-around;
+            height: calc(100% - 90px);
+            .saga-list-item {
+                width: 320px;
+                height: 475px;
+                border-radius: 22px;
+                border: 6px solid #dee3f3; //   &:hover {
+                //     border-color: #409eff;
+                //   }
+            }
+        }
     }
-  }
-}
 </style>

+ 11 - 7
src/views/config_point/steps/collection.vue

@@ -1,13 +1,17 @@
 <template>
-  <div></div>
+    <div>
+    </div>
 </template>
 <script>
-export default {
-  data() { return {} },
-  created() { },
-  mounted() { },
-  methods: {}
-}
+    export default {
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {},
+        methods: {}
+    }
 </script>
 <style>
+
 </style>

+ 57 - 57
src/views/config_point/steps/index.vue

@@ -1,14 +1,14 @@
 <template>
-  <div class="h100 saga-maintenance">
-    <bread class="bread-view"></bread>
-    <div class="saga-btns-view">
-      <template v-for="(item,index) in jsonTitle">
-        <div
-          @click="activeStep = index + 1"
-          class="saga-steps-btn saga-border pointer saga-size3"
-        >{{item}}</div>
-        <div v-if="index < jsonTitle.length - 1" class="saga-steps-btn saga-size3">👉</div>
-      </template>
+    <div class="h100 saga-maintenance">
+        <bread class="bread-view"></bread>
+        <div class="saga-btns-view">
+            <template v-for="(item,index) in jsonTitle">
+            <div
+              @click="activeStep = index + 1"
+              class="saga-steps-btn saga-border pointer saga-size3"
+            >{{item}}</div>
+            <div v-if="index < jsonTitle.length - 1" class="saga-steps-btn saga-size3">👉</div>
+</template>
     </div>
     <div class="main-view">
       <step1 v-if="activeStep == 1"></step1>
@@ -19,55 +19,55 @@
   </div>
 </template>
 <script>
-import bread from "components/common/bread_crumb"
-import step1 from "./step1"
-import step2 from "./step2"
-import step3 from "./step3"
-import step4 from "./step4"
-
-export default {
-  data() {
-    return {
-      activeStep: 1,//活跃的step
-      jsonTitle: [
-        "原始点位表收集", "原始点位描述关键内同识别", "原始点位描述标准化", "点位表处理结果检查"
-      ]
-    }
-  },
-  created() { },
-  mounted() { },
-  methods: {
-    stepClick() {
-      console.log("test")
+    import bread from "components/common/bread_crumb"
+    import step1 from "./step1"
+    import step2 from "./step2"
+    import step3 from "./step3"
+    import step4 from "./step4"
+    export default {
+        data() {
+            return {
+                activeStep: 1, //活跃的step
+                jsonTitle: [
+                    "原始点位表收集", "原始点位描述关键内同识别", "原始点位描述标准化", "点位表处理结果检查"
+                ]
+            }
+        },
+        created() {},
+        mounted() {},
+        methods: {
+            stepClick() {
+                console.log("test")
+            }
+        },
+        components: {
+            bread,
+            step1,
+            step2,
+            step3,
+            step4
+        },
     }
-  },
-  components: {
-    bread,
-    step1,
-    step2,
-    step3,
-    step4
-  },
-}
 </script>
 <style lang="scss">
-.h100 {
-  .bread-view {
-    height: 45px;
-  }
-  .main-view {
-    height: calc(100% - 155px);
-    background: #ccc;
-    margin-top: 10px;
-  }
-  .saga-btns-view {
-    .saga-steps-btn {
-      height: 80px;
-      text-align: center; /*设置文本水平居中*/
-      display: table-cell;
-      vertical-align: middle;
-      padding: 0 30px;
+    .h100 {
+        .bread-view {
+            height: 45px;
+        }
+        .main-view {
+            height: calc(100% - 155px);
+            background: #ccc;
+            margin-top: 10px;
+        }
+        .saga-btns-view {
+            .saga-steps-btn {
+                height: 80px;
+                text-align: center;
+                /*设置文本水平居中*/
+                display: table-cell;
+                vertical-align: middle;
+                padding: 0 30px;
+            }
+        }
     }
-  }
-}
 </style>

+ 58 - 57
src/views/config_point/steps/step1.vue

@@ -1,65 +1,66 @@
 <template>
-  <div id="handsonStep1">
-    <div class="btns-view">
-      <el-button>获取原始点位当前值</el-button>
-      <el-button>导出Excel模板</el-button>
-      <el-button>导入Excel</el-button>
-      <el-button>新增行</el-button>
-      <el-button>保存</el-button>
-      <el-checkbox v-model="checked">只显示使用的原始点位</el-checkbox>
+    <div id="handsonStep1">
+        <div class="btns-view">
+            <el-button>获取原始点位当前值</el-button>
+            <el-button>导出Excel模板</el-button>
+            <el-button>导入Excel</el-button>
+            <el-button>新增行</el-button>
+            <el-button>保存</el-button>
+            <el-checkbox v-model="checked">只显示使用的原始点位</el-checkbox>
+        </div>
+        <div id="handsontableSteps1">
+            <handsontable-component ref="handsontable"></handsontable-component>
+        </div>
     </div>
-    <div id="handsontableSteps1">
-      <handsontable-component ref="handsontable"></handsontable-component>
-    </div>
-  </div>
 </template>
 <script>
-
-import handsontableComponent from "components/common/handsontable"
-import getHeaderSetting from "utils/point_edit/handson_header"
-import { changeHeader, showTypes } from "utils/handsontable/delType"
-
-export default {
-  data() {
-    return {
-      checked: false,
-      settings: {}
-    }
-  },
-  created() { },
-  mounted() {
-    this.getData()
-  },
-  methods: {
-    getData() {
-      let header = getHeaderSetting("Modbus TCP")
-      let width = (document.getElementById("app").clientWidth - 50) / header.length
-      let settings = {
-        data: [{}],
-        colHeaders: changeHeader(header),
-        columns: showTypes(header),
-        colWidths: width,
-        rowHeights: 30
-      }
-      this.$refs.handsontable.init(settings)
+    import handsontableComponent from "components/common/handsontable"
+    import getHeaderSetting from "utils/point_edit/handson_header"
+    import {
+        changeHeader,
+        showTypes
+    } from "utils/handsontable/delType"
+    export default {
+        data() {
+            return {
+                checked: false,
+                settings: {}
+            }
+        },
+        created() {},
+        mounted() {
+            this.getData()
+        },
+        methods: {
+            getData() {
+                let header = getHeaderSetting("Modbus TCP")
+                let width = (document.getElementById("app").clientWidth - 50) / header.length
+                let settings = {
+                    data: [{}],
+                    colHeaders: changeHeader(header),
+                    columns: showTypes(header),
+                    colWidths: width,
+                    rowHeights: 30
+                }
+                this.$refs.handsontable.init(settings)
+            }
+        },
+        components: {
+            handsontableComponent
+        }
     }
-  },
-  components: {
-    handsontableComponent
-  }
-}
 </script>
 <style lang="scss" scoped>
-#handsonStep1 {
-  height: 100%;
-  .btns-view {
-    height: 50px;
-    vertical-align: middle;
-  }
-  #handsontableSteps1 {
-    height: calc(100% - 50px);
-    overflow: hidden;
-    position: relative;
-  }
-}
+    #handsonStep1 {
+        height: 100%;
+        .btns-view {
+            height: 50px;
+            vertical-align: middle;
+        }
+        #handsontableSteps1 {
+            height: calc(100% - 50px);
+            overflow: hidden;
+            position: relative;
+        }
+    }
 </style>

+ 84 - 87
src/views/config_point/steps/step2.vue

@@ -1,95 +1,92 @@
 <template>
-  <div id="handsonStep2">
-    <div class="btns-view">
-      <el-button>AI自动识别</el-button>
-      <el-button @click="discern(1)">批量识别设备类型关键字</el-button>
-      <el-button @click="discern(2)">批量识别设备参数关键字</el-button>
-      <el-button>检查&微调</el-button>
-      <el-button>刷新</el-button>
-      <el-button>保存</el-button>
+    <div id="handsonStep2">
+        <div class="btns-view">
+            <el-button>AI自动识别</el-button>
+            <el-button @click="discern(1)">批量识别设备类型关键字</el-button>
+            <el-button @click="discern(2)">批量识别设备参数关键字</el-button>
+            <el-button>检查&微调</el-button>
+            <el-button>刷新</el-button>
+            <el-button>保存</el-button>
+        </div>
+        <div id="handsontableSteps1">
+            <handsontable-component ref="handsontable"></handsontable-component>
+        </div>
+        <own-dialog :width="'60%'" :dialogVisible="isDialogShow" @cancel="close">
+            <cut-string ref="cutString"></cut-string>
+            <el-button @click="getCutString">此条无法识别</el-button>
+            <el-button @click="getCutString">继续发现关键字</el-button>
+        </own-dialog>
     </div>
-    <div id="handsontableSteps1">
-      <handsontable-component ref="handsontable"></handsontable-component>
-    </div>
-    <own-dialog :width="'60%'" :dialogVisible="isDialogShow" @cancel="close">
-      <cut-string ref="cutString"></cut-string>
-      <el-button @click="getCutString">此条无法识别</el-button>
-      <el-button @click="getCutString">继续发现关键字</el-button>
-    </own-dialog>
-  </div>
 </template>
 <script>
-import handsontableComponent from "components/common/handsontable"
-import headerArr from "utils/point_edit/steps2.js"
-import { changeHeader, showTypes } from "utils/handsontable/delType"
-import ownDialog from "components/el_pack/dialog"
-import cutString from "components/config_point/cut_string"
-
-export default {
-  data() {
-    return {
-      checked: false,
-      settings: {},
-      isDialogShow: false,
-      msg: ""
-    }
-  },
-  created() { },
-  mounted() {
-    this.getData()
-  },
-  methods: {
-    /**
-     *  @param num 代表着1类型2参数
-     * 
-     */
-    discern(num) {
-      if (num == 1) {
-
-      } else if (num == 2) {
-
-      }
-      this.isDialogShow = true
-    },
-
-    getCutString() {
-      console.log(this.$refs.cutString.getData())
-    },
-
-    close() {
-      this.isDialogShow = false
-    },
-
-    getData() {
-      let width = (document.getElementById("app").clientWidth - 50) / headerArr.length
-      let settings = {
-        data: [{}],
-        colHeaders: changeHeader(headerArr),
-        columns: showTypes(headerArr),
-        colWidths: width,
-        rowHeights: 30
-      }
-      this.$refs.handsontable.init(settings)
+    import handsontableComponent from "components/common/handsontable"
+    import headerArr from "utils/point_edit/steps2.js"
+    import {
+        changeHeader,
+        showTypes
+    } from "utils/handsontable/delType"
+    import ownDialog from "components/el_pack/dialog"
+    import cutString from "components/config_point/cut_string"
+    export default {
+        data() {
+            return {
+                checked: false,
+                settings: {},
+                isDialogShow: false,
+                msg: ""
+            }
+        },
+        created() {},
+        mounted() {
+            this.getData()
+        },
+        methods: {
+            /**
+             *  @param num 代表着1类型2参数
+             * 
+             */
+            discern(num) {
+                if (num == 1) {
+                } else if (num == 2) {
+                }
+                this.isDialogShow = true
+            },
+            getCutString() {
+                console.log(this.$refs.cutString.getData())
+            },
+            close() {
+                this.isDialogShow = false
+            },
+            getData() {
+                let width = (document.getElementById("app").clientWidth - 50) / headerArr.length
+                let settings = {
+                    data: [{}],
+                    colHeaders: changeHeader(headerArr),
+                    columns: showTypes(headerArr),
+                    colWidths: width,
+                    rowHeights: 30
+                }
+                this.$refs.handsontable.init(settings)
+            }
+        },
+        components: {
+            handsontableComponent,
+            ownDialog,
+            cutString
+        }
     }
-  },
-  components: {
-    handsontableComponent,
-    ownDialog,
-    cutString
-  }
-}
 </script>
 <style lang="scss" scoped>
-#handsonStep2 {
-  height: 100%;
-  .btns-view {
-    height: 50px;
-    vertical-align: middle;
-  }
-  #handsontableSteps1 {
-    height: calc(100% - 50px);
-    overflow: hidden;
-    position: relative;
-  }
-}
+    #handsonStep2 {
+        height: 100%;
+        .btns-view {
+            height: 50px;
+            vertical-align: middle;
+        }
+        #handsontableSteps1 {
+            height: calc(100% - 50px);
+            overflow: hidden;
+            position: relative;
+        }
+    }
 </style>

+ 74 - 73
src/views/config_point/steps/step3.vue

@@ -1,81 +1,82 @@
 <template>
-  <div id="handsonStep2">
-    <div class="btns-view">
-      <el-button @click="dialogShow(1)">根据关键内容批量标准化设备标识</el-button>
-      <el-button @click="dialogShow(2)">根据关键内容批量对应数据字典</el-button>
-      <el-checkbox v-model="checked">只显示未标准化得的原始点位</el-checkbox>
+    <div id="handsonStep2">
+        <div class="btns-view">
+            <el-button @click="dialogShow(1)">根据关键内容批量标准化设备标识</el-button>
+            <el-button @click="dialogShow(2)">根据关键内容批量对应数据字典</el-button>
+            <el-checkbox v-model="checked">只显示未标准化得的原始点位</el-checkbox>
+        </div>
+        <div id="handsontableSteps1">
+            <handsontable-component ref="handsontable"></handsontable-component>
+        </div>
+        <own-dialog :width="'60%'" :dialogVisible="isDialogShow" @cancel="close">
+            <dialog-main></dialog-main>
+        </own-dialog>
     </div>
-    <div id="handsontableSteps1">
-      <handsontable-component ref="handsontable"></handsontable-component>
-    </div>
-    <own-dialog :width="'60%'" :dialogVisible="isDialogShow" @cancel="close">
-      <dialog-main></dialog-main>
-    </own-dialog>
-  </div>
 </template>
 <script>
-import handsontableComponent from "components/common/handsontable"
-import headerArr from "utils/point_edit/steps3.js"
-import { changeHeader, showTypes } from "utils/handsontable/delType"
-import ownDialog from "components/el_pack/dialog"
-import dialogMain from "components/config_point/dialog_main"
-export default {
-  data() {
-    return {
-      checked: false,
-      settings: {},
-      isDialogShow: false,
-    }
-  },
-  created() { },
-  mounted() {
-    this.getData()
-  },
-  methods: {
-    //页面关闭
-    close() {
-      this.isDialogShow = false
-    },
-    //页面显示num1为标准化设备标识,2为对应数据字典
-    dialogShow(num) {
-      if (num == 1) {
-
-      } else if (num == 2) {
-
-      }
-      this.isDialogShow = true
-    },
-    //初始化表格实例
-    getData() {
-      let width = (document.getElementById("app").clientWidth - 50) / headerArr.length
-      let settings = {
-        data: [{}],
-        colHeaders: changeHeader(headerArr),
-        columns: showTypes(headerArr),
-        colWidths: width,
-        rowHeights: 30
-      }
-      this.$refs.handsontable.init(settings)
+    import handsontableComponent from "components/common/handsontable"
+    import headerArr from "utils/point_edit/steps3.js"
+    import {
+        changeHeader,
+        showTypes
+    } from "utils/handsontable/delType"
+    import ownDialog from "components/el_pack/dialog"
+    import dialogMain from "components/config_point/dialog_main"
+    export default {
+        data() {
+            return {
+                checked: false,
+                settings: {},
+                isDialogShow: false,
+            }
+        },
+        created() {},
+        mounted() {
+            this.getData()
+        },
+        methods: {
+            //页面关闭
+            close() {
+                this.isDialogShow = false
+            },
+            //页面显示num1为标准化设备标识,2为对应数据字典
+            dialogShow(num) {
+                if (num == 1) {
+                } else if (num == 2) {
+                }
+                this.isDialogShow = true
+            },
+            //初始化表格实例
+            getData() {
+                let width = (document.getElementById("app").clientWidth - 50) / headerArr.length
+                let settings = {
+                    data: [{}],
+                    colHeaders: changeHeader(headerArr),
+                    columns: showTypes(headerArr),
+                    colWidths: width,
+                    rowHeights: 30
+                }
+                this.$refs.handsontable.init(settings)
+            }
+        },
+        components: {
+            handsontableComponent,
+            ownDialog,
+            dialogMain
+        }
     }
-  },
-  components: {
-    handsontableComponent,
-    ownDialog,
-    dialogMain
-  }
-}
 </script>
 <style lang="scss" scoped>
-#handsonStep2 {
-  height: 100%;
-  .btns-view {
-    height: 50px;
-    vertical-align: middle;
-  }
-  #handsontableSteps1 {
-    height: calc(100% - 50px);
-    overflow: hidden;
-    position: relative;
-  }
-}
+    #handsonStep2 {
+        height: 100%;
+        .btns-view {
+            height: 50px;
+            vertical-align: middle;
+        }
+        #handsontableSteps1 {
+            height: calc(100% - 50px);
+            overflow: hidden;
+            position: relative;
+        }
+    }
 </style>

+ 127 - 98
src/views/config_point/steps/step4.vue

@@ -1,110 +1,139 @@
 <template>
-  <div class="h100 steps4">
-    <div class="btns-view">
-      <el-button>根据关键内容批量标准化设备标识</el-button>
-      <el-button>根据关键内容批量对应数据字典</el-button>
+    <div class="h100 steps4">
+        <div class="btns-view">
+            <el-button>根据关键内容批量标准化设备标识</el-button>
+            <el-button>根据关键内容批量对应数据字典</el-button>
+        </div>
+        <el-tabs type="border-card" @tab-click="clickTabs" class="tabs-h" tab-position="bottom">
+            <el-tab-pane>
+                <span slot="label">
+              <i class="el-icon-date"></i> 我的行程
+            </span>
+                <js-mind-component ref="jsmind1"></js-mind-component>
+            </el-tab-pane>
+            <el-tab-pane class="h100" label="消息中心">
+                <js-mind-component ref="jsmind2"></js-mind-component>
+            </el-tab-pane>
+        </el-tabs>
     </div>
-    <el-tabs type="border-card" @tab-click="clickTabs" class="tabs-h" tab-position="bottom">
-      <el-tab-pane>
-        <span slot="label">
-          <i class="el-icon-date"></i> 我的行程
-        </span>
-        <js-mind-component ref="jsmind1"></js-mind-component>
-      </el-tab-pane>
-      <el-tab-pane class="h100" label="消息中心">
-        <js-mind-component ref="jsmind2"></js-mind-component>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
 </template>
 <script>
-import jsMindComponent from "components/common/jsmind"
-export default {
-  name: "steps4",
-  data() { return {} },
-  created() { },
-  mounted() {
-  },
-  methods: {
-    clickTabs(val) {
-      console.log(this.$refs, val)
-      var mind = {
-        /* 元数据,定义思维导图的名称、作者、版本等信息 */
-        meta: {
-          name: "jsMind-demo-tree",
-          author: "hizzgdev@163.com",
-          version: "0.2"
+    import jsMindComponent from "components/common/jsmind"
+    export default {
+        name: "steps4",
+        data() {
+            return {}
         },
-        /* 数据格式声明 */
-        format: "node_tree",
-        /* 数据内容 */
-        data: {
-          id: "root",
-          topic: "jsMind",
-          children: [
-            {
-              id: "easy",
-              topic: "Easy",
-              direction: "left",
-              expanded: false,
-              children: [
-                { id: "easy1", topic: "Easy to show" },
-                { id: "easy2", topic: "Easy to edit" },
-                { id: "easy3", topic: "Easy to store" },
-                { id: "easy4", topic: "Easy to embed" }
-              ]
-            },
-            {
-              id: "open",
-              topic: "Open Source",
-              direction: "right",
-              expanded: true,
-              children: [
-                { id: "open1", topic: "on GitHub" },
-                { id: "open2", topic: "BSD License" }
-              ]
-            },
-            {
-              id: "powerful",
-              topic: "Powerful",
-              direction: "right",
-              children: [
-                { id: "powerful1", topic: "Base on Javascript" },
-                { id: "powerful2", topic: "Base on HTML5" },
-                { id: "powerful3", topic: "Depends on you" }
-              ]
-            },
-            {
-              id: "other",
-              topic: "test node",
-              direction: "left",
-              children: [
-                { id: "other1", topic: "I'm from local variable" },
-                { id: "other2", topic: "I can do everything" }
-              ]
+        created() {},
+        mounted() {},
+        methods: {
+            clickTabs(val) {
+                console.log(this.$refs, val)
+                var mind = {
+                    /* 元数据,定义思维导图的名称、作者、版本等信息 */
+                    meta: {
+                        name: "jsMind-demo-tree",
+                        author: "hizzgdev@163.com",
+                        version: "0.2"
+                    },
+                    /* 数据格式声明 */
+                    format: "node_tree",
+                    /* 数据内容 */
+                    data: {
+                        id: "root",
+                        topic: "jsMind",
+                        children: [{
+                                id: "easy",
+                                topic: "Easy",
+                                direction: "left",
+                                expanded: false,
+                                children: [{
+                                        id: "easy1",
+                                        topic: "Easy to show"
+                                    },
+                                    {
+                                        id: "easy2",
+                                        topic: "Easy to edit"
+                                    },
+                                    {
+                                        id: "easy3",
+                                        topic: "Easy to store"
+                                    },
+                                    {
+                                        id: "easy4",
+                                        topic: "Easy to embed"
+                                    }
+                                ]
+                            },
+                            {
+                                id: "open",
+                                topic: "Open Source",
+                                direction: "right",
+                                expanded: true,
+                                children: [{
+                                        id: "open1",
+                                        topic: "on GitHub"
+                                    },
+                                    {
+                                        id: "open2",
+                                        topic: "BSD License"
+                                    }
+                                ]
+                            },
+                            {
+                                id: "powerful",
+                                topic: "Powerful",
+                                direction: "right",
+                                children: [{
+                                        id: "powerful1",
+                                        topic: "Base on Javascript"
+                                    },
+                                    {
+                                        id: "powerful2",
+                                        topic: "Base on HTML5"
+                                    },
+                                    {
+                                        id: "powerful3",
+                                        topic: "Depends on you"
+                                    }
+                                ]
+                            },
+                            {
+                                id: "other",
+                                topic: "test node",
+                                direction: "left",
+                                children: [{
+                                        id: "other1",
+                                        topic: "I'm from local variable"
+                                    },
+                                    {
+                                        id: "other2",
+                                        topic: "I can do everything"
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                };
+                let jsMind1 = this.$refs.jsmind1.initData({}, mind)
             }
-          ]
+        },
+        components: {
+            jsMindComponent
         }
-      };
-      let jsMind1 = this.$refs.jsmind1.initData({}, mind)
     }
-  },
-  components: {
-    jsMindComponent
-  }
-}
 </script>
 <style lang="scss">
-.tabs-h {
-  height: calc(100% - 50px);
-  .el-tabs__content {
-    height: calc(100% - 70px);
-    > div {
-      height: 100%;
+    .tabs-h {
+        height: calc(100% - 50px);
+        .el-tabs__content {
+            height: calc(100% - 70px);
+            >div {
+                height: 100%;
+            }
+        }
+    }
+    .saga-mind-view {
+        //   height: 450px;
     }
-  }
-}
-.saga-mind-view {
-  //   height: 450px;
-}
 </style>

+ 12 - 8
src/views/layout/layout.vue

@@ -1,14 +1,18 @@
 <template>
-  <router-view></router-view>
+    <router-view>
+    </router-view>
 </template>
 <script>
-export default {
-  name: "Layout",
-  data() { return {} },
-  created() { },
-  mounted() { },
-  methods: {}
-}
+    export default {
+        name: "Layout",
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {},
+        methods: {}
+    }
 </script>
 <style>
+
 </style>

+ 20 - 16
src/views/login/index.vue

@@ -1,23 +1,27 @@
 <template>
-  <div>
-    <el-button @click="createPost">测试请求</el-button>
-  </div>
+    <div>
+        <el-button @click="createPost">测试请求</el-button>
+    </div>
 </template>
 <script>
-
-import { getTest } from 'fetch'
-export default {
-  data() { return {} },
-  created() { },
-  mounted() { },
-  methods: {
-    createPost() {
-      getTest(_ => {
-        console.log(_)
-      })
+    import {
+        getTest
+    } from 'fetch'
+    export default {
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {},
+        methods: {
+            createPost() {
+                getTest(_ => {
+                    console.log(_)
+                })
+            }
+        }
     }
-  }
-}
 </script>
 <style lang="scss">
+
 </style>