lipengtao 6 years ago
parent
commit
ef9310b4f3

+ 2 - 2
src/api/bridge.js

5
  return request({
5
  return request({
6
    url: '/ajax/bridge',
6
    url: '/ajax/bridge',
7
    method: 'post',
7
    method: 'post',
8
    params
8
    data: params
9
  })
9
  })
10
}
10
}
11
11
14
  return request({
14
  return request({
15
    url: '/ajax/bridge/update',
15
    url: '/ajax/bridge/update',
16
    method: 'post',
16
    method: 'post',
17
    params
17
    data: params
18
  })
18
  })
19
}
19
}
20
20

+ 2 - 2
src/api/collectionbox.js

5
  return request({
5
  return request({
6
    url: '/ajax/device',
6
    url: '/ajax/device',
7
    method: 'post',
7
    method: 'post',
8
    params
8
    data: params
9
  })
9
  })
10
}
10
}
11
11
14
  return request({
14
  return request({
15
    url: '/ajax/device/update',
15
    url: '/ajax/device/update',
16
    method: 'post',
16
    method: 'post',
17
    params
17
    data: params
18
  })
18
  })
19
}
19
}
20
20

+ 2 - 2
src/api/sensor.js

5
  return request({
5
  return request({
6
    url: '/ajax/transducer',
6
    url: '/ajax/transducer',
7
    method: 'post',
7
    method: 'post',
8
    params
8
    data: params
9
  })
9
  })
10
}
10
}
11
11
14
  return request({
14
  return request({
15
    url: '/ajax/transducer/update',
15
    url: '/ajax/transducer/update',
16
    method: 'post',
16
    method: 'post',
17
    params
17
    data: params
18
  })
18
  })
19
}
19
}
20
20

+ 2 - 2
src/api/server.js

5
  return request({
5
  return request({
6
    url: '/ajax/server',
6
    url: '/ajax/server',
7
    method: 'post',
7
    method: 'post',
8
    params
8
    data: params
9
  })
9
  })
10
}
10
}
11
11
14
  return request({
14
  return request({
15
    url: '/ajax/server/update',
15
    url: '/ajax/server/update',
16
    method: 'post',
16
    method: 'post',
17
    params
17
    data: params
18
  })
18
  })
19
}
19
}
20
20

+ 3 - 3
src/api/userManagemen.js

41
  return request({
41
  return request({
42
    url: '/ajax/sys/insert',
42
    url: '/ajax/sys/insert',
43
    method: 'post',
43
    method: 'post',
44
    params
44
    data: params
45
  })
45
  })
46
}
46
}
47
47
50
  return request({
50
  return request({
51
    url: '/ajax/sys/update',
51
    url: '/ajax/sys/update',
52
    method: 'post',
52
    method: 'post',
53
    params
53
    data: params
54
  })
54
  })
55
}
55
}
56
56
77
  return request({
77
  return request({
78
    url: '/ajax/sys/userBridge/refresh',
78
    url: '/ajax/sys/userBridge/refresh',
79
    method: 'post',
79
    method: 'post',
80
    params
80
    data: params
81
  })
81
  })
82
}
82
}

+ 1 - 0
src/icons/svg/password-view.svg

1
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1536041882597" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1501" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M968.548352 614.418432c0-124.667904-203.543552-233.57952-458.737664-233.57952-255.22688 0-458.737664 108.9024-458.737664 233.57952s203.50976 233.578496 458.737664 233.578496c255.194112 0 458.737664-108.910592 458.737664-233.578496z m51.073024 0c0 161.544192-230.147072 284.690432-509.810688 284.690432C230.11328 899.108864 0 775.97184 0 614.418432 0 452.864 230.11328 329.728 509.810688 329.728c279.66464 0 509.810688 123.14624 509.810688 284.690432z" p-id="1502"></path><path d="M460.292096 582.100992c3.84-21.878784 16.09728-40.85248 33.871872-53.301248 11.55584-8.091648 14.367744-24.026112 6.28224-35.590144-8.086528-11.564032-24.008704-14.377984-35.56352-6.286336-28.786688 20.159488-48.685056 50.962432-54.893568 86.335488-2.440192 13.9008 6.843392 27.150336 20.733952 29.591552 13.89056 2.44224 27.128832-6.847488 29.569024-20.749312z" p-id="1503"></path><path d="M682.94656 594.01216c0-89.438208-72.479744-161.973248-161.850368-161.973248-89.358336 0-161.799168 72.522752-161.799168 161.972224s72.440832 161.972224 161.799168 161.972224c89.370624 0 161.850368-72.534016 161.850368-161.972224z m51.073024 0c0 117.664768-95.345664 213.082112-212.923392 213.082112C403.526656 807.094272 308.224 711.684096 308.224 594.01216 308.224 476.338176 403.526656 380.928 521.096192 380.928c117.577728 0 212.923392 95.417344 212.923392 213.08416zM729.363456 235.583488c-6.665216 12.438528-22.144 17.115136-34.573312 10.4448-12.429312-6.669312-17.101824-22.15936-10.437632-34.598912l27.222016-50.804736c6.665216-12.438528 22.144-17.115136 34.573312-10.4448 12.429312 6.669312 17.101824 22.15936 10.436608 34.598912l-27.220992 50.804736z m190.130176 78.82752c-8.54528 11.22816-24.567808 13.398016-35.7888 4.845568-11.218944-8.551424-13.386752-24.58624-4.841472-35.8144l34.270208-45.029376c8.54528-11.22816 24.567808-13.398016 35.787776-4.845568 11.218944 8.551424 13.387776 24.58624 4.842496 35.8144l-34.270208 45.029376zM378.037248 211.429376c6.664192 12.438528 1.99168 27.9296-10.437632 34.598912-12.429312 6.670336-27.908096 1.993728-34.573312-10.4448l-27.222016-50.804736c-6.664192-12.438528-1.99168-27.9296 10.437632-34.598912 12.429312-6.670336 27.908096-1.993728 34.573312 10.4448l27.222016 50.804736zM183.54688 283.4432c8.54528 11.22816 6.377472 27.262976-4.842496 35.8144-11.219968 8.552448-27.242496 6.382592-35.787776-4.845568L108.6464 269.381632c-8.54528-11.22816-6.377472-27.262976 4.84352-35.8144 11.218944-8.552448 27.241472-6.382592 35.786752 4.845568l34.270208 45.029376z m322.10944-132.958208c0-14.113792 11.43296-25.555968 25.535488-25.555968 14.103552 0 25.536512 11.442176 25.536512 25.555968v56.835072c0 14.114816-11.43296 25.555968-25.536512 25.555968-14.102528 0-25.536512-11.441152-25.536512-25.555968v-56.835072z" p-id="1504"></path></svg>

+ 1 - 1
src/utils/request.js

16
  // 配置config
16
  // 配置config
17
  config.headers.Accept = 'application/json'
17
  config.headers.Accept = 'application/json'
18
  if (config.method === 'post') {
18
  if (config.method === 'post') {
19
    config.data = qs.stringify(config.data)
19
    config.data = qs.stringify(config.data, { arrayFormat: 'repeat' })
20
    // 处理后后台无需添加RequestBody
20
    // 处理后后台无需添加RequestBody
21
    config.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
21
    config.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
22
  }
22
  }

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

42
              <el-autocomplete
42
              <el-autocomplete
43
                v-model="ruleForm2.server"
43
                v-model="ruleForm2.server"
44
                :fetch-suggestions="querySearchAsync"
44
                :fetch-suggestions="querySearchAsync"
45
                placeholder="请选择服务器编号"
45
                placeholder="请选择所属服务器编号"
46
                @select="handleSelect">
46
                @select="handleSelect">
47
              </el-autocomplete>
47
              </el-autocomplete>
48
            </el-form-item>
48
            </el-form-item>
292
      this.getList()
292
      this.getList()
293
    },
293
    },
294
    handleModifyStatus(row, status) {
294
    handleModifyStatus(row, status) {
295
      this.$confirm('确要删除:采集盒' + row.code + '吗?', '提示', {
295
      this.$confirm('确要删除:采集盒' + row.code + '吗?', '提示', {
296
        confirmButtonText: '确定',
296
        confirmButtonText: '确定',
297
        cancelButtonText: '取消',
297
        cancelButtonText: '取消',
298
        type: 'warning',
298
        type: 'warning',

+ 5 - 6
src/views/baseInfoManage/bridgesInfo/index.vue

160
        callback(new Error('请输入桥梁编号'))
160
        callback(new Error('请输入桥梁编号'))
161
      } else {
161
      } else {
162
        if (this.edit) {
162
        if (this.edit) {
163
          checkDeviceCode({ code: value, id: this.edit }).then(response => {
163
          checkDeviceCode({ code: value, id: this.edit, active: 1 }).then(response => {
164
            if (response.data) {
164
            if (response.data) {
165
              callback(new Error('桥梁编号已存在,请重新输入'))
165
              callback(new Error('桥梁编号已存在,请重新输入'))
166
            } else {
166
            } else {
168
            }
168
            }
169
          })
169
          })
170
        } else {
170
        } else {
171
          checkDeviceCode({ code: value }).then(response => {
171
          checkDeviceCode({ code: value, active: 1 }).then(response => {
172
            if (response.data) {
172
            if (response.data) {
173
              callback(new Error('桥梁编号已存在,请重新输入'))
173
              callback(new Error('桥梁编号已存在,请重新输入'))
174
            } else {
174
            } else {
255
        location: [
255
        location: [
256
          { required: true, message: '请输入地理位置信息', trigger: 'blur' }
256
          { required: true, message: '请输入地理位置信息', trigger: 'blur' }
257
        ],
257
        ],
258
        serviceDay: [
259
          { required: true, message: '请输入桥梁开通日期', trigger: 'blur' }
260
        ],
261
        org: [
258
        org: [
262
          { required: true, message: '请输入维护机构名称', trigger: 'blur' }
259
          { required: true, message: '请输入维护机构名称', trigger: 'blur' }
263
        ],
260
        ],
322
                  that.pop('已成功添加桥梁')
319
                  that.pop('已成功添加桥梁')
323
                }, 1000)
320
                }, 1000)
324
                this.resetForm('ruleForm2')
321
                this.resetForm('ruleForm2')
322
                this.ruleForm2.img = ''
325
                this.dialogTableVisible = false
323
                this.dialogTableVisible = false
326
              }
324
              }
327
            }).catch(error => {
325
            }).catch(error => {
395
      this.getList()
393
      this.getList()
396
    },
394
    },
397
    handleModifyStatus(row, status) {
395
    handleModifyStatus(row, status) {
398
      this.$confirm('确要删除:桥梁' + row.code + '吗?', '提示', {
396
      this.$confirm('确要删除:桥梁' + row.code + '吗?', '提示', {
399
        confirmButtonText: '确定',
397
        confirmButtonText: '确定',
400
        cancelButtonText: '取消',
398
        cancelButtonText: '取消',
401
        type: 'warning',
399
        type: 'warning',
443
    },
441
    },
444
    handleCreate() {
442
    handleCreate() {
445
      this.dialogTableVisible = true
443
      this.dialogTableVisible = true
444
      this.ruleForm2.img = ''
446
    },
445
    },
447
    handleUpdate(row) {
446
    handleUpdate(row) {
448
      const that = this
447
      const that = this

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

3
    <div class="filter-container" style="margin-bottom:20px">
3
    <div class="filter-container" style="margin-bottom:20px">
4
      <el-input style="width: 200px;" class="filter-item" placeholder="传感器编号" v-model="listQuery.code">
4
      <el-input style="width: 200px;" class="filter-item" placeholder="传感器编号" v-model="listQuery.code">
5
      </el-input>
5
      </el-input>
6
      <el-input style="width: 200px;" class="filter-item" placeholder="采集盒编号" v-model="listQuery.cdCode">
6
      <el-input style="width: 200px;" class="filter-item" placeholder="所属采集盒编号" v-model="listQuery.cdCode">
7
      </el-input>
7
      </el-input>
8
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleFilter" type="primary" icon="el-icon-search">查找</el-button>
8
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleFilter" type="primary" icon="el-icon-search">查找</el-button>
9
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">添加传感器</el-button>
9
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">添加传感器</el-button>
44
            </el-form-item>
44
            </el-form-item>
45
          </el-col>
45
          </el-col>
46
          <el-col :span="12">
46
          <el-col :span="12">
47
            <el-form-item label="传感器所属位置" prop="locType">
48
              <el-select v-model="ruleForm2.locType" placeholder="请选择主缆传感器位置">
47
            <el-form-item label="传感器所属主缆" prop="cableType">
48
              <el-select v-model="ruleForm2.cableType" placeholder="请选择主缆">
49
                <el-option
49
                <el-option
50
                  v-for="item in options1"
50
                  v-for="item in options"
51
                  :key="item.value"
51
                  :key="item.value"
52
                  :label="item.label"
52
                  :label="item.label"
53
                  :value="item.value">
53
                  :value="item.value">
56
            </el-form-item>
56
            </el-form-item>
57
          </el-col>
57
          </el-col>
58
          <el-col :span="12">
58
          <el-col :span="12">
59
            <el-form-item label="传感器所属主缆" prop="cableType">
60
              <el-select v-model="ruleForm2.cableType" placeholder="请选择主缆">
59
            <el-form-item label="传感器所属位置" prop="locType">
60
              <el-select v-model="ruleForm2.locType" placeholder="请选择传感器所属位置">
61
                <el-option
61
                <el-option
62
                  v-for="item in options"
62
                  v-for="item in options1"
63
                  :key="item.value"
63
                  :key="item.value"
64
                  :label="item.label"
64
                  :label="item.label"
65
                  :value="item.value">
65
                  :value="item.value">
340
      this.getList()
340
      this.getList()
341
    },
341
    },
342
    handleModifyStatus(row, status) {
342
    handleModifyStatus(row, status) {
343
      this.$confirm('确要删除:传感器' + row.code + '吗?', '提示', {
343
      this.$confirm('确要删除:传感器' + row.code + '吗?', '提示', {
344
        confirmButtonText: '确定',
344
        confirmButtonText: '确定',
345
        cancelButtonText: '取消',
345
        cancelButtonText: '取消',
346
        type: 'warning',
346
        type: 'warning',

+ 1 - 1
src/views/baseInfoManage/serversConfig/index.vue

292
      this.getList()
292
      this.getList()
293
    },
293
    },
294
    handleModifyStatus(row, status) {
294
    handleModifyStatus(row, status) {
295
      this.$confirm('确要删除:服务器' + row.code + '吗?', '提示', {
295
      this.$confirm('确要删除:服务器' + row.code + '吗?', '提示', {
296
        confirmButtonText: '确定',
296
        confirmButtonText: '确定',
297
        cancelButtonText: '取消',
297
        cancelButtonText: '取消',
298
        type: 'warning',
298
        type: 'warning',

+ 1 - 1
src/views/findPwd/index.vue

63
      var validPhone = (rule, value, callback) => {
63
      var validPhone = (rule, value, callback) => {
64
        const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
64
        const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
65
        if (!value) {
65
        if (!value) {
66
          callback(new Error('请输入的手机号码'))
66
          callback(new Error('请输入的手机号码'))
67
        } else if (!reg.test(value)) {
67
        } else if (!reg.test(value)) {
68
          callback(new Error('请输入正确的手机号码'))
68
          callback(new Error('请输入正确的手机号码'))
69
        } else {
69
        } else {

+ 5 - 3
src/views/login/index.vue

9
        <span class="svg-container svg-container_login">
9
        <span class="svg-container svg-container_login">
10
          <svg-icon icon-class="user" />
10
          <svg-icon icon-class="user" />
11
        </span>
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
      </el-form-item>
13
      </el-form-item>
14
      <el-form-item prop="password">
14
      <el-form-item prop="password">
15
        <span class="svg-container">
15
        <span class="svg-container">
16
          <svg-icon icon-class="password"></svg-icon>
16
          <svg-icon icon-class="password"/>
17
        </span>
17
        </span>
18
        <el-input name="password" :type="pwdType" v-model="loginForm.password" autoComplete="on"
18
        <el-input name="password" :type="pwdType" v-model="loginForm.password" autoComplete="on"
19
          placeholder="请输入您的登录密码"></el-input>
19
          placeholder="请输入您的登录密码"></el-input>
20
          <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span>
20
          <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" v-show="!falg"/><svg-icon icon-class="password-view" v-show="falg"/></span>
21
      </el-form-item>
21
      </el-form-item>
22
      <el-form-item prop="imgVerifyCode">
22
      <el-form-item prop="imgVerifyCode">
23
        <span class="svg-container">
23
        <span class="svg-container">
59
      }
59
      }
60
    }
60
    }
61
    return {
61
    return {
62
      falg: false,
62
      imgVcUrl: '',
63
      imgVcUrl: '',
63
      loginForm: {
64
      loginForm: {
64
        username: '',
65
        username: '',
82
  },
83
  },
83
  methods: {
84
  methods: {
84
    showPwd() {
85
    showPwd() {
86
      this.falg = !this.falg
85
      if (this.pwdType === 'password') {
87
      if (this.pwdType === 'password') {
86
        this.pwdType = ''
88
        this.pwdType = ''
87
      } else {
89
      } else {

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

204
  .check-transfer.el-transfer{
204
  .check-transfer.el-transfer{
205
    padding-left: 15px;
205
    padding-left: 15px;
206
    margin-bottom: 15px;
206
    margin-bottom: 15px;
207
    display: -webkit-flex;
208
    display: -moz-flex;
209
    display: -ms-flexbox;
210
    display: flex;
211
    justify-content: center
207
  }
212
  }
208
  .check-transfer .el-transfer-panel{
213
  .check-transfer .el-transfer-panel{
209
    width: 240px;
214
    width: 240px;

+ 1 - 1
src/views/peoplesManage/infoManage/index.vue

167
      this.getList()
167
      this.getList()
168
    },
168
    },
169
    handleModifyStatus(row, status) {
169
    handleModifyStatus(row, status) {
170
      this.$confirm('确要停用:用户' + row.name + '吗?', '提示', {
170
      this.$confirm('确要停用:用户' + row.name + '吗?', '提示', {
171
        confirmButtonText: '确定',
171
        confirmButtonText: '确定',
172
        cancelButtonText: '取消',
172
        cancelButtonText: '取消',
173
        type: 'warning',
173
        type: 'warning',