修正

src/api/collectionbox.js

@@ -57,7 +57,7 @@ export function DeviceOfservice(params) {
/*  校验采集盒编号 */
export function checkDeviceCode(params) {
  return request({
    url: '/ajax/server/checkCode',
    url: '/ajax/device/checkCode',
    method: 'get',
    params
  })
@@ -66,7 +66,7 @@ export function checkDeviceCode(params) {
/*  校验采集盒内部编号 */
export function checkDeviceInternalCode(params) {
  return request({
    url: '/ajax/server/checkSeq',
    url: '/ajax/device/checkSeq',
    method: 'get',
    params
  })

src/components/Marqueebox/index.vue

@@ -6,7 +6,7 @@
      </el-form>
      <div class="limit_num">还可以输入{{ableNum}}字</div>
      <div slot="footer" class="dialog-footer">
        <el-button v-waves @click="dialogFormVisible = false">取 消</el-button>
        <el-button v-waves @click="cancelNotice('formNotice')">取 消</el-button>
        <el-button type="primary" v-waves @click="setNotice('formNotice')">确 定</el-button>
      </div>
    </el-dialog>
@@ -14,8 +14,8 @@
      <div class="marquee_box">
        <span class="tit">系统公告：</span>
        <el-tooltip placement="bottom-end" effect="dark">
          <div slot="content" class="popper-tips">{{formNotice.desc}}</div>
          <div class="marquee_text">{{formNotice.desc}}</div>
          <div slot="content" class="popper-tips">{{formNotice.text}}</div>
          <div class="marquee_text">{{formNotice.text}}</div>
        </el-tooltip>
        <span class="btn-span" v-if="isShow" @click="openNoticeDialog">设置</span>
      </div>
@@ -40,7 +40,8 @@ export default {
      dialogFormVisible: false,
      ableNum: 100,
      formNotice: {
        desc: ''
        desc: '',
        text: ''
      },
      rules: {
        desc: [
@@ -61,6 +62,7 @@ export default {
      getNotice().then(res => {
        if (res.success) {
          this.formNotice.desc = res.data
          this.formNotice.text = res.data
          this.limitFn()
        }
      })
@@ -68,6 +70,11 @@ export default {
    openNoticeDialog() {
      this.dialogFormVisible = true
    },
    cancelNotice(formName) {
      this.dialogFormVisible = false
      this.$refs[formName].resetFields()
      this.formNotice.desc = this.formNotice.text
    },
    setNotice(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
@@ -78,6 +85,7 @@ export default {
            if (res.success) {
              this.dialogFormVisible = false
              this.$refs[formName].resetFields()
              this.formNotice.text = this.formNotice.desc
            }
          })
        } else {

src/views/baseInfoManage/boxesConfig/index.vue

@@ -29,12 +29,12 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="采集盒编号"  prop="code">
              <el-input placeholder="请输入采集盒编号" v-model="ruleForm2.code"></el-input>
              <el-input placeholder="请输入采集盒编号" v-model="ruleForm2.code" maxlength=20></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="采集盒信道数量" prop="channels">
              <el-input placeholder="请输入采集盒信道数量" v-model="ruleForm2.channels"></el-input>
              <el-input placeholder="请输入采集盒信道数量" v-model="ruleForm2.channels" maxlength=10></el-input>
            </el-form-item>
          </el-col>
           <el-col :span="12">
@@ -49,12 +49,12 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="内部编号" prop="seq">
              <el-input placeholder="请输入内部编号" v-model="ruleForm2.seq"></el-input>
              <el-input placeholder="请输入内部编号" v-model="ruleForm2.seq" maxlength=10></el-input>
            </el-form-item>
          </el-col>
           <el-col :span="24" >
            <el-form-item label="备注" prop="remark">
              <el-input type="textarea" maxlength=100 v-model="ruleForm2.remark" rows=4></el-input>
              <el-input type="textarea" maxlength=500 v-model="ruleForm2.remark" rows=4></el-input>
             </el-form-item>
          </el-col>
          <el-col :span="24" class="el-btn-col">
@@ -94,6 +94,7 @@ export default {
      }, 300)
    }
    var seq = (rule, value, callback) => {
      const num = /^[0-9]*$/
      if (value === '') {
        callback(new Error('请输入内部编号'))
      } else {
@@ -101,6 +102,10 @@ export default {
          callback('请先选择所属服务器编号')
          return
        }
        if (!num.test(value)) {
          callback('请输入数字')
          return
        }
        if (this.edit) {
          checkDeviceInternalCode({ seq: value, id: this.edit, serverId: this.ruleForm2.serverId, active: 1 }).then(response => {
            if (response.data) {

src/views/baseInfoManage/bridgesInfo/index.vue

@@ -1,9 +1,9 @@
<template>
  <div class="app-container">
    <div class="filter-container" style="margin-bottom:20px">
      <el-input style="width: 200px;" class="filter-item" placeholder="桥梁名称" v-model="listQuery.name">
      <el-input style="width: 200px;" class="filter-item" placeholder="桥梁编号" v-model="listQuery.code">
      </el-input>
       <el-input style="width: 200px;" class="filter-item" placeholder="桥梁编号" v-model="listQuery.code">
      <el-input style="width: 200px;" class="filter-item" placeholder="桥梁简称" v-model="listQuery.name">
      </el-input>
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleFilter" type="primary" icon="el-icon-search">查找</el-button>
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">添加桥梁</el-button>
@@ -51,17 +51,17 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="桥梁编号" prop="code">
                  <el-input placeholder="请输入桥梁编号" v-model="ruleForm2.code"></el-input>
                  <el-input placeholder="请输入桥梁编号" v-model="ruleForm2.code" maxlength=20></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="桥梁简称" prop="shortName">
                  <el-input placeholder="请输入桥梁简称" v-model="ruleForm2.shortName"></el-input>
                  <el-input placeholder="请输入桥梁简称" v-model="ruleForm2.shortName" maxlength=20></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="桥梁全称" prop="name">
                  <el-input placeholder="请输入桥梁全称" v-model="ruleForm2.name"></el-input>
                  <el-input placeholder="请输入桥梁全称" v-model="ruleForm2.name" maxlength=200></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="24">
@@ -72,7 +72,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="地理位置信息" prop="location">
                  <el-input placeholder="请输入地理位置信息" v-model="ruleForm2.location"></el-input>
                  <el-input placeholder="请输入地理位置信息" v-model="ruleForm2.location" maxlength=200></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -87,17 +87,17 @@
              </el-col>
              <el-col :span="24">
                <el-form-item label="维护机构" prop="org">
                  <el-input placeholder="请输入维护机构" v-model="ruleForm2.org"></el-input>
                  <el-input placeholder="请输入维护机构" v-model="ruleForm2.org" maxlength=200></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="维护单位电话" prop="phone">
                  <el-input placeholder="请输入维护单位电话" v-model="ruleForm2.phone"></el-input>
                <el-form-item label="联系电话" prop="phone">
                  <el-input placeholder="请输入联系电话" v-model="ruleForm2.phone" maxlength=20></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="维护单位电邮" prop="email">
                  <el-input placeholder="请输入维护单位电邮" v-model="ruleForm2.email"></el-input>
                <el-form-item label="联系电邮" prop="email">
                  <el-input placeholder="请输入联系电邮" v-model="ruleForm2.email" maxlength=100></el-input>
                </el-form-item>
              </el-col>
            </el-row>
@@ -125,7 +125,7 @@
          </el-col>
          <el-col :span="24">
            <el-form-item label="备注" class="el-to-block" prop="remark">
              <el-input type="textarea" maxlength=100 rows=3 v-model="ruleForm2.remark"></el-input>
              <el-input type="textarea" maxlength=500 rows=3 v-model="ruleForm2.remark"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="24" class="el-btn-col">
@@ -262,13 +262,13 @@ export default {
          { required: true, message: '请输入维护机构名称', trigger: 'blur' }
        ],
        phone: [
          { required: true, message: '请输入维护机构电话', trigger: 'blur' }
          { required: true, message: '请输入联系电话', trigger: 'blur' }
        ],
        addrCode: [
          { required: true, message: '请选择桥梁位置信息', trigger: 'blur' }
        ],
        email: [
          { required: true, message: '请输入维护机构电邮', trigger: 'blur' }
          { required: true, message: '请输入联系电邮', trigger: 'blur' }
        ]
      },
      timeout: null,
@@ -428,7 +428,7 @@ export default {
      this.ruleForm2 = {
        code: row.code,
        shortName: row.shortName,
        name: row.shortName,
        name: row.name,
        addrCode: row.addrCode,
        serviceDay: row.serviceDay,
        location: row.location,

src/views/baseInfoManage/sensorsConfig/index.vue

@@ -29,7 +29,12 @@
      <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" class="form-main"  label-position='right' status-icon>
        <el-row>
          <el-col :span="12">
            <el-form-item label="采集盒编号" prop="device">
            <el-form-item label="传感器编号" prop="code">
              <el-input placeholder="请输入传感器编号" v-model="ruleForm2.code" maxlength=20></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="所属采集盒编号" prop="device">
              <el-autocomplete
                 v-model="ruleForm2.device"
                :fetch-suggestions="querySearchAsync"
@@ -39,20 +44,10 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="传感器编号" prop="code">
              <el-input placeholder="请输入传感器编号" v-model="ruleForm2.code"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="内部编号" prop="seq">
              <el-input placeholder="请输入内部编号" v-model="ruleForm2.seq"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="传感器所在主缆" prop="cableType">
              <el-select v-model="ruleForm2.cableType" placeholder="请选择主缆">
            <el-form-item label="传感器所属位置" prop="locType">
              <el-select v-model="ruleForm2.locType" placeholder="请选择主缆传感器位置">
                <el-option
                  v-for="item in options"
                  v-for="item in options1"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
@@ -61,10 +56,10 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="传感器位置" prop="locType">
              <el-select v-model="ruleForm2.locType" placeholder="请选择主缆传感器位置">
            <el-form-item label="传感器所属主缆" prop="cableType">
              <el-select v-model="ruleForm2.cableType" placeholder="请选择主缆">
                <el-option
                  v-for="item in options1"
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
@@ -72,9 +67,14 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="内部编号" prop="seq">
              <el-input placeholder="请输入内部编号" v-model="ruleForm2.seq" maxlength=10></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="24" >
            <el-form-item label="备注" prop="remark">
              <el-input type="textarea" maxlength=100 v-model="ruleForm2.remark" rows=4></el-input>
              <el-input type="textarea" maxlength=500 v-model="ruleForm2.remark" rows=4></el-input>
             </el-form-item>
          </el-col>
          <el-col :span="24" class="el-btn-col">
@@ -108,18 +108,23 @@ export default {
      const that = this
      setTimeout(function() {
        if (that.ruleForm2.device === '' || that.ruleForm2.deviceId === '') {
          callback(new Error('请选择采集盒编号'))
          callback(new Error('请选择所属采集盒编号'))
        } else {
          callback()
        }
      }, 300)
    }
    var seq = (rule, value, callback) => {
      const num = /^[0-9]*$/
      if (value === '') {
        callback(new Error('请输入内部编号'))
      } else {
        if (!this.ruleForm2.deviceId) {
          callback('请先选择采集盒编号')
          callback('请先选择所属采集盒编号')
          return
        }
        if (!num.test(value)) {
          callback('请输入数字')
          return
        }
        if (this.edit) {

src/views/baseInfoManage/serversConfig/index.vue

@@ -1,9 +1,9 @@
<template>
  <div class="app-container">
    <div class="filter-container" style="margin-bottom:20px">
      <el-input style="width: 200px;" class="filter-item" placeholder="所属桥梁编号" v-model="listQuery.bcode">
      <el-input style="width: 200px;" class="filter-item" placeholder="服务器编号" v-model="listQuery.code">
      </el-input>
       <el-input style="width: 200px;" class="filter-item" placeholder="服务器编号" v-model="listQuery.code">
      <el-input style="width: 200px;" class="filter-item" placeholder="所属桥梁名称" v-model="listQuery.key">
      </el-input>
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleFilter" type="primary" icon="el-icon-search">查找</el-button>
      <el-button v-waves class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">添加服务器</el-button>
@@ -29,12 +29,12 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="服务器编号" prop="code">
              <el-input placeholder="请输入服务器编号" v-model="ruleForm2.code"></el-input>
              <el-input placeholder="请输入服务器编号" v-model="ruleForm2.code" maxlength=20></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="采集盒数量" prop="devices">
              <el-input placeholder="请输入采集盒数量" v-model="ruleForm2.devices"></el-input>
              <el-input placeholder="请输入采集盒数量" v-model="ruleForm2.devices" maxlength=10></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -49,12 +49,12 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="内部编号" prop="seq">
              <el-input placeholder="请输入内部编号" v-model="ruleForm2.seq"></el-input>
              <el-input placeholder="请输入内部编号" v-model="ruleForm2.seq" maxlength=10></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="24" >
            <el-form-item label="备注" prop="remark">
              <el-input type="textarea" maxlength=100 v-model="ruleForm2.remark" rows=4></el-input>
              <el-input type="textarea" maxlength=500 v-model="ruleForm2.remark" rows=4></el-input>
             </el-form-item>
          </el-col>
          <el-col :span="24" class="el-btn-col">
@@ -94,6 +94,7 @@ export default {
      }, 300)
    }
    var seq = (rule, value, callback) => {
      const num = /^[0-9]*$/
      if (value === '') {
        callback(new Error('请输入内部编号'))
      } else {
@@ -101,6 +102,10 @@ export default {
          callback('请先选择所属桥梁')
          return
        }
        if (!num.test(value)) {
          callback('请输入数字')
          return
        }
        if (this.edit) {
          checkDeviceInternalCode({ seq: value, id: this.edit, bridgeId: this.ruleForm2.bridgeId, active: 1 }).then(response => {
            if (response.data) {
@@ -174,7 +179,7 @@ export default {
      total: null,
      listLoading: true,
      listQuery: {
        bcode: '',
        key: '',
        code: '',
        active: 1,
        pageSize: 10,

src/views/peoplesManage/infoManage/editUser.vue

@@ -9,12 +9,17 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="用户姓名" prop='name'>
              <el-input placeholder="请输入用户姓名" v-model="ruleForm2.name"></el-input>
              <el-input placeholder="请输入用户姓名" v-model="ruleForm2.name" maxlength=20></el-input>
            </el-form-item>
          </el-col>
           <el-col :span="12">
          <el-col :span="12">
            <el-form-item label="职位" prop='job'>
              <el-input placeholder="请输入用户职位" v-model="ruleForm2.job"></el-input>
              <el-input placeholder="请输入用户职位" v-model="ruleForm2.job" maxlength=100></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="用户所在机构" prop='comp'>
              <el-input placeholder="请输入用户所在机构" v-model="ruleForm2.comp" maxlength=200></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -31,22 +36,17 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="联系电话" prop='phone'>
              <el-input placeholder="请输入手机号码" v-model="ruleForm2.phone"></el-input>
              <el-input placeholder="请输入手机号码" v-model="ruleForm2.phone" maxlength=11></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="联系邮箱" prop='email'>
              <el-input placeholder="请输入邮箱地址" v-model="ruleForm2.email"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="所在机构" prop='comp'>
              <el-input placeholder="请输入所在用户机构" v-model="ruleForm2.comp"></el-input>
              <el-input placeholder="请输入邮箱地址" v-model="ruleForm2.email" maxlength=100></el-input>
            </el-form-item>
          </el-col>
           <el-col :span="24" >
          <el-col :span="24" >
            <el-form-item label="备注" prop='remark'>
              <el-input type="textarea" rows=4 v-model="ruleForm2.remark"></el-input>
              <el-input type="textarea" rows=4 v-model="ruleForm2.remark" maxlength=500></el-input>
             </el-form-item>
          </el-col>
          <el-col :span="24" class="el-btn-col">
@@ -145,7 +145,7 @@ export default {
          { required: true, message: '请输入用户姓名', trigger: 'blur' }
        ],
        comp: [
          { required: true, message: '请输入所在用户机构', trigger: 'blur' }
          { required: true, message: '请输入用户所在机构', trigger: 'blur' }
        ],
        job: [
          { required: true, message: '请输入用户职位', trigger: 'blur' }

src/views/peoplesManage/infoManage/editUserPermissions.vue

@@ -178,7 +178,7 @@ export default {
          this.$emit('chilF')
          const that = this
          setTimeout(function() {
            that.pop('权限修改修改成功')
            that.pop('权限修改成功')
          }, 1000)
          this.dialogTableVisible = false
        }