Browse Source

修正传感器

lipengtao 6 years ago
parent
commit
3df523d38d
2 changed files with 39 additions and 29 deletions
  1. 9 0
      src/api/sensor.js
  2. 30 29
      src/views/baseInfoManage/sensorsConfig/index.vue

+ 9 - 0
src/api/sensor.js

@ -80,3 +80,12 @@ export function queryServer(params) {
80 80
    params
81 81
  })
82 82
}
83
84
/*  数据字典 */
85
export function dictory(params) {
86
  return request({
87
    url: '/ajax/dict/items',
88
    method: 'get',
89
    params
90
  })
91
}

+ 30 - 29
src/views/baseInfoManage/sensorsConfig/index.vue

@ -18,12 +18,12 @@
18 18
      </el-table-column>
19 19
      <el-table-column width="150px" align="center" label="传感器所在主缆">
20 20
        <template slot-scope="scope">
21
          <span>{{scope.row.cableType}}</span>
21
          <span>{{cableMain[scope.row.cableType]}}</span>
22 22
        </template>
23 23
      </el-table-column>
24 24
      <el-table-column width="150px" align="center" label="传感器位置">
25 25
        <template slot-scope="scope">
26
          <span>{{scope.row.locType}}</span>
26
          <span>{{addr[scope.row.locType]}}</span>
27 27
        </template>
28 28
      </el-table-column>
29 29
      <el-table-column min-width="150px" align="center" label="所属采集盒编号">
@ -113,7 +113,7 @@
113 113
</template>
114 114
115 115
<script>
116
import { addDevice, updateDevice, deleteDevice, pageQueryDevice, DeviceOfservice, checkDeviceCode, checkDeviceInternalCode, queryServer } from '@/api/sensor'
116
import { addDevice, updateDevice, deleteDevice, pageQueryDevice, DeviceOfservice, checkDeviceCode, checkDeviceInternalCode, queryServer, dictory } from '@/api/sensor'
117 117
import waves from '@/directive/waves'
118 118
export default {
119 119
  name: 'complexTable',
@ -182,37 +182,18 @@ export default {
182 182
      }
183 183
    }
184 184
    return {
185
      options: [{
186
        value: '上游主缆',
187
        label: '上游主缆'
188
      }, {
189
        value: '下游主缆',
190
        label: '下游主缆'
191
      }],
192
      options1: [{
193
        value: '东跨',
194
        label: '东跨'
195
      }, {
196
        value: '西跨',
197
        label: '西跨'
198
      }, {
199
        value: '南跨',
200
        label: '南跨'
201
      }, {
202
        value: '中跨',
203
        label: '中跨'
204
      }, {
205
        value: '北跨',
206
        label: '北跨'
207
      }],
185
      cableMain: [],
186
      addr: [],
187
      options: [],
188
      options1: [],
208 189
      edit: '',
209 190
      ruleForm2: {
210 191
        code: '',
211
        cableType: '上游主缆',
192
        cableType: '01',
212 193
        device: '',
213 194
        seq: '',
214 195
        deviceId: '',
215
        locType: '东跨',
196
        locType: '01',
216 197
        remark: ''
217 198
      },
218 199
      rules2: {
@ -253,7 +234,27 @@ export default {
253 234
    }
254 235
  },
255 236
  created() {
256
    this.getList()
237
    dictory({ dict: 'ZLLX' }).then(response => {
238
      if (response.success) {
239
        response.data.map(item => {
240
          this.options.push({ value: item.code, label: item.caption })
241
          this.cableMain[item.code] = item.caption
242
        })
243
      }
244
      return Promise.resolve()
245
    }).then(response => {
246
      dictory({ dict: 'ZLWZ' }).then(response => {
247
        if (response.success) {
248
          response.data.map(item => {
249
            this.options1.push({ value: item.code, label: item.caption })
250
            this.addr[item.code] = item.caption
251
          })
252
        }
253
        return Promise.resolve()
254
      })
255
    }).then(response => {
256
      this.getList()
257
    })
257 258
  },
258 259
  methods: {
259 260
    submitForm(formName) {