From aa5f299a1e580ac67662c1c6495257f4aa3bba01 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 9 Aug 2024 17:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=A2=86=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/bracelet/index.vue             |  15 +-
 src/views/base/device/index.vue               |  10 +-
 src/views/base/project/index.vue              |  18 +-
 .../constructionRecord/index.vue              |  20 ++
 .../comprehensive/deviceLyRecord/index.vue    |   7 +-
 src/views/comprehensive/warnHistory/index.vue |   7 +-
 src/views/construction/sideband/index.vue     |   7 +-
 src/views/query/construction/index.vue        | 183 ------------------
 8 files changed, 65 insertions(+), 202 deletions(-)
 delete mode 100644 src/views/query/construction/index.vue

diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index 40eda70..5b81518 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -80,6 +80,11 @@
       </el-row>
   
       <el-table v-loading="loading" :data="braceletList">
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="手环id" align="center" prop="shId" v-if="false" />
         <el-table-column label="手环编码" align="center" prop="shCode" />
         <el-table-column label="所属手环箱" align="center" prop="shboxName" >
@@ -115,7 +120,7 @@
             </template>
           </el-table-column>
         <el-table-column label="使用人" align="center" prop="shPersonName" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -127,9 +132,10 @@
             <el-button
               size="mini"
               type="text"
+              icon="el-icon-circle-plus-outline"
               @click="handleAddAttribute(scope.row)"
               v-hasPermi="['basic:bracelet:edit']"
-            >新增设备属性</el-button>
+            >设备属性</el-button>
             <el-button
               size="mini"
               type="text"
@@ -424,6 +430,11 @@
   
       <el-table v-loading="loadingFive" :data="shboxallList" ref="multipleTable" row-key="shboxCode" @selection-change="handleSelectionChangeImag" @select="handlerSelect" @select-all="handlerSelectAll">
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryShbox.pageNum - 1) * queryShbox.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="手环箱id" align="center" prop="shboxId" v-if="false" />
         <el-table-column label="手环箱名称" align="center" prop="shboxName" />
         <el-table-column label="手环箱编码" align="center" prop="shboxCode" />
diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue
index 60e4d5c..930db64 100644
--- a/src/views/base/device/index.vue
+++ b/src/views/base/device/index.vue
@@ -77,6 +77,11 @@
   
       <el-table v-loading="loading" :data="tableData" ref="multipleTable" row-key="deviceCode" @selection-change="handleSelectionChange" @select="handlerSelect" @select-all="handlerSelectAll">
         <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
         <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
           <!-- <template slot-scope="scope">
@@ -98,7 +103,7 @@
         </el-table-column>
         <el-table-column label="设备状态" align="center" prop="deviceStatus" >
           <template slot-scope="scope">
-              <div v-if="scope.row.deviceStatus==0" style="color: green;">{{ dict.type.sys_device_status[Number(scope.row.deviceStatus).label] }}</div>
+              <div v-if="scope.row.deviceStatus==0" style="color: green;">{{ dict.type.sys_device_status[Number(scope.row.deviceStatus)].label }}</div>
               <div v-if="scope.row.deviceStatus==1" style="color: red;">{{ dict.type.sys_device_status[Number(scope.row.deviceStatus)].label }}</div>
           </template>
         </el-table-column>
@@ -115,9 +120,10 @@
             <el-button
               size="mini"
               type="text"
+              icon="el-icon-circle-plus-outline"
               @click="handleAddAttribute(scope.row)"
               v-hasPermi="['basic:bracelet:edit']"
-            >新增设备属性</el-button>
+            >设备属性</el-button>
             <el-button
               size="mini"
               type="text"
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index 3e188af..02ccd48 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -35,17 +35,6 @@
           v-hasPermi="['bracelet:project:add']"
         >新增</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:post:edit']"
-        >修改</el-button>
-      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -72,6 +61,11 @@
 
     <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="项目部名称" align="center" prop="projectDepartName" />
       <el-table-column label="负责人" align="center" prop="projectHeadName" />
       <el-table-column label="电话" align="center" prop="contactInformation" />
@@ -83,7 +77,7 @@
         </template>
       </el-table-column>
       <!--  -->
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip='true'/>
       <el-table-column label="项目部Id" width="0"  prop="projectId" v-if="showName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
diff --git a/src/views/comprehensive/constructionRecord/index.vue b/src/views/comprehensive/constructionRecord/index.vue
index d7e493a..7d38abf 100644
--- a/src/views/comprehensive/constructionRecord/index.vue
+++ b/src/views/comprehensive/constructionRecord/index.vue
@@ -58,6 +58,11 @@
     </el-row>
 
     <el-table v-loading="loading" :data="constructionList" >
+      <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="工程名称" align="center" prop="proName" />
       <el-table-column label="项目部名称" align="center" prop="departName" />
       <el-table-column label="施工班组" align="center" prop="teamName" />
@@ -128,6 +133,11 @@
         </el-form>
 
       <el-table v-loading="loadingTwo" :data="teamList" width="600px" height = "600px" >
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryTeam.pageNum - 1) * queryTeam.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="人员id" align="center" prop="id" v-if="false" />
         <el-table-column label="姓名" align="center" prop="name" />
         <el-table-column label="性别" align="center" prop="sex" >
@@ -190,6 +200,11 @@
         </el-form>
 
       <el-table v-loading="loadingThree" :data="teamTempList" width="600px" height = "600px" >
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryTeamTemp.pageNum - 1) * queryTeamTemp.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="人员id" align="center" prop="id" v-if="false" />
         <el-table-column label="姓名" align="center" prop="name" />
         <el-table-column label="性别" align="center" prop="sex" >
@@ -225,6 +240,11 @@
       <!-- 查看施工预警信息弹窗 -->
       <el-dialog :title="title" :visible.sync="showWarn" width="1000px" height="1000px" append-to-body>
       <el-table v-loading="loadingTwo" :data="warnList" width="600px" height = "600px" >
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryWarn.pageNum - 1) * queryWarn.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="预警设备" align="center" prop="devTypeName" />
         <el-table-column label="设备名称" align="center" prop="devName" />
         <el-table-column label="预警时间" align="center" prop="warnTime" />
diff --git a/src/views/comprehensive/deviceLyRecord/index.vue b/src/views/comprehensive/deviceLyRecord/index.vue
index d450faf..2dccc86 100644
--- a/src/views/comprehensive/deviceLyRecord/index.vue
+++ b/src/views/comprehensive/deviceLyRecord/index.vue
@@ -96,6 +96,11 @@
     </el-row>
 
     <el-table v-loading="loading" :data="tableData">
+      <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="工程名称" align="center" prop="proName" />
         <el-table-column label="项目部名称" align="center" prop="departName" />
         <el-table-column label="领用班组" align="center" prop="teamName" />
@@ -118,7 +123,7 @@
             <span v-else>{{ scope.row.ghTime }}</span>
           </template>
         </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip='true'/>
       </el-table>
   
       <pagination
diff --git a/src/views/comprehensive/warnHistory/index.vue b/src/views/comprehensive/warnHistory/index.vue
index eadb8e0..51c3c06 100644
--- a/src/views/comprehensive/warnHistory/index.vue
+++ b/src/views/comprehensive/warnHistory/index.vue
@@ -60,10 +60,15 @@
     </el-row>
 
     <el-table v-loading="loading" :data="tableData" width="600px" height = "600px" >
+      <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="预警设备" align="center" prop="devTypeName" />
         <el-table-column label="设备名称" align="center" prop="devName" />
         <el-table-column label="预警时间" align="center" prop="warnTime" />
-        <el-table-column label="预警内容" align="center" prop="warnContent" />
+        <el-table-column label="预警内容" align="center" prop="warnContent" :show-overflow-tooltip='true'/>
       </el-table>
   
       <pagination
diff --git a/src/views/construction/sideband/index.vue b/src/views/construction/sideband/index.vue
index 7ce3398..0ac1c73 100644
--- a/src/views/construction/sideband/index.vue
+++ b/src/views/construction/sideband/index.vue
@@ -69,6 +69,11 @@
       </el-row>
   
       <el-table v-loading="loading" :data="postList" >
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="边带id" align="center" prop="sidebandId" v-if="false" />
         <el-table-column label="边带名称" align="center" prop="sidebandName" />
         <el-table-column label="边带编码" align="center" prop="sidebandCode" />
@@ -82,7 +87,7 @@
             </div>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip='true'/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/query/construction/index.vue b/src/views/query/construction/index.vue
deleted file mode 100644
index 1099bf2..0000000
--- a/src/views/query/construction/index.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item  prop="proname">
-      <el-input
-          v-model="queryParams.proname"
-          placeholder="工程名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />   
-      </el-form-item>
-      <el-form-item  prop="departname">
-        <el-input
-          v-model="queryParams.departname"
-          placeholder="项目部"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item  prop="teamname">
-        <el-input
-          v-model="queryParams.teamname"
-          placeholder="施工班组"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item prop="lytime">
-      <el-date-picker
-      v-model="queryParams.lytime"
-      value-format="yyyy-MM-dd"
-      type="date"
-      placeholder="施工时间"
-      clearable
-      @keyup.enter.native="handleQuery"
-      >
-    </el-date-picker>
-  </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>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['bracelet:construction:export']"
-        >导出数据</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="constructionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="工程名称" align="center" prop="proname" />
-      <el-table-column label="项目部名称" align="center" prop="departname" />
-      <el-table-column label="施工班组" align="center" prop="teamname" />
-      <el-table-column label="班组负责人" align="center" prop="teamleader" />
-      <el-table-column label="班组施工人数" align="center" prop="teamnum" />
-      <el-table-column label="临时人数" align="center" prop="tempnum" />
-      <el-table-column label="施工时间" align="center" prop="lytime" />
-      <el-table-column label="施工预警次数" align="center" prop="warnnum" />
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-
-  </div>
-</template> 
-
-<script>
-import { listConstruction } from "@/api/query/construction";
-
-export default {
-  name: "Construction",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-
-      // 是否显示项目部Id
-      showName: false,
-
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 施工记录表格数据
-      constructionList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        proname: undefined,
-        departname: undefined,
-        teamname: undefined,
-        lytime: undefined,
-      },
-      // 表单参数
-      form: {},
-
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询岗位列表 */
-    getList() {
-      this.loading = true;
-      listConstruction(this.queryParams).then(response => {
-        this.constructionList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    // cancel() {
-    //   this.open = false;
-    //   this.reset();
-    // },
-    // 表单重置
-    // reset() {
-    //   this.form = {
-    //     appnum: undefined,
-    //     projectDepartName: undefined,
-    //     projectHeadName: undefined,
-    //     contactInformation: undefined,
-    //     projectHeadName: undefined,
-    //     remarks: undefined
-    //   };
-    //   this.resetForm("form");
-    // },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.projectId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
- 
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('bracelet/construction/export', {
-        ...this.queryParams
-      }, `施工记录_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
\ No newline at end of file