Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 admin/src/views/operation/components/deviceDetail.vue

@@ -143,10 +143,12 @@
        border
        style="width: 100%">
        <el-table-column
          :key="Date.now()"
          prop="realName"
          label="运维人员">
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          label="设备状态">
          <template slot-scope="{row}">
            <span v-if="row.status === 0">正常</span>
@@ -155,14 +157,17 @@
          </template>
        </el-table-column>
        <el-table-column
          prop="remark"
          :key="Date.now()"
          prop="content"
          label="运维备注">
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          prop="dealDate"
          label="运维时间">
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          label="操作">
          <template slot-scope="{row}">
            <el-button type="text" @click="handleDetail(row)">查看详情</el-button>
@@ -185,24 +190,34 @@
        border
        style="width: 100%">
        <el-table-column
          :key="Date.now()"
          prop="schemeTitle"
          label="计划名称">
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          prop="taskCode"
          label="任务编号">
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          label="任务时间">
          <template slot-scope="{row}">
            {{row.startDate}} ~ {{row.endDate}}
          </template>
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          prop="realname"
          label="巡检人">
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          prop="dealDate"
          label="巡检时间">
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          label="巡检结果">
          <template slot-scope="{row}">
            <span v-if="row.dealStatus === 0">正常</span>
@@ -210,6 +225,7 @@
          </template>
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          label="巡检附件">
          <template slot-scope="{row}">
            <el-image
@@ -221,6 +237,7 @@
          </template>
        </el-table-column>
        <el-table-column
          :key="Date.now()"
          prop="content"
          label="巡检说明">
        </el-table-column>
@@ -284,7 +301,7 @@
      }
    },
    getDetail() {
      this.this.activeTabs = 0
      this.activeTabs = 0
      const { id } = this
      detailById(id).then(res => {
        this.info = res
@@ -328,6 +345,7 @@
        capacity: this.pageSize,
        page: this.page,
        model: {
          status: 1,
          deviceId: this.id
        }
      }).then(res => {