liuchengxin
2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d
BUG修改
17个文件已修改
199 ■■■■ 已修改文件
src/assets/styles/custom.scss 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/building/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/manufacturer/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basics/organization/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/ai/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/constructionBatch/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/exchange/index.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/iot/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/ipc/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/nvr/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/reserveIp/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/server/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/construction/system/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/device/batch/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/device/equipment/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/device/peripheralUnit/index.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/monitor/logininfor/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/styles/custom.scss
@@ -19,3 +19,6 @@
  flex-direction: row;
  align-items: center;
}
.el-dialog__body {
  padding: 15px 20px 0 20px!important;
}
src/views/basics/building/index.vue
@@ -46,7 +46,7 @@
        default-expand-all
        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
    >
      <el-table-column label="单元名称" align="left" prop="name"/>
      <el-table-column label="单元名称" align="left" prop="name" show-overflow-tooltip/>
      <el-table-column label="单元编号" align="left" width="150" prop="code"/>
      <el-table-column label="显示顺序" align="center" width="80" prop="orderNum"/>
      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
src/views/basics/manufacturer/index.vue
@@ -96,12 +96,12 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="厂商名称" align="center" prop="name" />
      <el-table-column label="厂商代码" align="center" prop="code" />
      <el-table-column label="联系方式" align="center" prop="phone" />
      <el-table-column label="邮箱" align="center" prop="mailbox" />
      <el-table-column label="厂商名称" align="center" prop="name" show-overflow-tooltip/>
      <el-table-column label="厂商代码" align="center" prop="code" show-overflow-tooltip/>
      <el-table-column label="联系方式" align="center" prop="phone" show-overflow-tooltip/>
      <el-table-column label="邮箱" align="center" prop="mailbox" show-overflow-tooltip/>
      <el-table-column label="联系地址" align="center" prop="contactAddress" show-overflow-tooltip />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="操作" width="120" fixed="right" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
src/views/basics/organization/index.vue
@@ -37,8 +37,8 @@
        default-expand-all
        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
    >
      <el-table-column label="机构名称" align="left" prop="name"/>
      <el-table-column label="机构编号" align="left" width="150" prop="code"/>
      <el-table-column label="机构名称" align="left" prop="name" show-overflow-tooltip/>
      <el-table-column label="机构编号" align="left" width="150" prop="code" show-overflow-tooltip/>
      <el-table-column label="显示顺序" width="80" align="center" prop="orderNum"/>
      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
src/views/construction/ai/index.vue
@@ -70,29 +70,29 @@
    <el-table v-loading="loading" :data="aiList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center"/>
      <el-table-column label="序号" type="index" align="center">
      <el-table-column label="序号" type="index" align="center" show-overflow-tooltip>
        <template slot-scope="scope">
          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" min-width="300" align="center" prop="deploymentName"/>
      <el-table-column label="部署名称" min-width="300" align="center" prop="deploymentName" show-overflow-tooltip/>
<!--      <el-table-column label="支持通道" align="center" prop="passageway">-->
<!--        <template slot-scope="scope">-->
<!--          <dict-tag :options="dict.type.DICT112" :value="scope.row.passageway"/>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="IP(LAN1)" width="130" align="center" prop="ipOne"/>
      <el-table-column label="IP(LAN1)" width="130" align="center" prop="ipOne" show-overflow-tooltip/>
<!--      <el-table-column label="LAN1" min-width="150" align="center" prop="lanOne"/>-->
<!--      <el-table-column label="LAN2" min-width="150" align="center" prop="lanTwo"/>-->
<!--      <el-table-column label="IP" width="130" align="center" prop="ipTwo"/>-->
      <el-table-column label="账户/密码" min-width="220" align="center" prop="loginAccount"/>
      <el-table-column label="账户/密码" min-width="220" align="center" prop="loginAccount" show-overflow-tooltip/>
<!--      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>-->
<!--      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
      <el-table-column label="序列号" min-width="150" align="center" prop="serialNumber"/>
      <el-table-column label="序列号" min-width="150" align="center" prop="serialNumber" show-overflow-tooltip/>
<!--      <el-table-column label="型号" min-width="120" align="center" prop="model"/>-->
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="安装位置" min-width="240" align="center" prop="buildingId_dictText"/>
      <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/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
src/views/construction/constructionBatch/index.vue
@@ -55,15 +55,15 @@
          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
        </template>
      </el-table-column>
      <el-table-column label="施工批次" align="center" prop="batch" />
      <el-table-column label="施工周期" align="center" width="180">
      <el-table-column label="施工批次" align="center" prop="batch" show-overflow-tooltip />
      <el-table-column label="施工周期" align="center" width="180" show-overflow-tooltip>
        <template slot-scope="scope">
          <span>{{ scope.row.startDate + ' - ' + scope.row.endDate }}</span>
        </template>
      </el-table-column>
      <el-table-column label="负责人" align="center" prop="userId_dictText" />
      <el-table-column label="团队成员" align="center" prop="teamMembers" />
      <el-table-column label="备注" align="center" prop="remarks" />
      <el-table-column label="负责人" align="center" prop="userId_dictText" show-overflow-tooltip />
      <el-table-column label="团队成员" align="center" prop="teamMembers" show-overflow-tooltip />
      <el-table-column label="备注" align="center" prop="remarks" show-overflow-tooltip />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -122,7 +122,7 @@
          <el-input v-model="form.teamMembers" type="textarea" rows="4" maxlength="64" show-word-limit placeholder="请输入团队成员" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" rows="10" maxlength="512" show-word-limit placeholder="请输入内容" />
          <el-input v-model="form.remarks" type="textarea" rows="4" maxlength="512" show-word-limit placeholder="请输入内容" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
src/views/construction/exchange/index.vue
@@ -115,29 +115,29 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="网络端口" align="center" prop="networkPort">
      <el-table-column label="网络端口" align="center" prop="networkPort" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort"/>
          <dict-tag :options="dict.type.DICT113" :value="scope.row.networkPort" show-overflow-tooltip/>
        </template>
      </el-table-column>
      <el-table-column label="指标A" align="center" prop="idnexA">
      <el-table-column label="指标A" align="center" prop="idnexA" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA"/>
          <dict-tag :options="dict.type.DICT114" :value="scope.row.idnexA" show-overflow-tooltip/>
        </template>
      </el-table-column>
      <el-table-column label="级联端口" align="center" prop="cascadePort">
      <el-table-column label="级联端口" align="center" prop="cascadePort" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort"/>
          <dict-tag :options="dict.type.DICT113" :value="scope.row.cascadePort" show-overflow-tooltip/>
        </template>
      </el-table-column>
      <el-table-column label="指标B" align="center" prop="indexB">
      <el-table-column label="指标B" align="center" prop="indexB" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT114" :value="scope.row.indexB"/>
        </template>
      </el-table-column>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="安装位置" min-width="180" align="center" prop="buildingId_dictText"/>
      <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="180" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<!--      <el-table-column label="具体位置" min-width="220" align="center" prop="address"/>-->
<!--      <el-table-column label="所属单位" min-width="180" align="center" prop="organizationId_dictText"/>-->
<!--      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
@@ -244,7 +244,7 @@
          <building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="8" placeholder="请输入具体位置""/>
          <el-input v-model="form.address" maxlength="512" show-word-limit type="textarea" :rows="3" placeholder="请输入具体位置""/>
        </el-form-item>
        <el-form-item label="所属单位" prop="organizationId">
          <organization v-if="open" v-model="form.organizationId" :schoolId="schoolId"></organization>
src/views/construction/iot/index.vue
@@ -107,18 +107,18 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" align="center" min-width="300" prop="deploymentName"/>
      <el-table-column label="版本" align="center" prop="edition">
      <el-table-column label="部署名称" align="center" min-width="300" prop="deploymentName" show-overflow-tooltip/>
      <el-table-column label="版本" align="center" prop="edition" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT110" :value="scope.row.edition"/>
        </template>
      </el-table-column>
<!--      <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>-->
      <el-table-column label="IP" align="center" min-width="130" prop="ip"/>
      <el-table-column label="监控对象" align="center" min-width="220" prop="monitorObject"/>
      <el-table-column label="序列号" align="center" min-width="220" prop="serialNumber"/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText"/>
      <el-table-column label="安装位置" min-width="240" align="center" prop="buildingId_dictText"/>
      <el-table-column label="IP" align="center" min-width="130" prop="ip" show-overflow-tooltip/>
      <el-table-column label="监控对象" align="center" min-width="220" prop="monitorObject" show-overflow-tooltip/>
      <el-table-column label="序列号" align="center" min-width="220" prop="serialNumber" show-overflow-tooltip/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="安装位置" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<!--      <el-table-column label="通道1" align="center" min-width="180" prop="passagewayOne_dictText"/>-->
<!--      <el-table-column label="通道2" align="center" min-width="180" prop="passagewayTwo_dictText"/>-->
<!--      <el-table-column label="通道3" align="center" min-width="180" prop="passagewayThree_dictText"/>-->
@@ -245,7 +245,7 @@
          </el-col>
        </el-row>
        <el-form-item label="监控对象" prop="monitorObject">
          <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="8" placeholder="请输入内容"/>
          <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="3" placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
src/views/construction/ipc/index.vue
@@ -73,18 +73,18 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="MAC" min-width="150" align="center" prop="mac"/>
      <el-table-column label="IP" width="130" align="center" prop="ip"/>
      <el-table-column label="账户/密码" min-width="180" align="center" prop="loginAccount"/>
      <el-table-column label="NVR" align="center" min-width="150" prop="nvrId_dictText">
      <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>
        <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"/>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="安装位置" min-width="240" align="center" prop="buildingId_dictText"/>
      <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/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
src/views/construction/nvr/index.vue
@@ -80,20 +80,20 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" min-width="240" align="center" prop="deploymentName"/>
      <el-table-column label="通道(路)" width="120" align="center" prop="passageway_dictText"/>
      <el-table-column label="部署名称" min-width="240" align="center" prop="deploymentName" show-overflow-tooltip/>
      <el-table-column label="通道(路)" width="120" align="center" prop="passageway_dictText" show-overflow-tooltip/>
<!--      <el-table-column label="LAN1" align="center" width="150" prop="lanOne"/>-->
<!--      <el-table-column label="IP" align="center" width="130" prop="ipOne"/>-->
<!--      <el-table-column label="安装位置" align="center" min-width="240" prop="buildingId_dictText"/>-->
<!--      <el-table-column label="所属单位" align="center" min-width="200" prop="organizationId_dictText"/>-->
<!--      <el-table-column label="施工批次" align="center" prop="constructionBatchId_dictText"/>-->
<!--      <el-table-column label="型号" align="center" min-width="180" prop="model"/>-->
      <el-table-column label="IP(LAN2)" align="center" width="130" prop="ipTwo"/>
      <el-table-column label="IP(LAN2)" align="center" width="130" prop="ipTwo" show-overflow-tooltip/>
<!--      <el-table-column label="LAN2" align="center" min-width="150" prop="lanTwo"/>-->
      <el-table-column label="账户/密码" align="center" min-width="180" prop="loginAccount"/>
      <el-table-column label="序列号" min-width="220" align="center" prop="serialNumber"/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText"/>
      <el-table-column label="硬盘" align="center" min-width="120" prop="hardDisk"/>
      <el-table-column label="账户/密码" align="center" min-width="180" prop="loginAccount" show-overflow-tooltip/>
      <el-table-column label="序列号" min-width="220" align="center" prop="serialNumber" show-overflow-tooltip/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="硬盘" align="center" min-width="120" prop="hardDisk" show-overflow-tooltip/>
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
src/views/construction/reserveIp/index.vue
@@ -61,15 +61,15 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="IP地址" align="center" prop="ip"/>
      <el-table-column label="MAC地址" align="center" prop="mac"/>
      <el-table-column label="适用地点" align="center" prop="buildingId_dictText"/>
      <el-table-column label="申请日期" align="center" prop="applicationDate" width="180">
      <el-table-column label="IP地址" align="center" prop="ip" show-overflow-tooltip/>
      <el-table-column label="MAC地址" align="center" prop="mac" show-overflow-tooltip/>
      <el-table-column label="适用地点" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
      <el-table-column label="申请日期" align="center" prop="applicationDate" width="180" show-overflow-tooltip>
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
      <el-table-column label="备注" align="center" prop="remarks" show-overflow-tooltip/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -122,7 +122,7 @@
          </el-date-picker>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" :rows="10" maxlength="512" show-word-limit
          <el-input v-model="form.remarks" type="textarea" :rows="4" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
src/views/construction/server/index.vue
@@ -75,18 +75,18 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="部署名称" min-width="300" align="center" prop="deploymentName"/>
      <el-table-column label="操作系统" align="center" min-width="180" prop="operatingSystem">
      <el-table-column label="部署名称" min-width="300" align="center" prop="deploymentName" show-overflow-tooltip/>
      <el-table-column label="操作系统" align="center" min-width="180" prop="operatingSystem" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
        </template>
      </el-table-column>
<!--      <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>-->
      <el-table-column label="IP" align="center" prop="ip" min-width="130"/>
      <el-table-column label="账号/密码" align="center" width="220" prop="account"/>
      <el-table-column label="序列号" align="center" min-width="240" prop="serialNumber"/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText"/>
      <el-table-column label="备注" align="center" min-width="220" prop="remarks"/>
      <el-table-column label="IP" align="center" prop="ip" min-width="130" show-overflow-tooltip/>
      <el-table-column label="账号/密码" align="center" width="220" prop="account" show-overflow-tooltip/>
      <el-table-column label="序列号" align="center" min-width="240" prop="serialNumber" show-overflow-tooltip/>
      <el-table-column label="生产厂商" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="备注" align="center" min-width="220" prop="remarks" show-overflow-tooltip/>
<!--      <el-table-column label="部署位置" align="center" min-width="180" prop="buildingId_dictText"/>-->
<!--      <el-table-column label="机柜号" align="center" prop="cabinetNumber"/>-->
<!--      <el-table-column label="机架号" align="center" prop="rackNumber"/>-->
@@ -212,11 +212,11 @@
          </el-col>
        </el-row>
        <el-form-item label="性能指标" prop="performanceIndex">
          <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="512" show-word-limit
          <el-input v-model="form.performanceIndex" type="textarea" :rows="3" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
          <el-input v-model="form.remarks" type="textarea" :rows="3" maxlength="512" show-word-limit
                    placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
src/views/construction/system/index.vue
@@ -70,17 +70,17 @@
          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
        </template>
      </el-table-column>
      <el-table-column label="软件名称" align="center" min-width="180" prop="name"/>
      <el-table-column label="版本" min-width="180" align="center" prop="edition"/>
      <el-table-column label="授权方式" min-width="180" align="center" prop="authorizationMethod_dictText"/>
      <el-table-column label="授权数量" min-width="180" align="center" prop="authorizedQuantity"/>
      <el-table-column label="载体服务器" align="center" width="180" prop="serverId_dictText">
      <el-table-column label="软件名称" align="center" min-width="180" prop="name" show-overflow-tooltip/>
      <el-table-column label="版本" min-width="180" align="center" prop="edition" show-overflow-tooltip/>
      <el-table-column label="授权方式" min-width="180" align="center" prop="authorizationMethod_dictText" show-overflow-tooltip/>
      <el-table-column label="授权数量" min-width="180" align="center" prop="authorizedQuantity" show-overflow-tooltip/>
      <el-table-column label="载体服务器" align="center" width="180" prop="serverId_dictText" show-overflow-tooltip>
        <template slot-scope="scope">
          <el-link type="primary" @click="serverClick(scope.row)">{{scope.row.serverId_dictText}}</el-link>
        </template>
      </el-table-column>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="功能描述" min-width="180" align="center" prop="functionDescription"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
      <el-table-column label="功能描述" min-width="180" align="center" prop="functionDescription" show-overflow-tooltip/>
<!--      <el-table-column label="施工批次" min-width="180" align="center" prop="constructionBatchId_dictText"/>-->
<!--      <el-table-column label="备注" align="center" min-width="180" prop="remarks"/>-->
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
@@ -142,7 +142,7 @@
          </el-col>
        </el-row>
        <el-form-item label="功能描述" prop="functionDescription">
          <el-input v-model="form.functionDescription" :rows="8" maxlength="512" show-word-limit type="textarea"
          <el-input v-model="form.functionDescription" :rows="3" maxlength="512" show-word-limit type="textarea"
                    placeholder="请输入内容"/>
        </el-form-item>
        <el-row>
@@ -193,7 +193,7 @@
          <el-input v-model="form.address" maxlength="512" show-word-limit placeholder="请输入内容"/>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="请输入内容"/>
          <el-input v-model="form.remarks" :rows="3" maxlength="512" show-word-limit type="textarea" placeholder="请输入内容"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
src/views/device/batch/index.vue
@@ -75,7 +75,7 @@
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="生产批次" align="center" prop="batch" />
      <el-table-column label="生产批次" align="center" prop="batch" show-overflow-tooltip/>
      <el-table-column label="下单日期" align="center" prop="orderDate" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.orderDate, '{y}-{m}-{d}') }}</span>
src/views/device/equipment/index.vue
@@ -139,19 +139,19 @@
          {{formatZero(scope.row.serialNumber, 4)}}
        </template>
      </el-table-column>
      <el-table-column label="设备类型" min-width="120" align="center" prop="type_dictText"/>
      <el-table-column label="硬件序列码" min-width="120" align="center" prop="sequenceCode" show-overflow-tooltip/>
      <el-table-column label="设备类型" min-width="120" align="center" prop="type_dictText" show-overflow-tooltip/>
      <el-table-column label="硬件序列码" min-width="180" align="center" prop="sequenceCode" show-overflow-tooltip/>
      <el-table-column label="软件版本" align="center" min-width="120" prop="edition" show-overflow-tooltip/>
      <el-table-column label="学校名称" align="center" prop="schoolId_dictText" show-overflow-tooltip/>
      <el-table-column label="主机ID" align="center" min-width="120" prop="hostId"/>
      <el-table-column label="β网络ID" align="center" prop="networkId"/>
      <el-table-column label="β工作频段" align="center" prop="frequencyBand">
      <el-table-column label="主机ID" align="center" min-width="120" prop="hostId" show-overflow-tooltip/>
      <el-table-column label="β网络ID" align="center" prop="networkId" show-overflow-tooltip/>
      <el-table-column label="β工作频段" align="center" prop="frequencyBand" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT102" :value="scope.row.frequencyBand"/>
        </template>
      </el-table-column>
      <el-table-column label="生产批次" align="center" prop="batchId_dictText"/>
      <el-table-column label="在用" align="center" prop="useStatus">
      <el-table-column label="生产批次" min-width="150" align="center" prop="batchId_dictText" show-overflow-tooltip/>
      <el-table-column label="在用" align="center" prop="useStatus" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT104" :value="scope.row.useStatus"/>
        </template>
src/views/device/peripheralUnit/index.vue
@@ -119,19 +119,19 @@
          <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="厂商代码" width="100" align="center" prop="vendorCode_dictText"/>
      <el-table-column label="波特率" width="100" align="center" prop="baudRate">
      <el-table-column label="外设代码" width="80" align="center" prop="code" show-overflow-tooltip/>
      <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" show-overflow-tooltip/>
      <el-table-column label="生产厂商" align="center" prop="manufacturer_dictText" min-width="200" show-overflow-tooltip/>
      <el-table-column label="厂商代码" width="100" align="center" prop="vendorCode_dictText" show-overflow-tooltip/>
      <el-table-column label="波特率" width="100" align="center" prop="baudRate" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
        </template>
      </el-table-column>
      <el-table-column label="问询指令" align="center" width="220" prop="readInstruction"/>
      <el-table-column label="指令长度" width="80" align="center" prop="orderLength"/>
      <el-table-column label="返回长度" width="80" align="center" prop="loopLength"/>
      <el-table-column label="问询指令" align="center" width="220" prop="readInstruction" show-overflow-tooltip/>
      <el-table-column label="指令长度" width="80" align="center" prop="orderLength" show-overflow-tooltip/>
      <el-table-column label="返回长度" width="80" align="center" prop="loopLength" show-overflow-tooltip/>
<!--      <el-table-column label="解析说明" align="center" min-width="300" show-overflow-tooltip prop="description"/>-->
      <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
        <template slot-scope="scope">
src/views/monitor/logininfor/index.vue
@@ -97,13 +97,13 @@
      <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
      <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
      <el-table-column label="操作系统" width="180" align="center" prop="os" />
      <el-table-column label="操作系统" width="180" align="center" prop="os" show-overflow-tooltip/>
      <el-table-column label="登录状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column label="操作信息" align="center" prop="msg" />
      <el-table-column label="操作信息" align="center" prop="msg" show-overflow-tooltip/>
      <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.loginTime) }}</span>