lipengtao 6 years ago
parent
commit
bf62f82eb9

+ 2 - 2
src/views/baseInfoManage/boxesConfig/index.vue

@ -1,9 +1,9 @@
1 1
<template>
2 2
  <div class="app-container">
3 3
    <div class="filter-container" style="margin-bottom:20px">
4
      <el-input style="width: 200px;" class="filter-item" placeholder="所属服务器编号" v-model="listQuery.scode">
4
      <el-input style="width: 200px;" class="filter-item" placeholder="采集盒编号" v-model="listQuery.code">
5 5
      </el-input>
6
       <el-input style="width: 200px;" class="filter-item" placeholder="采集盒编号" v-model="listQuery.code">
6
      <el-input style="width: 200px;" class="filter-item" placeholder="所属服务器编号" v-model="listQuery.scode">
7 7
      </el-input>
8 8
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleFilter" type="primary" icon="el-icon-search">查找</el-button>
9 9
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">添加采集盒</el-button>

+ 2 - 2
src/views/baseInfoManage/sensorsConfig/index.vue

@ -1,9 +1,9 @@
1 1
<template>
2 2
  <div class="app-container">
3 3
    <div class="filter-container" style="margin-bottom:20px">
4
      <el-input style="width: 200px;" class="filter-item" placeholder="采集盒编号" v-model="listQuery.cdCode">
4
      <el-input style="width: 200px;" class="filter-item" placeholder="传感器编号" v-model="listQuery.code">
5 5
      </el-input>
6
       <el-input style="width: 200px;" class="filter-item" placeholder="传感器编号" v-model="listQuery.code">
6
      <el-input style="width: 200px;" class="filter-item" placeholder="采集盒编号" v-model="listQuery.cdCode">
7 7
      </el-input>
8 8
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleFilter" type="primary" icon="el-icon-search">查找</el-button>
9 9
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">添加传感器</el-button>

+ 4 - 4
src/views/login/index.vue

@ -9,14 +9,14 @@
9 9
        <span class="svg-container svg-container_login">
10 10
          <svg-icon icon-class="user" />
11 11
        </span>
12
        <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="请输入手机号" />
12
        <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="请输入您的手机号" />
13 13
      </el-form-item>
14 14
      <el-form-item prop="password">
15 15
        <span class="svg-container">
16 16
          <svg-icon icon-class="password"></svg-icon>
17 17
        </span>
18 18
        <el-input name="password" :type="pwdType" v-model="loginForm.password" autoComplete="on"
19
          placeholder="请输入登录密码"></el-input>
19
          placeholder="请输入您的登录密码"></el-input>
20 20
          <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span>
21 21
      </el-form-item>
22 22
      <el-form-item prop="imgVerifyCode">
@ -51,7 +51,7 @@ export default {
51 51
    var validPhone = (rule, value, callback) => {
52 52
      const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
53 53
      if (!value) {
54
        callback(new Error('请输入的手机号码'))
54
        callback(new Error('请输入的手机号码'))
55 55
      } else if (!reg.test(value)) {
56 56
        callback(new Error('请输入正确的手机号码'))
57 57
      } else {
@ -68,7 +68,7 @@ export default {
68 68
      loginRules: {
69 69
        username: [{ required: true, trigger: 'blur', validator: validPhone }],
70 70
        password: [
71
          { required: true, message: '请输入登录密码', trigger: 'blur' },
71
          { required: true, message: '请输入您的登录密码', trigger: 'blur' },
72 72
          { min: 6, max: 24, message: '密码由6-24个字符组成,区分大小写', trigger: 'blur' }
73 73
        ],
74 74
        imgVerifyCode: [{ required: true, message: '请输入图形验证码', trigger: 'blur' }]

+ 0 - 1
src/views/peoplesManage/infoManage/editUserPermissions.vue

@ -71,7 +71,6 @@
71 71
              key: 'id',
72 72
              label: 'value'
73 73
            }"
74
            :left-default-checked="bridgeListsChecked"
75 74
            :data="bridgeLists">
76 75
          </el-transfer>
77 76
        </el-col>