Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-20 e1a0d9a35c8d91db02d1123ea1f6d4538b7c27fe

 src/views/system/car/index.vue

@@ -34,14 +34,27 @@
      </el-row>
    </el-card>

    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="设备名称" prop="name">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          placeholder="请输入关键字"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="地区" prop="onState">
        <el-select
          v-model="queryParams.address"
          placeholder="地区"
          clearable
        >
        <el-option label="自贡市" value="自贡市"/>
        <el-option label="沿滩区" value="沿滩区"/>
        <el-option label="大安区" value="大安区"/>
        <el-option label="贡井区" value="贡井区"/>
        <el-option label="自流井区" value="自流井区"/>
        </el-select>
      </el-form-item>
      <el-form-item label="设备状态" prop="onState">
        <el-select
@@ -94,34 +107,34 @@
    </el-row>

    <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="设备编码" align="center" prop="serialNumber" width="180px"/>
      <el-table-column label="设备名称" align="center" prop="name" />
      <el-table-column label="上报部门" align="center" prop="deptName" />
      <el-table-column type="selection" align="center" />
      <el-table-column label="设备名称" align="center" prop="name" width="280" fixed/>
      <el-table-column label="设备编码" align="center" prop="serialNumber" width="180"/>
      <el-table-column label="区域" align="center" prop="address" width="180"/>
      <el-table-column label="标签" align="center" prop="publicSecurity" width="180"/>
      <el-table-column label="设备状态" align="center" prop="onState">
      <template slot-scope="scope">
        <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
      </template>
      </el-table-column>
      <el-table-column label="地址" align="center" prop="address" />
      <el-table-column label="是否生成异常工单" align="center" prop="defaultOrder">
        <template slot-scope="scope">
            <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
        </template>
      <el-table-column label="是否生成异常工单" align="center" prop="defaultOrder" width="180">
      <template slot-scope="scope">
        <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
      </template>
      </el-table-column>
      <el-table-column label="异常原因" align="center" prop="reason" />
      <el-table-column label="数据时间" align="center" prop="installedTime" width="180">
      </el-table-column>
      <el-table-column label="管理单位" align="center" prop="managementUnit" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="handleView(scope.row,scope.index)"
          >详细</el-button>
        </template>
      <el-table-column label="数据时间" align="center" prop="installedTime" width="180"/>
      <el-table-column label="管理单位" align="center" prop="managementUnit" width="180"/>
      <el-table-column label="过车数据量" align="center" prop="model" width="180"/>
      <el-table-column label="持续无数据天数" align="center" prop="recovery" width="180"/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right">
          <template slot-scope="scope">
            <el-button
              size="mini"
              type="text"
              icon="el-icon-view"
              @click="handleView(scope.row,scope.index)"
            >详细</el-button>
          </template>
      </el-table-column>
    </el-table>

@@ -140,6 +153,7 @@
          <el-col :span="12">
            <el-form-item label="设备编码：">{{ form.serialNumber }}</el-form-item>
            <el-form-item label="设备名称：">{{ form.name }} </el-form-item>
            <el-form-item label="地区：">{{ form.address }} </el-form-item>
            <el-form-item label="上报部门：">{{ form.deptName }} </el-form-item>
            <el-form-item label="设备状态：">
              <div v-if="form.onState === 1">可用</div>
@@ -155,14 +169,17 @@
            </el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="异常原因：">{{ form.reason }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="安装时间：">{{ form.installedTime }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="管理单位：">{{ form.managementUnit }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="过车数据量：">{{ form.model }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="持续无数据天数：">{{ form.recovery }}</el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">