BUG修改

liuchengxin

2022-05-23 1c01e669cca92f94eea5d1a73ff60f3bd34b9079

BUG修改

 src/assets/styles/custom.scss

@@ -0,0 +1,21 @@
/*滚动条样式*/
::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色，还可以设置边框属性
  background-color:#f8f8f8;
}
::-webkit-scrollbar {//滚动条的宽度
  width:6px;
  height:6px;
}
::-webkit-scrollbar-thumb {//滚动条的设置
  background-color:#dddddd;
  background-clip:padding-box;
  min-height:28px;
}
::-webkit-scrollbar-thumb:hover {
  background-color:#bbb;
}
.show-more-search {
  display: flex;
  flex-direction: row;
  align-items: center;
}

 src/views/components/building/buildList.vue

@@ -27,7 +27,7 @@
        highlight-current-row
        @current-change="handleCurrentChange"
    >
      <el-table-column label="单元名称" align="center" prop="name"/>
      <el-table-column label="单元名称" align="left" prop="name"/>
      <el-table-column label="单元编号" prop="code"/>
      <el-table-column label="显示顺序" align="center" prop="orderNum"/>
    </el-table>

 src/views/components/organization/organizationList.vue

@@ -26,7 +26,8 @@
        highlight-current-row
        @current-change="handleCurrentChange"
    >
      <el-table-column label="机构名称" align="center" prop="name"/>
      <el-table-column label="机构名称" align="left" prop="name"/>
      <el-table-column label="机构名称" align="left" prop="name"/>
      <el-table-column label="机构编号" prop="code"/>
      <el-table-column label="显示顺序" align="center" prop="orderNum"/>
    </el-table>

 src/views/components/showMore/index.vue

New file
@@ -0,0 +1,27 @@
<template>
  <div style="margin-right: 10px; color:#1890ff; cursor: pointer; user-select：none;" @click="moreToggle">
    <span style="margin-right: 5px">{{ showMore ? '收起' : '展开'}}</span>
    <i :class="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" style="font-size: 16px;"></i>
  </div>
</template>

<script>
export default {
  name: 'show-more',
  data () {
    return {
      showMore: false
    }
  },
  methods: {
    moreToggle () {
      this.showMore = !this.showMore
      this.$emit('update:showMoreCondition', this.showMore)
    },
  }
}
</script>

<style scoped>

</style>

 src/views/construction/ai/index.vue

@@ -10,21 +10,26 @@
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="型号" prop="model">
        <el-input
      <template v-if="showMoreCondition">
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturerId">
        <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
      </el-form-item>
          />
        </el-form-item>
        <el-form-item label="生产厂商" prop="manufacturerId">
          <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
        </el-form-item>
      </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -212,6 +217,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
import ShowMore from "@/views/components/showMore";

export default {
  name: "Ai",
@@ -227,7 +233,8 @@
    organization,
    constructionBatch,
    manufacturer,
    nvr
    nvr,
    ShowMore
  },
  data() {
    return {
@@ -314,7 +321,8 @@
          {required: true, message: "施工批次不能为空", trigger: "blur"}
        ],
      },
      disabled: false
      disabled: false,
      showMoreCondition: false
    };
  },
  created() {

 src/views/construction/constructionBatch/index.vue

@@ -99,6 +99,7 @@
        </el-form-item>
        <el-form-item label="施工周期" prop="date">
          <el-date-picker
              style="width: 100%"
              v-model="form.date"
              type="daterange"
              value-format="yyyy-MM-dd"
@@ -108,7 +109,7 @@
          </el-date-picker>
        </el-form-item>
        <el-form-item label="负责人" prop="userId">
          <el-select v-model="form.userId" filterable placeholder="请选择负责人">
          <el-select v-model="form.userId" style="width: 100%" filterable placeholder="请选择负责人">
            <el-option
                v-for="item in userList"
                :key="item.userId"

 src/views/construction/exchange/index.vue

@@ -10,61 +10,66 @@
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="型号" prop="model">
        <el-input
      <template v-if="showMoreCondition">
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturerId">
        <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
      </el-form-item>
      <el-form-item label="网络端口" prop="networkPort">
        <el-select v-model="queryParams.networkPort" placeholder="请选择网络端口" clearable size="small">
          <el-option
          />
        </el-form-item>
        <el-form-item label="生产厂商" prop="manufacturerId">
          <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
        </el-form-item>
        <el-form-item label="网络端口" prop="networkPort">
          <el-select v-model="queryParams.networkPort" placeholder="请选择网络端口" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT113"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="指标A" prop="idnexA">
        <el-select v-model="queryParams.idnexA" placeholder="请选择指标A" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="指标A" prop="idnexA">
          <el-select v-model="queryParams.idnexA" placeholder="请选择指标A" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT114"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="级联端口" prop="cascadePort">
        <el-select v-model="queryParams.cascadePort" placeholder="请选择级联端口" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="级联端口" prop="cascadePort">
          <el-select v-model="queryParams.cascadePort" placeholder="请选择级联端口" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT113"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="指标B" prop="indexB">
        <el-select v-model="queryParams.indexB" placeholder="请选择指标B" clearable size="small">
          <el-option
            />
          </el-select>
        </el-form-item>
        <el-form-item label="指标B" prop="indexB">
          <el-select v-model="queryParams.indexB" placeholder="请选择指标B" clearable size="small">
            <el-option
              v-for="dict in dict.type.DICT114"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
            />
          </el-select>
        </el-form-item>
      </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -291,6 +296,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
import ShowMore from "@/views/components/showMore";

export default {
  name: "Exchange",
@@ -300,7 +306,8 @@
    organization,
    constructionBatch,
    manufacturer,
    nvr
    nvr,
    ShowMore
  },
  props: {
    schoolId: {
@@ -378,7 +385,8 @@
        ],
      },
      disabled: false,
      fileOpen: false
      fileOpen: false,
      showMoreCondition: false
    };
  },
  created() {

 src/views/construction/iot/index.vue

@@ -23,40 +23,45 @@
      <el-form-item label="安装位置" prop="buildingId">
        <building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
      </el-form-item>
      <el-form-item label="所属单位" prop="organizationId">
        <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
      </el-form-item>
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="监控对象" prop="monitorObject">
        <el-input
            v-model="queryParams.monitorObject"
            placeholder="请输入监控对象"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="通道" prop="passageway">
        <el-select v-model="queryParams.passageway" placeholder="请选择通道" clearable size="small">
          <el-option
              v-for="dict in dict.type.DICT111"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="外设" prop="peripheralUnit">
        <peripheralUnit v-model="queryParams.peripheralUnit"></peripheralUnit>
      </el-form-item>
      <el-form-item label="外设数量">
        <el-input v-model="sum" disabled/>
      </el-form-item>
     <template v-if="showMoreCondition">
       <el-form-item label="所属单位" prop="organizationId">
         <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
       </el-form-item>
       <el-form-item label="施工批次" prop="constructionBatchId">
         <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
       </el-form-item>
       <el-form-item label="监控对象" prop="monitorObject">
         <el-input
           v-model="queryParams.monitorObject"
           placeholder="请输入监控对象"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="通道" prop="passageway">
         <el-select v-model="queryParams.passageway" placeholder="请选择通道" clearable size="small">
           <el-option
             v-for="dict in dict.type.DICT111"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="外设" prop="peripheralUnit">
         <peripheralUnit v-model="queryParams.peripheralUnit"></peripheralUnit>
       </el-form-item>
       <el-form-item label="外设数量">
         <el-input v-model="sum" disabled/>
       </el-form-item>
     </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -258,6 +263,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import peripheralUnit from '../../components/peripheralUnit'
import ShowMore from "@/views/components/showMore";

export default {
  name: "Iot",
@@ -273,7 +279,8 @@
    organization,
    constructionBatch,
    manufacturer,
    peripheralUnit
    peripheralUnit,
    ShowMore
  },
  data() {
    return {
@@ -350,7 +357,8 @@
        ],
      },
      disabled: false,
      sum: undefined
      sum: undefined,
      showMoreCondition: false
    };
  },
  computed: {

 src/views/construction/ipc/index.vue

@@ -10,19 +10,24 @@
      <el-form-item label="所属单位" prop="organizationId">
        <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
      </el-form-item>
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="型号" prop="model">
        <el-input
      <template v-if="showMoreCondition">
        <el-form-item label="施工批次" prop="constructionBatchId">
          <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
        </el-form-item>
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
          />
        </el-form-item>
      </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -81,9 +86,9 @@
      <el-table-column label="安装位置" min-width="240" align="center" prop="buildingId_dictText"/>
      <el-table-column label="所属单位" min-width="200" align="center" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" min-width="120" align="center" 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="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="型号" min-width="180" align="center" prop="model"/>
      <el-table-column label="生产厂商" min-width="220" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -213,6 +218,7 @@
import manufacturer from "../../components/manufacturer";
import nvr from '../../components/nvr'
import nvrForm from '../../components/nvr/form'
import ShowMore from "@/views/components/showMore";

export default {
  name: "Ipc",
@@ -223,7 +229,8 @@
    constructionBatch,
    manufacturer,
    nvr,
    nvrForm
    nvrForm,
    ShowMore
  },
  props: {
    schoolId: {
@@ -305,7 +312,8 @@
      },
      disabled: false,
      nvrOpen: false,
      nvrId: undefined
      nvrId: undefined,
      showMoreCondition: false
    };
  },
  computed: {

 src/views/construction/nvr/index.vue

@@ -17,19 +17,24 @@
      <el-form-item label="所属单位" prop="organizationId">
        <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
      </el-form-item>
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="型号" prop="model">
        <el-input
      <template v-if="showMoreCondition">
        <el-form-item label="施工批次" prop="constructionBatchId">
          <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
        </el-form-item>
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
          />
        </el-form-item>
      </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -86,9 +91,9 @@
      <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" prop="serialNumber"/>
      <el-table-column label="型号" align="center" prop="model"/>
      <el-table-column label="生产厂商" align="center" prop="manufacturerId_dictText"/>
      <el-table-column label="序列号" min-width="180" align="center" prop="serialNumber"/>
      <el-table-column label="型号" align="center" min-width="180" prop="model"/>
      <el-table-column label="生产厂商" align="center" min-width="200" prop="manufacturerId_dictText"/>
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
@@ -242,6 +247,7 @@
import organization from '../../components/organization'
import constructionBatch from '../../components/constructionBatch'
import manufacturer from '../../components/manufacturer'
import ShowMore from "@/views/components/showMore";

export default {
  name: "Nvr",
@@ -250,7 +256,8 @@
    building,
    organization,
    constructionBatch,
    manufacturer
    manufacturer,
    ShowMore
  },
  props: {
    schoolId: {
@@ -355,7 +362,8 @@
        ]
      },
      disabled: false,
      fileOpen: false
      fileOpen: false,
      showMoreCondition: false
    };
  },
  watch: {

 src/views/construction/server/index.vue

@@ -10,21 +10,26 @@
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="型号" prop="model">
        <el-input
      <template v-if="showMoreCondition">
        <el-form-item label="型号" prop="model">
          <el-input
            v-model="queryParams.model"
            placeholder="请输入型号"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturerId">
        <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
      </el-form-item>
          />
        </el-form-item>
        <el-form-item label="生产厂商" prop="manufacturerId">
          <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
        </el-form-item>
      </template>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -84,11 +89,11 @@
      <el-table-column label="机架号" align="center" prop="rackNumber"/>
      <el-table-column label="所属单位" align="center" min-width="180" prop="organizationId_dictText"/>
      <el-table-column label="施工批次" align="center" min-width="180" prop="constructionBatchId_dictText"/>
      <el-table-column label="序列号" align="center" prop="serialNumber"/>
      <el-table-column label="序列号" align="center" min-width="180" prop="serialNumber"/>
      <el-table-column label="型号" align="center" min-width="180" prop="model"/>
      <el-table-column label="生产厂商" align="center" min-width="220" 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" min-width="120" prop="performanceIndex"/>
      <el-table-column label="备注" align="center" min-width="120" prop="remarks"/>
      <!--      <el-table-column label="附件" align="center" prop="filePath" />-->
      <el-table-column label="操作" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
        <template slot-scope="scope">
@@ -243,6 +248,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
import ShowMore from "@/views/components/showMore";

export default {
  name: "Server",
@@ -252,7 +258,8 @@
    organization,
    constructionBatch,
    manufacturer,
    nvr
    nvr,
    ShowMore
  },
  props: {
    schoolId: {
@@ -338,7 +345,8 @@
        ],
      },
      disabled: false,
      fileOpen: false
      fileOpen: false,
      showMoreCondition: false
    };
  },
  created() {

 src/views/construction/system/index.vue

@@ -16,12 +16,15 @@
      <el-form-item label="施工批次" prop="constructionBatchId">
        <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturerId">
      <el-form-item v-if="showMoreCondition" label="生产厂商" prop="manufacturerId">
        <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <div class="show-more-search">
          <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </div>
      </el-form-item>
    </el-form>

@@ -219,6 +222,7 @@
import nvr from "../../components/nvr";
import server from '../../components/server'
import serverForm from '../../components/server/form'
import ShowMore from "@/views/components/showMore";

export default {
  name: "System",
@@ -230,7 +234,8 @@
    manufacturer,
    nvr,
    server,
    serverForm
    serverForm,
    ShowMore
  },
  props: {
    schoolId: {
@@ -305,7 +310,8 @@
      disabled: false,
      fileOpen: false,
      serverOpen: false,
      serverId: undefined
      serverId: undefined,
      showMoreCondition: false
    };
  },
  created() {