BUG修改

liuchengxin

2022-06-09 0d68be1fa109b0f55fa0b4c023baf4b66dcc9f28

BUG修改

 src/assets/styles/ruoyi.scss

@@ -100,10 +100,11 @@
/** 表格布局 **/
.pagination-container {
    position: relative;
    height: 25px;
    height: 40px;
    margin-bottom: 10px;
    margin-top: 15px;
    padding: 10px 20px !important;
  box-sizing: border-box;
}

/* tree border */

 src/views/basics/building/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <!--      <el-form-item label="单元编号" prop="code">-->
      <!--        <el-input-->
      <!--          v-model="queryParams.code"-->

 src/views/basics/manufacturer/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="厂商名称" prop="name">
        <el-input
          v-model="queryParams.name"

 src/views/basics/organization/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="机构名称" prop="name">
        <el-input
            v-model="queryParams.name"

 src/views/basics/school/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="学校代码" prop="code">
        <el-input
          v-model="queryParams.code"

 src/views/components/building/buildList.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="单元名称" prop="name">
        <el-input
            v-model="queryParams.name"

 src/views/components/constructionBatch/list.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="施工批次" prop="batch">
        <el-input
          v-model="queryParams.batch"

 src/views/components/manufacturer/index.vue

@@ -1,10 +1,11 @@
<template>
  <div>
    <el-input placeholder="请选择" :value="name" disabled>
      <el-button slot="append" icon="el-icon-thumb" @click="handleClick"></el-button>
      <el-button slot="append" v-if="currentId" icon="el-icon-circle-close" @click="handleClear"></el-button>
      <el-button slot="append" v-else icon="el-icon-thumb" @click="handleClick"></el-button>
    </el-input>
    <el-dialog title="生产厂商" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
      <manufacturer-list v-if="open" ref="manufacturerRef"></manufacturer-list>
      <manufacturer-list v-if="open" ref="manufacturerRef" @setCurrentRow="getCurrentRow"></manufacturer-list>
      <div slot="footer" class="dialog-footer">
        <el-button  type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="open = false">取 消</el-button>
@@ -30,14 +31,15 @@
  },
  props: {
    value: {
      type: [Number],
      type: [Number, String],
      default: undefined
    }
  },
  data() {
    return {
      open: false,
      name: ''
      name: '',
      currentId: ''
    }
  },
  watch: {
@@ -45,9 +47,11 @@
      if (v) {
        getManufacturer(v).then(response => {
          this.name = response.data.name;
          this.currentId = response.data.id;
        });
      }else {
        this.name = '';
        this.currentId = ''
      }
    }
  },
@@ -55,10 +59,19 @@
    if (this.value) {
      getManufacturer(this.value).then(response => {
        this.name = response.data.name;
        this.currentId = response.data.id;
      });
    }
  },
  methods: {
    handleClear () {
      this.currentId = '';
      this.name = undefined;
      this.$emit("change", '');
    },
    getCurrentRow (e) {
      this.currentId = e.id
    },
    handleClick() {
      this.open = true;
    },
@@ -79,4 +92,4 @@

<style scoped>

</style>
</style>

 src/views/components/manufacturer/list.vue

@@ -96,6 +96,7 @@
    },
    handleCurrentChange(v) {
      this.currentRow = v;
      this.$emit('setCurrentRow', this.currentRow)
    }
  }
};

 src/views/components/nvr/index.vue

@@ -1,10 +1,11 @@
<template>
  <div>
    <el-input placeholder="请选择" :value="name" disabled>
      <el-button slot="append" icon="el-icon-thumb" @click="handleClick"></el-button>
      <el-button slot="append" v-if="currentId" icon="el-icon-circle-close" @click="handleClear"></el-button>
      <el-button slot="append" v-else icon="el-icon-thumb" @click="handleClick"></el-button>
    </el-input>
    <el-dialog title="NVR" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
      <nvr-list v-if="open" ref="nvrRef" :schoolId="schoolId"></nvr-list>
    <el-dialog title="隶属NVR" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
      <nvr-list v-if="open" ref="nvrRef" :schoolId="schoolId" @setCurrentRow="getCurrentRow"></nvr-list>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="open = false">取 消</el-button>
@@ -42,7 +43,8 @@
  data() {
    return {
      open: false,
      name: ''
      name: '',
      currentId: ''
    }
  },
  watch: {
@@ -50,6 +52,7 @@
      if (v) {
        getNvr(v).then(response => {
          this.name = response.data.deploymentName;
          this.currentId = response.data.id
        });
      }else {
        this.name = '';
@@ -60,10 +63,20 @@
    if (this.value) {
      getNvr(this.value).then(response => {
        this.name = response.data.deploymentName;
        this.currentId = response.data.id;
      });
    }
  },
  methods: {
    handleClear () {
      this.currentId = '';
      this.name = undefined;
      this.$emit("change", '');
      this.$emit('nvrIdChange')
    },
    getCurrentRow (e) {
      this.currentId = e.id
    },
    handleClick() {
      this.open = true;
    },
@@ -84,4 +97,4 @@

<style scoped>

</style>
</style>

 src/views/components/nvr/list.vue

@@ -24,16 +24,16 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" align="center" prop="deploymentName"/>
      <el-table-column label="部署名称" min-width="200" align="center" prop="deploymentName"/>
      <el-table-column label="通道（路）" min-width="120" align="center" prop="passageway_dictText"/>
      <el-table-column label="LAN1" min-width="150" align="center" prop="lanOne"/>
      <el-table-column label="IP" min-width="130" align="center" prop="ipOne"/>
      <el-table-column label="LAN2" min-width="150" align="center" prop="lanTwo"/>
      <el-table-column label="IP" min-width="130" align="center" prop="ipTwo"/>
      <el-table-column label="登录账户" min-width="120" align="center" prop="loginAccount"/>
      <el-table-column label="登录账户" min-width="150" align="center" prop="loginAccount"/>
      <el-table-column label="硬盘" align="center" prop="hardDisk"/>
      <el-table-column label="安装位置" min-width="220" align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="220" align="center" prop="organizationId_dictText"/>
      <el-table-column label="安装位置" min-width="250" align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="250" align="center" prop="organizationId_dictText"/>
      <!--      <el-table-column label="施工批次" align="center" prop="constructionBatchId" />-->
      <!--      <el-table-column label="序列号" align="center" prop="serialNumber" />-->
      <!--      <el-table-column label="型号" align="center" prop="model" />-->

 src/views/components/organization/organizationList.vue

@@ -1,10 +1,10 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" @submit.native.prevent>
      <el-form-item label="机构名称" prop="name">
        <el-input
            v-model="queryParams.name"
            placeholder="请输入单元名称"
            placeholder="请输入机构名称"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
@@ -27,7 +27,7 @@
        highlight-current-row
        @current-change="handleCurrentChange"
    >
      <el-table-column label="机构名称" align="left" prop="name"/>
      <el-table-column label="序号" type="index" width="55"></el-table-column>
      <el-table-column label="机构名称" align="left" prop="name"/>
      <el-table-column label="机构编号" prop="code"/>
      <el-table-column label="显示顺序" align="center" prop="orderNum"/>

 src/views/components/peripheralUnit/index.vue

@@ -1,10 +1,12 @@
<template>
  <div>
    <el-input placeholder="请选择" :value="name" disabled>
      <el-button slot="append" icon="el-icon-thumb" @click="handleClick"></el-button>
      {{ currentId }}
      <el-button slot="append" v-if="currentId" icon="el-icon-circle-close" @click="handleClear"></el-button>
      <el-button slot="append" v-else icon="el-icon-thumb" @click="handleClick"></el-button>
    </el-input>
    <el-dialog title="外设单元" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
      <peripheral-unit-list v-if="open" ref="peripheralRef"></peripheral-unit-list>
      <peripheral-unit-list v-if="open" ref="peripheralRef" @setCurrentRow="getCurrentRow"></peripheral-unit-list>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="open = false">取 消</el-button>
@@ -31,14 +33,15 @@
  },
  props: {
    value: {
      type: [Number],
      type: [Number, String],
      default: undefined
    }
  },
  data() {
    return {
      open: false,
      name: ''
      name: '',
      currentId: ''
    }
  },
  watch: {
@@ -46,9 +49,11 @@
      if (v) {
        getPeripheralUnit(v).then(response => {
          this.name = response.data.name;
          this.currentId = response.data.id;
        });
      } else {
        this.name = '';
        this.currentId = ''
      }
    }
  },
@@ -56,10 +61,19 @@
    if (this.value) {
      getPeripheralUnit(this.value).then(response => {
        this.name = response.data.name;
        this.currentId = response.data.id;
      });
    }
  },
  methods: {
    handleClear () {
      this.currentId = '';
      this.name = undefined;
      this.$emit("change", '');
    },
    getCurrentRow (e) {
      this.currentId = e.id
    },
    handleClick() {
      this.open = true;
    },
@@ -80,4 +94,4 @@

<style scoped>

</style>
</style>

 src/views/components/peripheralUnit/list.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="外设代码" prop="code">
        <el-input
          v-model="queryParams.code"
@@ -26,16 +26,16 @@
    </el-form>

    <el-table v-loading="loading" :data="peripheralUnitList" highlight-current-row
              @current-change="handleCurrentChange">
              @current-change="handleCurrentChange" height="50vh">
      <el-table-column label="序号" align="center" width="50">
        <template slot-scope="scope">
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="外设代码" width="80" align="center" prop="code"/>
      <el-table-column label="外设名称" align="center" prop="name" show-overflow-tooltip/>
      <el-table-column label="规格型号" align="center" prop="model" min-width="60"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturer_dictText"/>
      <el-table-column label="外设名称" align="center" min-width="180" prop="name" show-overflow-tooltip/>
      <el-table-column label="规格型号" align="center" prop="model" min-width="120"/>
      <el-table-column label="生产厂商" align="center" min-width="150" show-overflow-tooltip prop="manufacturer_dictText"/>
      <el-table-column label="厂商代码" width="100" align="center" prop="vendorCode_dictText"/>
      <el-table-column label="波特率" width="100" align="center" prop="baudRate">
        <template slot-scope="scope">
@@ -117,6 +117,7 @@
    },
    handleCurrentChange(v) {
      this.currentRow = v;
      this.$emit('setCurrentRow', this.currentRow)
    }
  }
};

 src/views/components/server/list.vue

@@ -1,11 +1,11 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="部署位置" prop="buildingId">
        <building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
      </el-form-item>
      <el-form-item label="部署名称" prop="name">
        <el-input v-model="queryParams.deploymentName" placeholder="请输入部署名称" />
        <el-input v-model="queryParams.deploymentName" @keyup.enter.native="handleQuery" placeholder="请输入部署名称" />
      </el-form-item>
<!--      <el-form-item label="所属单位" prop="organizationId">-->
<!--        <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>-->
@@ -38,23 +38,23 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" align="center" prop="deploymentName"/>
      <el-table-column label="LAN" align="center" prop="lan"/>
      <el-table-column label="IP" align="center" prop="ip"/>
      <el-table-column label="操作系统" align="center" prop="operatingSystem">
      <el-table-column label="部署名称" min-width="150" show-overflow-tooltip align="center" prop="deploymentName"/>
      <el-table-column label="LAN" min-width="150" show-overflow-tooltip align="center" prop="lan"/>
      <el-table-column label="IP" min-width="150" show-overflow-tooltip align="center" prop="ip"/>
      <el-table-column label="操作系统" align="center" show-overflow-tooltip min-width="200" prop="operatingSystem">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
        </template>
      </el-table-column>
      <!--      <el-table-column label="账户" align="center" prop="account" />-->
      <el-table-column label="部署位置" align="center" prop="buildingId_dictText"/>
      <el-table-column label="机柜号" align="center" prop="cabinetNumber"/>
      <el-table-column label="机架号" align="center" prop="rackNumber"/>
      <el-table-column label="所属单位" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" align="center" prop="constructionBatchId_dictText"/>
      <el-table-column label="部署位置" align="center" show-overflow-tooltip min-width="200" prop="buildingId_dictText"/>
      <el-table-column label="机柜号" align="center" show-overflow-tooltip prop="cabinetNumber"/>
      <el-table-column label="机架号" align="center" show-overflow-tooltip prop="rackNumber"/>
      <el-table-column label="所属单位" align="center" show-overflow-tooltip min-width="200" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" align="center" show-overflow-tooltip prop="constructionBatchId_dictText"/>
      <!--      <el-table-column label="序列号" align="center" prop="serialNumber" />-->
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="型号" align="center" prop="model" show-overflow-tooltip/>
      <el-table-column label="生产厂商" align="center" min-width="200" show-overflow-tooltip prop="manufacturerId_dictText"/>
      <!--      <el-table-column label="性能指标" align="center" prop="performanceIndex" />-->
      <!--      <el-table-column label="备注" align="center" prop="remarks" />-->
      <!--      <el-table-column label="附件" align="center" prop="filePath" />-->

 src/views/construction/constructionBatch/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="施工批次" prop="batch">
        <el-input
          v-model="queryParams.batch"

 src/views/construction/ipc/index.vue

@@ -76,12 +76,12 @@
      <el-table-column label="MAC" min-width="150" align="center" prop="mac" show-overflow-tooltip/>
      <el-table-column label="IP" width="130" align="center" prop="ip" show-overflow-tooltip/>
      <el-table-column label="账户/密码" min-width="180" align="center" prop="loginAccount" show-overflow-tooltip/>
      <el-table-column label="NVR" align="center" min-width="150" prop="nvrId_dictText" show-overflow-tooltip>
      <el-table-column label="隶属NVR" align="center" min-width="150" prop="nvrId_dictText" show-overflow-tooltip>
        <template slot-scope="scope">
          <el-link type="primary" @click="nvrClick(scope.row)">{{ scope.row.nvrId_dictText }}</el-link>
        </template>
      </el-table-column>
      <el-table-column label="通道" align="center" prop="passageway_dictText" show-overflow-tooltip/>
      <el-table-column label="通道号" align="center" prop="passageway_dictText" show-overflow-tooltip/>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber" show-overflow-tooltip/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="安装位置" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
@@ -147,13 +147,13 @@
        </el-form-item>
        <el-row>
          <el-col :span="12">
            <el-form-item label="nvr" prop="nvrId">
              <nvr v-if="open" v-model="form.nvrId" :schoolId="schoolId"></nvr>
            <el-form-item label="隶属NVR" prop="nvrId">
              <nvr v-if="open" v-model="form.nvrId" :schoolId="schoolId" @nvrIdChange="nvrIdChange"></nvr>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="通道" prop="passageway">
              <el-select v-model="form.passageway" placeholder="请选择通道（路）" style="width: 100%;">
            <el-form-item label="通道号" prop="passageway">
              <el-select v-model="form.passageway" :disabled="!form.nvrId" placeholder="请选择通道（路）" style="width: 100%;">
                <el-option
                    v-for="dict in dict.type.DICT109"
                    :key="dict.value"
@@ -333,6 +333,9 @@
    this.getList();
  },
  methods: {
    nvrIdChange () {
      this.form.passageway = ''
    },
    /** 查询ipc设备列表 */
    getList() {
      this.loading = true;

 src/views/construction/reserveIp/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
      <el-form-item label="IP地址" prop="ip">
        <el-input
            v-model="queryParams.ip"