点位维护页面调整

src/pages/sys/points/index.vue

@@ -23,6 +23,9 @@
                         el-button(type='primary' size='mini' icon='el-icon-plus',style='float:right;transform:translateY(6px);margin-right:20px;' v-if="isAuth('sys:points:save')" :disabled="flag" @click='addOrUpdateHandle()') 新增
                     div(slot='content')
                         table-list(:tableColums='tableHeader' :tableData='dataList'  :opNum='2')
+                            template(#type='data')
+                              font(v-if='data.scope.type == 1') 查询点位
+                              font(v-if='data.scope.type == 2') 控制点位
                             template(#functionCodeType='data')
                               font(v-if='data.scope.functionCodeType == 1') 读线圈
                               font(v-if='data.scope.functionCodeType == 2') 读离散量输入
@@ -52,14 +55,21 @@
                                       el-form-item(label="资源点ID:" prop="resourceId" v-if='false')
                                           el-input(v-model='ruleForm.resourceId' placeholder=""  clearable v-if='false')
                                   el-col(:span='24')
+                                      el-form-item(label="网关IP:" prop="addressIp")
+                                          el-input(v-model='ruleForm.addressIp' placeholder="请输入网关IP"  clearable )
+                                  el-col(:span='12')
+                                      el-form-item(label="点位类型:" prop="type")
+                                          el-select.mywidth(v-model="ruleForm.type" placeholder="请选择点位类型" clearable)
+                                            el-option(v-for="(item,index) in typeList" :key="index" :label="item.name" :value="item.id" :code="item.id")
+                                  el-col(:span='12')
                                       el-form-item(label="点位名称:" prop="name")
                                           el-input(v-model='ruleForm.name' placeholder="请输入点位名称"  clearable )
                                   el-col(:span='12')
                                       el-form-item(label="从机ID:" prop="slaveId")
                                           el-input(v-model.number='ruleForm.slaveId' placeholder="请输从入机ID"  clearable )
                                   el-col(:span='12')
-                                      el-form-item(label="地址:" prop="registerAddress")
-                                          el-input(v-model.number='ruleForm.registerAddress' placeholder="请输入地址"  clearable )
+                                      el-form-item(label="位置:" prop="registerAddress")
+                                          el-input(v-model.number='ruleForm.registerAddress' placeholder="请输入位置"  clearable )
                                   el-col(:span='12')
                                       el-form-item(label="功能码:" prop="functionCodeType")
                                           el-select.mywidth(v-model="ruleForm.functionCodeType" placeholder="请选择功能码" clearable)
@@ -83,7 +93,7 @@ import tablePagination from '@/pages/components/tablePagination'
 export default {
   data() {
     let validateNumber = (rule, value, callback) => {
-      if (value <= 0) {
+      if (value < 0) {
         callback(new Error('只能输入正整数'))
       } else if (value > 99999999) {
         callback(new Error('排序值超出范围'))
@@ -101,6 +111,10 @@ export default {
         label: 'name',
         level: 'level'
       },
+      typeList: [
+        { id: 1, name: '查询点位' },
+        { id: 2, name: '控制点位' }
+      ],
       functionCodeTypeList: [
         { id: 1, name: '读线圈' },
         { id: 2, name: '读离散量输入' },
@@ -128,6 +142,10 @@ export default {
       },
       rules: {
         //添加规则
+        addressIp: [
+          { required: true, message: '网关IP不能为空', trigger: 'blur' },
+          { min: 1, max: 30, message: '长度在 1 到 30 个字符', trigger: 'blur' }
+        ],
         name: [
           { required: true, message: '点位名称不能为空', trigger: 'blur' },
           { min: 1, max: 30, message: '长度在 1 到 30 个字符', trigger: 'blur' }
@@ -138,10 +156,17 @@ export default {
           { validator: validateNumber, trigger: ['blur', 'change'] }
         ],
         registerAddress: [
-          { required: true, message: '地址不能为空' },
-          { type: 'number', message: '地址必须为数字' },
+          { required: true, message: '位置不能为空' },
+          { type: 'number', message: '位置必须为数字' },
           { validator: validateNumber, trigger: ['blur', 'change'] }
         ],
+        type: [
+          {
+            required: true,
+            message: '点位类型不能为空',
+            trigger: ['blur', 'change']
+          }
+        ],
         functionCodeType: [
           {
             required: true,
@@ -163,10 +188,12 @@ export default {
       checkList: [], //筛选数据
       tableHeader: [
         { label: '点位名称', prop: 'name' },
+        { label: '点位类型', prop: 'type', slot: true},
+        { label: '网关IP', prop: 'addressIp' },
         { label: '从机ID', prop: 'slaveId' },
         { label: '功能码', prop: 'functionCodeType', slot: true },
         { label: '数据类型', prop: 'dataType', slot: true },
-        { label: '寄存器地址', prop: 'registerAddress' }
+        { label: '位置', prop: 'registerAddress' }
       ],
       tableOption: {
         border: false, //是否边框

src/plugin/axios/index.js

@@ -17,9 +17,9 @@ function errorCreat (msg) {
 
 function requestFit (config) {
   let USERNAME = 'suntray'
-	let PASSWORD = 'suntray'
+  let PASSWORD = 'c3VudHJheQ=='
   config.headers.Authorization = 'Basic ' + btoa(USERNAME + ':' + PASSWORD)
-// 数据处理
+  // 数据处理
   let defaults = {
     't': new Date().getTime()
     // 'access_token': Vue.cookie.get('token')