lipengtao 6 years ago
parent
commit
4e18b747b3

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

39
        </template>
39
        </template>
40
      </el-table-column>
40
      </el-table-column>
41
    </el-table>
41
    </el-table>
42
    <el-dialog title="采集盒配置" ref="ruleForm" :visible.sync="dialogTableVisible" width="680px" @close='closed'>
43
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main" label-width="120px" label-position='right' status-icon>
42
    <el-dialog title="采集盒配置" ref="ruleForm" :visible.sync="dialogTableVisible" width="860px" @close='closed'>
43
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main" label-position='right' status-icon>
44
        <el-row>
44
        <el-row>
45
          <el-col :span="12">
45
          <el-col :span="12">
46
            <el-form-item label="采集盒编号"  prop="code">
46
            <el-form-item label="采集盒编号"  prop="code">
380
  .el-btn-col{
380
  .el-btn-col{
381
    margin-top: 45px
381
    margin-top: 45px
382
  }
382
  }
383
  .el-form-item{
384
    margin: 0px 10px
385
  }
386
  .el-select{
387
    width: 100%
388
  }
389
  .el-col{
390
    margin-bottom: 15px
391
  }
392
  .el-form-item__label{
393
    padding: 0px
394
  }
383
</style>
395
</style>

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

44
        </template>
44
        </template>
45
      </el-table-column>
45
      </el-table-column>
46
    </el-table>
46
    </el-table>
47
    <el-dialog title="桥梁信息" ref="ruleForm" :visible.sync="dialogTableVisible" width="80%" @close='closed'>
47
    <el-dialog title="桥梁信息" ref="ruleForm" :visible.sync="dialogTableVisible" width="1100px" @close='closed'>
48
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main" label-width="120px" label-position='right' status-icon>
48
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main" label-width="120px" label-position='right' status-icon>
49
        <el-row :gutter="10">
49
        <el-row :gutter="10">
50
          <el-col :xs="24" :sm="18" :lg="16">
50
          <el-col :xs="24" :sm="18" :lg="16">

+ 18 - 5
src/views/baseInfoManage/sensorsConfig/index.vue

44
        </template>
44
        </template>
45
      </el-table-column>
45
      </el-table-column>
46
    </el-table>
46
    </el-table>
47
    <el-dialog title="传感器配置" ref="ruleForm" :visible.sync="dialogTableVisible" width="680px" @close='closed'>
48
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main" label-width="120px" label-position='right' status-icon>
47
    <el-dialog title="传感器配置" ref="ruleForm" :visible.sync="dialogTableVisible" width="860px" @close='closed'>
48
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main"  label-position='right' status-icon>
49
        <el-row>
49
        <el-row>
50
          <el-col :span="12">
50
          <el-col :span="12">
51
            <el-form-item label="采集盒编号" prop="device">
51
            <el-form-item label="采集盒编号" prop="device">
113
</template>
113
</template>
114
114
115
<script>
115
<script>
116
import { addDevice, updateDevice, deleteDevice, pageQueryDevice, DeviceOfservice, checkDeviceCode, checkDeviceInternalCode, queryServer, dictory } from '@/api/sensor'
116
import { addDevice, updateDevice, deleteDevice, pageQueryDevice, DeviceOfservice, checkDeviceCode, checkDeviceInternalCode, queryServer } from '@/api/sensor'
117
import { mainCable, location } from '@/api/numberDictionary'
117
import waves from '@/directive/waves'
118
import waves from '@/directive/waves'
118
export default {
119
export default {
119
  name: 'complexTable',
120
  name: 'complexTable',
234
    }
235
    }
235
  },
236
  },
236
  created() {
237
  created() {
237
    dictory({ dict: 'ZLLX' }).then(response => {
238
    mainCable().then(response => {
238
      if (response.success) {
239
      if (response.success) {
239
        response.data.map(item => {
240
        response.data.map(item => {
240
          this.options.push({ value: item.code, label: item.caption })
241
          this.options.push({ value: item.code, label: item.caption })
243
      }
244
      }
244
      return Promise.resolve()
245
      return Promise.resolve()
245
    }).then(response => {
246
    }).then(response => {
246
      dictory({ dict: 'ZLWZ' }).then(response => {
247
      location().then(response => {
247
        if (response.success) {
248
        if (response.success) {
248
          response.data.map(item => {
249
          response.data.map(item => {
249
            this.options1.push({ value: item.code, label: item.caption })
250
            this.options1.push({ value: item.code, label: item.caption })
430
  .el-btn-col{
431
  .el-btn-col{
431
    margin-top: 45px
432
    margin-top: 45px
432
  }
433
  }
434
  .el-form-item{
435
    margin: 0px 10px
436
  }
437
  .el-select{
438
    width: 100%
439
  }
440
  .el-col{
441
    margin-bottom: 15px
442
  }
443
  .el-form-item__label{
444
    padding: 0px
445
  }
433
</style>
446
</style>

+ 14 - 2
src/views/baseInfoManage/serversConfig/index.vue

39
        </template>
39
        </template>
40
      </el-table-column>
40
      </el-table-column>
41
    </el-table>
41
    </el-table>
42
    <el-dialog title="采集服务器配置" ref="ruleForm" :visible.sync="dialogTableVisible" width="680px" @close='closed'>
43
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main" label-width="120px" label-position='right' status-icon>
42
    <el-dialog title="采集服务器配置" ref="ruleForm" :visible.sync="dialogTableVisible" width="860px" @close='closed'>
43
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main"  label-position='right' status-icon>
44
        <el-row>
44
        <el-row>
45
          <el-col :span="12">
45
          <el-col :span="12">
46
            <el-form-item label="服务器编号" prop="code">
46
            <el-form-item label="服务器编号" prop="code">
376
  .el-btn-col{
376
  .el-btn-col{
377
    margin-top: 45px
377
    margin-top: 45px
378
  }
378
  }
379
  .el-form-item{
380
    margin: 0px 10px
381
  }
382
  .el-select{
383
    width: 100%
384
  }
385
  .el-col{
386
    margin-bottom: 15px
387
  }
388
  .el-form-item__label{
389
    padding: 0px
390
  }
379
</style>
391
</style>

+ 18 - 3
src/views/peoplesManage/infoManage/editUser.vue

1
<template>
1
<template>
2
  <el-dialog title="编辑用户" ref="ruleForm" :visible.sync="dialogTableVisible" width="680px" @close='closed'>
3
     <el-form class="form-main" :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-width="120px" label-position='right' status-icon>
2
  <el-dialog title="编辑用户" ref="ruleForm" :visible.sync="dialogTableVisible" width="860px" @close='closed'>
3
     <el-form class="form-main" :model="ruleForm2" :rules="rules2" ref="ruleForm2"  label-position='top' status-icon>
4
        <el-row>
4
        <el-row>
5
          <el-col :span="12">
5
          <el-col :span="12">
6
            <el-form-item label="账号" prop='account'>
6
            <el-form-item label="账号" prop='account'>
265
    }
265
    }
266
  }
266
  }
267
}
267
}
268
</script>
268
</script>
269
270
<style rel="stylesheet/scss" lang="scss" scoped>
271
  .el-form-item{
272
    margin: 0px 10px
273
  }
274
  .el-select{
275
    width: 100%
276
  }
277
  .el-col{
278
    margin-bottom: 15px
279
  }
280
  .el-form-item__label{
281
    padding: 0px
282
  }
283
</style>

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

1
<template>
1
<template>
2
  <el-dialog title="用户数据权限修改" :visible.sync="dialogTableVisible" width="60%" @close='closed'>
2
  <el-dialog title="用户数据权限修改" :visible.sync="dialogTableVisible" width="860px" @close='closed'>
3
    <el-form class="form-main" :model="ruleForm2"  ref="ruleForm2">
3
    <el-form class="form-main" :model="ruleForm2"  ref="ruleForm2">
4
      <el-row :gutter="16">
4
      <el-row :gutter="16">
5
        <el-col :xs="12" :sm="12" :lg="12">
5
        <el-col :xs="12" :sm="12" :lg="12">