From 7737de41241547c6db02488f43ac18823eaa81a5 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 19 Aug 2024 10:46:30 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/staff/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/base/staff/index.vue b/src/views/base/staff/index.vue
index 630dfd6..258872f 100644
--- a/src/views/base/staff/index.vue
+++ b/src/views/base/staff/index.vue
@@ -630,6 +630,9 @@
                     this.$modal.msgSuccess("修改成功");
                     this.open = false;
                     this.fileList=[];
+                    this.delHighFileIdList=[];
+                    this.delElectFileIdList=[];
+                    this.delElseFileIdList=[];
                     this.getList();
                   });
                 } else {
@@ -644,6 +647,9 @@
                     this.$modal.msgSuccess("新增成功");
                     this.open = false;
                     this.fileList=[];
+                    this.delHighFileIdList=[];
+                    this.delElectFileIdList=[];
+                    this.delElseFileIdList=[];
                     this.getList();
                   });
                 }

From c1dd1318eb3a3f00ca8f436fadf908aafcdda4f4 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 20 Aug 2024 15:13:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0pdf=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/download.js                         |  13 +
 src/views/base/bracelet/index.vue             |  35 +-
 src/views/base/device/index.vue               |  23 +-
 src/views/base/project/index.vue              |  10 +-
 src/views/base/staff/index.vue                | 302 ++++++++++++++----
 src/views/components/uploadFile.vue           |  22 +-
 .../constructionRecord/index.vue              |  40 +--
 .../comprehensive/deviceLyRecord/index.vue    |  14 +-
 src/views/comprehensive/warnHistory/index.vue |   8 +-
 src/views/construction/sideband/index.vue     |  12 +-
 10 files changed, 337 insertions(+), 142 deletions(-)

diff --git a/src/utils/download.js b/src/utils/download.js
index aba2d53..05324f4 100644
--- a/src/utils/download.js
+++ b/src/utils/download.js
@@ -24,3 +24,16 @@ export const downloadFileByUrl = (url) => {
   URL.revokeObjectURL(link.href)
   document.body.removeChild(link)
 }
+
+// pdf、doc、docx等文件下载
+export const downloadFileData = ({ fileName, fileUrl }) => {
+  const link = document.createElement('a')
+  link.setAttribute('download', '')
+  link.style.display = 'none'
+  link.href = fileUrl
+  link.download = fileName
+  document.body.appendChild(link)
+  link.click(); 
+  // URL.revokeObjectURL(link.href)
+  document.body.removeChild(link)
+}
\ No newline at end of file
diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index aa8f30e..2ea0072 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -87,8 +87,8 @@
         </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" >
+        <el-table-column label="手环编码" align="center" prop="shCode" sortable/>
+        <el-table-column label="所属手环箱" align="center" prop="shboxName" sortable>
         <template slot-scope="scope">
                 <div v-if="scope.row.shboxName!=boxName" >
                   {{ scope.row.shboxName }} 
@@ -114,13 +114,13 @@
                 </div>
               </template>
           </el-table-column>
-        <el-table-column label="手环状态" align="center" prop="shStatus" >
+        <el-table-column label="手环状态" align="center" prop="shStatus" sortable>
         <template slot-scope="scope">
                 <div v-if="scope.row.shStatus==0" style="color: green;">{{ stateList[Number(scope.row.shStatus)] }}</div>
                 <div v-if="scope.row.shStatus==1" style="color: red;">{{ stateList[Number(scope.row.shStatus)] }}</div>
             </template>
           </el-table-column>
-        <el-table-column label="使用人" align="center" prop="shPersonName" />
+        <el-table-column label="使用人" align="center" prop="shPersonName" sortable/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
           <template slot-scope="scope">
             <el-button
@@ -314,13 +314,18 @@
       </el-row>
 
       <el-table v-loading="loadingTwo" :data="deviceAttributeList " width="600px" height = "600px" >
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryDeviceAttribute.pageNum - 1) * queryDeviceAttribute.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
         <el-table-column label="设备id" align="center" prop="devId" v-if="false" />
-        <el-table-column label="设备属性名称" align="center" prop="dataName" />
-        <el-table-column label="设备采集值" align="center" prop="dataVal" />
-        <el-table-column label="设备值单位" align="center" prop="dataUnit" />
-        <el-table-column label="级联编码" align="center" prop="dataCode" />
-        <el-table-column label="数据类型" align="center" prop="dataType" />
-        <el-table-column label="数据采集时间" align="center" prop="dataTime" width="160px"/>
+        <el-table-column label="设备属性名称" align="center" prop="dataName" sortable/>
+        <el-table-column label="设备采集值" align="center" prop="dataVal" sortable/>
+        <el-table-column label="设备值单位" align="center" prop="dataUnit" sortable/>
+        <el-table-column label="级联编码" align="center" prop="dataCode" sortable/>
+        <el-table-column label="数据类型" align="center" prop="dataType" sortable/>
+        <el-table-column label="数据采集时间" align="center" prop="dataTime" width="160px" sortable/>
         <el-table-column label="设备属性图片" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -518,9 +523,9 @@
         </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" />
-        <el-table-column label="存放手环数量" align="center" prop="shboxBindNum" >
+        <el-table-column label="手环箱名称" align="center" prop="shboxName" sortable/>
+        <el-table-column label="手环箱编码" align="center" prop="shboxCode" sortable/>
+        <el-table-column label="存放手环数量" align="center" prop="shboxBindNum" sortable>
           <template slot-scope="scope">
             <div @click="openShall(scope.row)" style="color: #02a7f0; cursor: pointer">
               <div>
@@ -540,13 +545,13 @@
             >查看</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="手环箱状态" align="center" prop="shboxStatus" >
+        <el-table-column label="手环箱状态" align="center" prop="shboxStatus" sortable>
         <template slot-scope="scope">
                 <div v-if="scope.row.shboxStatus==0" style="color: green;">{{ stateList[Number(scope.row.shboxStatus)] }}</div>
                 <div v-if="scope.row.shboxStatus==1" style="color: red;">{{ stateList[Number(scope.row.shboxStatus)] }}</div>
             </template>
           </el-table-column>
-        <el-table-column label="领用人" align="center" prop="lyName" />
+        <el-table-column label="领用人" align="center" prop="lyName" sortable/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue
index 255501b..16f683a 100644
--- a/src/views/base/device/index.vue
+++ b/src/views/base/device/index.vue
@@ -83,13 +83,13 @@
         </template>
       </el-table-column>
         <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
-        <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
+        <el-table-column label="设备类型" align="center" prop="deviceTypeName" sortable/>
           <!-- <template slot-scope="scope">
               <div>{{ dict.type.sys_device_type[(scope.row.deviceType)].label }}</div>
           </template>
         </el-table-column> -->
         <el-table-column label="设备名称" align="center" prop="deviceName" />
-        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode"  sortable/>
         <el-table-column label="二维码" align="center" class-name="small-padding fixed-width">
              <template slot-scope="scope">
             <el-button
@@ -164,7 +164,7 @@
                         <el-input v-model="form.deviceName" placeholder="请输入设备名称" maxlength="20"/>
                     </el-form-item>
                     <el-form-item label="设备下标" prop="deviceIndex">
-                        <el-input v-model="form.deviceIndex" placeholder="请输入设备下标" />
+                        <el-input v-model="form.deviceIndex" placeholder="请输入设备下标" maxlength="5"/>
                     </el-form-item>               
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -203,13 +203,18 @@
       </el-row>
 
       <el-table v-loading="loadingTwo" :data="deviceAttributeList " width="600px" height = "600px" >
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryDeviceAttribute.pageNum - 1) * queryDeviceAttribute.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="dataName" />
-        <el-table-column label="设备采集值" align="center" prop="dataVal" />
-        <el-table-column label="设备值单位" align="center" prop="dataUnit" />
-        <el-table-column label="级联编码" align="center" prop="dataCode" />
-        <el-table-column label="数据类型" align="center" prop="dataType" />
-        <el-table-column label="数据采集时间" align="center" prop="dataTime" width="160px"/>
+        <el-table-column label="设备属性名称" align="center" prop="dataName" sortable/>
+        <el-table-column label="设备采集值" align="center" prop="dataVal" sortable/>
+        <el-table-column label="设备值单位" align="center" prop="dataUnit" sortable/>
+        <el-table-column label="级联编码" align="center" prop="dataCode" sortable/>
+        <el-table-column label="数据类型" align="center" prop="dataType" sortable/>
+        <el-table-column label="数据采集时间" align="center" prop="dataTime" width="160px"sortable/>
         <el-table-column label="设备属性图片" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index 39d18be..a8e7404 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -50,14 +50,14 @@
 
     <el-table v-loading="loading" :data="projectList" ref="multipleTable" row-key="projectId" @selection-change="handleSelectionChange" @select="handlerSelect" @select-all="handlerSelectAll">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" width="80" type="index">
+      <el-table-column label="序号" align="center" width="80" type="index" sortable>
         <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" />
+      <el-table-column label="项目部名称" align="center" prop="projectDepartName" sortable/>
+      <el-table-column label="负责人" align="center" prop="projectHeadName" sortable/>
+      <el-table-column label="电话" align="center" prop="contactInformation" sortable/>
       <el-table-column label="APP轮播图" align="center" prop="appnum">            
         <template slot-scope="scope">
             <div @click="picturesPreview(scope.row)" style="color: #02a7f0; cursor: pointer">
@@ -66,7 +66,7 @@
         </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='true' sortable/>
       <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/base/staff/index.vue b/src/views/base/staff/index.vue
index 258872f..cd60bcb 100644
--- a/src/views/base/staff/index.vue
+++ b/src/views/base/staff/index.vue
@@ -94,14 +94,19 @@
   
       <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="姓名" align="center" prop="name" />
-        <el-table-column label="性别" align="center" prop="sex" width="60">
+        <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="name" sortable/>
+        <el-table-column label="性别" align="center" prop="sex" width="80" sortable>
           <template slot-scope="scope">
                 <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
             </template>
         </el-table-column>
-        <el-table-column label="身份证号" align="center" prop="idCard" width="200" />
-        <el-table-column label="电话" align="center" prop="phone" />
+        <el-table-column label="身份证号" align="center" prop="idCard" width="200" sortable/>
+        <el-table-column label="电话" align="center" prop="phone" sortable/>
         <el-table-column label="岗位" align="center" prop="post" />
         <el-table-column label="是否推送人脸库" align="center" prop="post">
           <template slot-scope="scope">
@@ -120,7 +125,7 @@
                 </div>
             </template>
         </el-table-column> 
-        <el-table-column label="证书" align="center">
+        <el-table-column label="证书" align="center" prop="certificateNum" sortable>
           <template slot-scope="scope">
               <div @click="openCertificate(scope.row)" style="color: #02a7f0; cursor: pointer">
                 {{ scope.row.certificateNum}}
@@ -174,16 +179,33 @@
                 :file-list="highImgList"
                 :show-file-list="true"
                 :auto-upload="false"
+                :before-upload="beforeUpload"
                 list-type="picture-card"
-                accept=".png, .jpg, .jpeg"
+                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
                 :on-change="handleChangeHighImgList"
                 :class="{ disabled: uploadDisabled }"
                 :on-preview="picturePreview"
                 :on-remove="handleRemoveHighImgList"
             >
-                <i
-                    class="el-icon-plus avatar-uploader-icon"
-                ></i>
+            <!-- 文件格式下载，图片格式预览 -->
+            <div slot="file" slot-scope="{file}">
+                <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+                <img v-else class="el-upload-list__item-thumbnail"  :src="urlTemp" alt="">
+                <span class="el-upload-list__item-actions">
+                  <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                  <i class="el-icon-download" />
+                  </span>
+                  <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                  <i class="el-icon-zoom-in" />
+                  </span>
+                  <span class="el-upload-list__item-delete" @click="handleRemoveHighImgList(file)">
+                  <i class="el-icon-delete" />
+                  </span>
+                </span>
+            </div>
+
+
+                <i class="el-icon-plus avatar-uploader-icon" ></i>
             </el-upload>
           </el-form-item>
           <el-form-item label="电工作业证">
@@ -194,15 +216,31 @@
                 :show-file-list="true"
                 :auto-upload="false"
                 list-type="picture-card"
-                accept=".png, .jpg, .jpeg"
+                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
                 :on-change="handleChangeElectricianImgList"
                 :class="{ disabled: uploadDisabled }"
                 :on-preview="picturePreview"
                 :on-remove="handleRemoveElectricianImgList"
             >
-                <i
-                    class="el-icon-plus avatar-uploader-icon"
-                ></i>
+
+             <!-- 文件格式下载，图片格式预览 -->
+             <div slot="file" slot-scope="{file}">
+                <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+                <img v-else class="el-upload-list__item-thumbnail"  :src="urlTemp" alt="">
+                <span class="el-upload-list__item-actions">
+                  <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                  <i class="el-icon-download" />
+                  </span>
+                  <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                  <i class="el-icon-zoom-in" />
+                  </span>
+                  <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
+                  <i class="el-icon-delete" />
+                  </span>
+                </span>
+            </div>
+
+                <i class="el-icon-plus avatar-uploader-icon" ></i>
             </el-upload>
           </el-form-item>
           <el-form-item label="其他作业证">
@@ -213,15 +251,29 @@
                 :show-file-list="true"
                 :auto-upload="false"
                 list-type="picture-card"
-                accept=".png, .jpg, .jpeg"
+                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
                 :on-change="handleChangeElseImgList"
                 :class="{ disabled: uploadDisabled }"
                 :on-preview="picturePreview"
                 :on-remove="handleRemoveElseImgList"
             >
-                <i
-                    class="el-icon-plus avatar-uploader-icon"
-                ></i>
+             <!-- 文件格式下载，图片格式预览 -->
+             <div slot="file" slot-scope="{file}">
+                <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+                <img v-else class="el-upload-list__item-thumbnail"  :src="urlTemp" alt="">
+                <span class="el-upload-list__item-actions">
+                  <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                  <i class="el-icon-download" />
+                  </span>
+                  <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                  <i class="el-icon-zoom-in" />
+                  </span>
+                  <span class="el-upload-list__item-delete" @click="handleRemoveElseImgList(file)">
+                  <i class="el-icon-delete" />
+                  </span>
+                </span>
+            </div>
+                <i  class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -232,7 +284,7 @@
       </el-dialog>
 
       <!-- 添加或修改人员对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body @close="cancel">
         <el-form ref="form" :model="form" :rules="rules" label-width="100px">
           <el-form-item label="人员姓名" prop="name">
             <el-input v-model="form.name" placeholder="请输入人员名称" maxlength="20"/>
@@ -319,14 +371,14 @@
 
       <!-- 图片查看弹窗 -->
       <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" height="650px" :src="dialogImageUrl" alt />
+        <img width="100%" height="650px" :src="dialogImageUrl"  />
       </el-dialog>
     </div>
   </template>
   
   <script>
   import { listPerson, addPerson, editPerson, getPersonInfo, delPerson, exportPerson, personFile,getCertificate,updateCertificate,pushFace} from "@/api/base/staff";
-  import { downloadFile } from '@/utils/download'
+  import { downloadFile,downloadFileData } from '@/utils/download'
   import { getToken } from '@/utils/auth'
   import uploadFile from '../../components/uploadFile.vue'
   export default {
@@ -448,6 +500,7 @@
       };
     },
     computed: {
+     
         //图片上传1张后，隐藏上传框
         uploadDisabled() {
             return this.fileList.length > 0
@@ -457,6 +510,61 @@
       this.getList();
     },
     methods: {
+        // base64转blob
+        base64ToBlob(code) {
+          let parts = code.split(";base64,");
+          let contentType = parts[0].split(":")[1];
+          let raw = window.atob(parts[1]);
+          let rawLength = raw.length;
+          let uInt8Array = new Uint8Array(rawLength);
+          for (let i = 0; i < rawLength; ++i) {
+            uInt8Array[i] = raw.charCodeAt(i);
+          }
+          return new Blob([uInt8Array], { type: contentType });
+        },
+
+        isImage(file){
+            this.urlTemp = require('@/assets/file.png');
+            if(this.updataIf(file)){
+                return false
+          }else{
+            return true
+          }
+        },
+      // 判断文件类型,图片预览，文件下载
+       updataIf(e) {
+                if (e.fileName) {
+                    if (e.fileName.split('.')[1] === 'png' || e.fileName.split('.')[1] === 'jpeg' || e.fileName.split('.')[1] === 'jpg') {
+                        return false
+                    } else {
+                    return true
+                    }
+                } else {
+                    if (e.name.split('.')[1] === 'png' || e.name.split('.')[1] === 'jpeg' || e.name.split('.')[1] === 'jpg') {
+                        return false
+                    } else {
+                        return true
+                    }
+                }
+            },
+      handleDownload(file) {
+        console.log(file.url)
+        if(file.status === 'ready'){
+                downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+        }else if(file.status === 'success'){
+                downloadFileData({ fileName: file.name,fileUrl:file.url })
+        }
+      },
+      //上传组件-图片查看
+      picturePreview(file) {
+        this.dialogImageUrl = file.url;
+        if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
+          const windowName = file.name;
+          window.open(file.url,windowName)
+        }else{
+          this.dialogVisible = true
+        }
+      },
        //自定义人脸图片必填校验
        fileMustUpload(rule, value, callback) {
           if (this.form.fileName == '') {
@@ -516,21 +624,75 @@
             this.fileList = fileList;
         },
         handleChangeHighImgList(file, fileList) {
-            console.log(file)
-            // this.$refs["form"].clearValidate()
-            // this.certificateForm.fileName = file.name;
+            const fileListTemp = fileList.filter(item => {
+                        return item.uid != file.uid
+                    });
+            if(file.size > 1024 * 1024 * 10){
+                    this.$message.warning('文件大小不能超过10Mb')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+                if(fileListTemp.some(item =>item.name === file.name)){
+                    this.$message.warning('文件名重复')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+                fileList.forEach(file=>{
+                    if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
+                        this.urlTemp = require('../../../assets/file.png');
+                    
+                    }
+                  }),
             this.highImgList = fileList;
         },
         handleChangeElectricianImgList(file, fileList) {
-            console.log(file)
-            // this.$refs["form"].clearValidate()
-            // this.certificateForm.electricianImgList = file.name;
+          const fileListTemp = fileList.filter(item => {
+                        return item.uid != file.uid
+                    });
+            if(file.size > 1024 * 1024 * 10){
+                    this.$message.warning('文件大小不能超过10Mb')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+                if(fileListTemp.some(item =>item.name === file.name)){
+                    this.$message.warning('文件名重复')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+                fileList.forEach(file=>{
+                    if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
+                        this.urlTemp = require('../../../assets/file.png');
+                    
+                    }
+                  }),
             this.electricianImgList = fileList;
         },
         handleChangeElseImgList(file, fileList) {
-            console.log(file)
-            // this.$refs["form"].clearValidate()
-            // this.certificateForm.elseImgList = file.name;
+          const fileListTemp = fileList.filter(item => {
+                        return item.uid != file.uid
+                    });
+            if(file.size > 1024 * 1024 * 10){
+                    this.$message.warning('文件大小不能超过10Mb')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+                if(fileListTemp.some(item =>item.name === file.name)){
+                    this.$message.warning('文件名重复')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+                fileList.forEach(file=>{
+                    if(file.name.split('.')[1] === 'doc'||file.name.split('.')[1] === 'docx'||file.name.split('.')[1] === 'pdf'){
+                        this.urlTemp = require('../../../assets/file.png');
+                    
+                    }
+                  }),
             this.elseImgList = fileList;
         },
         //图片删除
@@ -555,7 +717,6 @@
                 }
             })
             this.delHighFileIdList.push(this.highImgList[sum].fileId)
-            console.log(this.delHighFileIdList)
             this.highImgList.splice(sum, 1)
         },
         handleRemoveElectricianImgList(file, fileList) {
@@ -566,7 +727,6 @@
                 }
             })
             this.delElectFileIdList.push(this.electricianImgList[sum].fileId)
-            console.log(this.delElectFileIdList)
             this.electricianImgList.splice(sum, 1)
         },
         handleRemoveElseImgList(file, fileList) {
@@ -577,15 +737,8 @@
                 }
             })
             this.delElseFileIdList.push(this.elseImgList[sum].fileId)
-            console.log(this.delElseFileIdList)
             this.elseImgList.splice(sum, 1)
         },
-        //上传组件-图片查看
-        picturePreview(file) {
-            // console.log(file)
-            this.dialogImageUrl = file.url
-            this.dialogVisible = true
-        },
         //列表-图片查看
         openImg(url) {
             this.dialogImageUrl = url
@@ -606,10 +759,8 @@
               })
               //触发校验
               this.form.fileName = response.data.fileId;
-              setTimeout(()=>{
                 this.open = true;
                 this.title = "修改人员";
-              },100)
              
             });
         },
@@ -672,10 +823,11 @@
         getHighImgListFileData() {
           const highfile = []
           this.highImgList.forEach(item => {
-            if (item?.hasOwnProperty('raw')) {
+            if (item?.hasOwnProperty('size')) {
               highfile.push(item.raw)
             }
           })
+          console.log(highfile)
           return { highfile }
         },
 
@@ -683,7 +835,7 @@
         getElectricianImgListFileData() {
           const electfile = []
           this.electricianImgList.forEach(item => {
-            if (item?.hasOwnProperty('raw')) {
+            if (item?.hasOwnProperty('size')) {
               electfile.push(item.raw)
             }
           })
@@ -694,7 +846,7 @@
         getElseImgListFileData() {
         const elsefile = []
         this.elseImgList.forEach(item => {
-          if (item?.hasOwnProperty('raw')) {
+          if (item?.hasOwnProperty('size')) {
             elsefile.push(item.raw)
           }
         })
@@ -770,36 +922,68 @@
           this.highImgList = [];
           this.electricianImgList = [];
           this.elseImgList = [];
+          this.delHighFileIdList=[];
+          this.delElectFileIdList=[];
+          this.delElseFileIdList=[];
           // this.showCertificate = true;
           getCertificate(this.memberId).then(response => {
-
             response.data.highImgList.forEach(item => {
-                this.highImgList.push({
+              if(item.fileType==0)
+            {
+              this.highImgList.push({
                   fileId: item.filePath,
                   raw:item.bast64Image,
-                  url: item.bast64Image
+                  url: URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
+                  name: item.fileName,
                 })
+                console.log(this.highImgList)
+            }else{
+              this.highImgList.push({
+                  fileId: item.filePath,
+                  raw:item.bast64Image,
+                  url: item.bast64Image,
+                  name: item.fileName,               
+                })
+            }
               });
             response.data.electricianImgList.forEach(item => {
+              if(item.fileType==0)
+              {
                 this.electricianImgList.push({
                   fileId: item.filePath,
                   raw:item.bast64Image,
-                  url: item.bast64Image
+                  url: URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
+                  name: item.fileName
                 })
+              }else{
+                this.electricianImgList.push({
+                  fileId: item.filePath,
+                  raw:item.bast64Image,
+                  url: item.bast64Image,
+                  name: item.fileName
+                })
+              }
+
               });
             response.data.elseImgList.forEach(item => {
+              if(item.fileType==0)
+              {
                 this.elseImgList.push({
                   fileId: item.filePath,
                   raw:item.bast64Image,
-                  url: item.bast64Image
+                  url: URL.createObjectURL(this.base64ToBlob(item.bast64Image)),
+                  name: item.fileName
                 })
+              }else{
+                this.elseImgList.push({
+                  fileId: item.filePath,
+                  raw:item.bast64Image,
+                  url: item.bast64Image,
+                  name: item.fileName
+                })
+              }
               });
-              // console.log(this.highImgList)
-              // console.log(this.electricianImgList)
-              // console.log(this.elseImgList)
-              setTimeout(()=>{
                 this.showCertificate = true;
-              },100)
 
           });
         },
@@ -813,20 +997,12 @@
         },
         //提交证书上传
         submitCertificate(){
-          console.log(this.highImgList);
-          console.log(this.electricianImgList);
-          console.log(this.elseImgList);
           this.$refs["certificateForm"].validate(valid => {
         if (valid) {
             const reqData = new FormData();
             this.certificateForm.delHighFileIdList = this.delHighFileIdList;
-            console.log(this.delHighFileIdList);
             this.certificateForm.delElectFileIdList = this.delElectFileIdList;
             this.certificateForm.delElseFileIdList = this.delElseFileIdList;
-            // reqData.append('delHighFileIdList', JSON.stringify(this.delHighFileIdList));
-            // reqData.append('delElectFileIdList', JSON.stringify(this.delElectFileIdList));
-            // reqData.append('delElseFileIdList', JSON.stringify(this.delElseFileIdList));
-
             this.delHighFileIdList.forEach(item => {
               reqData.append('delHighFileIdList', item)
             });
@@ -837,7 +1013,6 @@
               reqData.append('delElseFileIdList', item)
             });
             const { highfile } = this.getHighImgListFileData();
-            // console.log(highfile);
             const { electfile } = this.getElectricianImgListFileData();
             const { elsefile } = this.getElseImgListFileData();
             reqData.append('id', this.memberId);
@@ -863,9 +1038,6 @@
             });
         }
       });
-          // this.highImgList = []
-          // this.electricianImgList = []
-          // this.elseImgList = []
 
           this.showCertificate = false;
         },
diff --git a/src/views/components/uploadFile.vue b/src/views/components/uploadFile.vue
index bad3bb0..24009c6 100644
--- a/src/views/components/uploadFile.vue
+++ b/src/views/components/uploadFile.vue
@@ -12,18 +12,18 @@
     >   
     <!-- 文件格式下载，图片格式预览 -->
     <div slot="file" slot-scope="{file}">
-    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
-    <span class="el-upload-list__item-actions">
-        <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
-        <i class="el-icon-download" />
+        <img class="el-upload-list__item-thumbnail" :src="file.url" alt="">
+        <span class="el-upload-list__item-actions">
+            <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+            <i class="el-icon-download" />
+            </span>
+            <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+            <i class="el-icon-zoom-in" />
+            </span>
+            <span class="el-upload-list__item-delete" @click="fileRemove(file)">
+            <i class="el-icon-delete" />
+            </span>
         </span>
-        <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
-        <i class="el-icon-zoom-in" />
-        </span>
-        <span class="el-upload-list__item-delete" @click="fileRemove(file)">
-        <i class="el-icon-delete" />
-        </span>
-    </span>
     </div>
 
     <i class="el-icon-plus avatar-uploader-icon"></i>
diff --git a/src/views/comprehensive/constructionRecord/index.vue b/src/views/comprehensive/constructionRecord/index.vue
index 77f4b83..9490a04 100644
--- a/src/views/comprehensive/constructionRecord/index.vue
+++ b/src/views/comprehensive/constructionRecord/index.vue
@@ -64,32 +64,32 @@
           <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" />
-      <el-table-column label="班组负责人" align="center" prop="teamLeader" >
+      <el-table-column label="工程名称" align="center" prop="proName" sortable/>
+      <el-table-column label="项目部名称" align="center" prop="departName" sortable/>
+      <el-table-column label="施工班组" align="center" prop="teamName" sortable/>
+      <el-table-column label="班组负责人" align="center" prop="teamLeader" sortable>
         <template slot-scope="scope">
          <div>
                <span style="color: green;">{{ scope.row.teamLeader }} \ </span><span style="color: #02a7f0;">{{ scope.row.teamPhone }}</span>
         </div>
       </template>
       </el-table-column>
-      <el-table-column label="班组施工人数" align="center" prop="teamNum" >
+      <el-table-column label="班组施工人数" align="center" prop="teamNum" sortable>
         <template slot-scope="scope">
             <div @click="openTeam(scope.row)" style="color: #02a7f0; cursor: pointer">
                 {{ scope.row.teamNum}}
             </div>
         </template>
       </el-table-column>
-      <el-table-column label="临时人数" align="center" prop="tempNum" >
+      <el-table-column label="临时人数" align="center" prop="tempNum" sortable>
         <template slot-scope="scope">
             <div @click="openTeamTemp(scope.row)" style="color: #02a7f0; cursor: pointer">
                 {{ scope.row.tempNum}}
             </div>
         </template>
       </el-table-column>
-      <el-table-column label="施工时间" align="center" prop="lyTime" />
-      <el-table-column label="施工预警次数" align="center" prop="warnNum" >
+      <el-table-column label="施工时间" align="center" prop="lyTime" sortable/>
+      <el-table-column label="施工预警次数" align="center" prop="warnNum" sortable>
         <template slot-scope="scope">
             <div @click="openWarn(scope.row)" style="color: #02a7f0; cursor: pointer">
                 {{ scope.row.warnNum}}
@@ -140,14 +140,14 @@
         </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" >
+        <el-table-column label="姓名" align="center" prop="name" sortable/>
+        <el-table-column label="性别" align="center" prop="sex" sortable>
           <template slot-scope="scope">
                 <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
             </template>
         </el-table-column>
-        <el-table-column label="身份证号" align="center" prop="idCard" width="160px" />
-        <el-table-column label="电话" align="center" prop="phone" />
+        <el-table-column label="身份证号" align="center" prop="idCard" width="160px" sortable/>
+        <el-table-column label="电话" align="center" prop="phone" sortable/>
         <el-table-column label="安全帽编号" align="center" prop="aqmCode" />
         <el-table-column label="马甲编号" align="center" prop="mjCode" />
         <el-table-column label="人脸信息" align="center" class-name="small-padding fixed-width">
@@ -207,14 +207,14 @@
         </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" >
+        <el-table-column label="姓名" align="center" prop="name" sortable/>
+        <el-table-column label="性别" align="center" prop="sex" sortable>
           <template slot-scope="scope">
                 <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
             </template>
         </el-table-column>
-        <el-table-column label="身份证号" align="center" prop="idCard" />
-        <el-table-column label="电话" align="center" prop="phone" />
+        <el-table-column label="身份证号" align="center" prop="idCard" sortable/>
+        <el-table-column label="电话" align="center" prop="phone" sortable/>
         <el-table-column label="人脸信息" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -246,10 +246,10 @@
           <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" />
-        <el-table-column label="预警内容" align="center" prop="warnContent" />
+        <el-table-column label="预警设备" align="center" prop="devTypeName" sortable/>
+        <el-table-column label="设备名称" align="center" prop="devName" sortable/>
+        <el-table-column label="预警时间" align="center" prop="warnTime" sortable/>
+        <el-table-column label="预警内容" align="center" prop="warnContent" sortable/>
       </el-table>
   
       <pagination
diff --git a/src/views/comprehensive/deviceLyRecord/index.vue b/src/views/comprehensive/deviceLyRecord/index.vue
index 41a54e0..d37a511 100644
--- a/src/views/comprehensive/deviceLyRecord/index.vue
+++ b/src/views/comprehensive/deviceLyRecord/index.vue
@@ -101,14 +101,14 @@
           <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" />
+        <el-table-column label="工程名称" align="center" prop="proName" sortable/>
+        <el-table-column label="项目部名称" align="center" prop="departName" sortable/>
+        <el-table-column label="领用班组" align="center" prop="teamName" sortable/>
         <el-table-column label="领用设备类型" align="center" prop="deviceTypeName">
         </el-table-column>
         <el-table-column label="设备名称" align="center" prop="devName" />
         <el-table-column label="领用设备编码" align="center" prop="devCode" />
-        <el-table-column label="班组负责人" align="center" prop="teamLeader">
+        <el-table-column label="班组负责人" align="center" prop="teamLeader" sortable>
           <template slot-scope="scope">
               <div>
                     <span style="color: green;">{{ scope.row.teamLeader }} \ </span><span style="color: #02a7f0;">{{ scope.row.leaderPhone }}</span>
@@ -116,14 +116,14 @@
         </template>
 
         </el-table-column>
-        <el-table-column label="领用时间" align="center" prop="lyTime" />
-        <el-table-column label="归还时间" align="center" prop="ghTime">
+        <el-table-column label="领用时间" align="center" prop="lyTime" sortable/>
+        <el-table-column label="归还时间" align="center" prop="ghTime" sortable>
           <template slot-scope="scope">
             <span v-if="!scope.row.ghTime" style="font-weight: bold;color: green;">在用</span>
             <span v-else>{{ scope.row.ghTime }}</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='true' sortable/>
       </el-table>
   
       <pagination
diff --git a/src/views/comprehensive/warnHistory/index.vue b/src/views/comprehensive/warnHistory/index.vue
index 51c3c06..16015ef 100644
--- a/src/views/comprehensive/warnHistory/index.vue
+++ b/src/views/comprehensive/warnHistory/index.vue
@@ -65,10 +65,10 @@
           <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" :show-overflow-tooltip='true'/>
+        <el-table-column label="预警设备" align="center" prop="devTypeName" sortable/>
+        <el-table-column label="设备名称" align="center" prop="devName" sortable/>
+        <el-table-column label="预警时间" align="center" prop="warnTime" sortable/>
+        <el-table-column label="预警内容" align="center" prop="warnContent" :show-overflow-tooltip='true' sortable/>
       </el-table>
   
       <pagination
diff --git a/src/views/construction/sideband/index.vue b/src/views/construction/sideband/index.vue
index 0ac1c73..fdaed2e 100644
--- a/src/views/construction/sideband/index.vue
+++ b/src/views/construction/sideband/index.vue
@@ -75,12 +75,12 @@
         </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" />
-        <el-table-column label="所属工程" align="center" prop="projectName" />
-        <el-table-column label="杆塔编号" align="center" prop="gtCode" />
-        <el-table-column label="绑定时间" align="center" prop="bindTime" />
-        <el-table-column label="绑定设备" align="center" prop="bindNum">
+        <el-table-column label="边带名称" align="center" prop="sidebandName" sortable/>
+        <el-table-column label="边带编码" align="center" prop="sidebandCode" sortable/>
+        <el-table-column label="所属工程" align="center" prop="projectName" sortable/>
+        <el-table-column label="杆塔编号" align="center" prop="gtCode" sortable/>
+        <el-table-column label="绑定时间" align="center" prop="bindTime" sortable/>
+        <el-table-column label="绑定设备" align="center" prop="bindNum" sortable>
           <template slot-scope="scope">
             <div @click="openGt(scope.row)" style="color: #02a7f0; cursor: pointer">
                 {{ scope.row.bindNum}}

From c7e168c840c118d7e06719d3fe2429091b07736f Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 20 Aug 2024 18:16:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/construction/manage/hoistManage.js    |  54 +++
 src/assets/images/config.png                  | Bin 0 -> 539 bytes
 src/assets/images/jd_dev.png                  | Bin 0 -> 297 bytes
 src/assets/images/video/back.png              | Bin 0 -> 13363 bytes
 src/assets/images/video/back3.png             | Bin 0 -> 1622 bytes
 src/assets/images/video/left_btn.png          | Bin 0 -> 1750 bytes
 src/utils/request.js                          |   2 +-
 src/views/base/team/index.vue                 |  70 ++--
 .../manage/hoistManage/hoistManage.vue        | 391 +++++++++++++-----
 .../manage/personManage/personManage.vue      |   4 +-
 .../manage/realTimeManage/realTimeManage.vue  |  57 ++-
 11 files changed, 453 insertions(+), 125 deletions(-)
 create mode 100644 src/assets/images/config.png
 create mode 100644 src/assets/images/jd_dev.png
 create mode 100644 src/assets/images/video/back.png
 create mode 100644 src/assets/images/video/back3.png
 create mode 100644 src/assets/images/video/left_btn.png

diff --git a/src/api/construction/manage/hoistManage.js b/src/api/construction/manage/hoistManage.js
index b05db09..5aeddd1 100644
--- a/src/api/construction/manage/hoistManage.js
+++ b/src/api/construction/manage/hoistManage.js
@@ -6,4 +6,58 @@ export function getDzWarnList(query) {
         method: 'get',
         params: query
     })
+}
+
+/* 近电感应设备列表 */
+export function getJdList(query) {
+    return request({
+        url: '/bracelet/consControl/getJdList',
+        method: 'get',
+        params: query
+    })
+}
+
+/* 线路属性 */
+export function getLineStats(query) {
+    return request({
+        url: '/system/select/getLineStats',
+        method: 'get',
+        params: query
+    })
+}
+
+/* 线路属性的电压等级 */
+export function getVoltageLevelByLineStats(query) {
+    return request({
+        url: '/system/select/getVoltageLevelByLineStats',
+        method: 'get',
+        params: query
+    })
+}
+
+/* 添加近电感应配置 */
+export function configJdDevice(data) {
+    return request({
+        url: '/bracelet/consControl/configJdDevice',
+        method: 'post',
+        data:data
+    })
+}
+
+/* 查询近电感应设备配置 */
+export function getConfigJdDevice(query) {
+    return request({
+        url: '/bracelet/consControl/getConfigJdDevice',
+        method: 'get',
+        params: query
+    })
+}
+
+/* 近电感应设备预警信息 */
+export function getJdWarnList(query) {
+    return request({
+        url: '/bracelet/consControl/getJdWarnList',
+        method: 'get',
+        params: query
+    })
 }
\ No newline at end of file
diff --git a/src/assets/images/config.png b/src/assets/images/config.png
new file mode 100644
index 0000000000000000000000000000000000000000..68512015070b58e610ac8b1f47c53fd5c314199e
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0kBC#K~#7FwN%|v
z!axxIE^5X{N`MZa0z(JdL9BrID&qu(K_3kjpcSAMAQgxeKnZ!}XE?vRTqfLw2;=C^
zY;xJ#{qEb%-U5Ft;;6?!1~|hQlItCMco46@1ALNo0*tu|sHw5ms4rNfkG@!*1{lj4
zd@=z##-af3a7nNoVt$7vGQkQX7uW`Tlo3;lH4}*scm%!|vl4TODYee8rCSEE2R5P8
zwN7t`=vb{Vlp&*I13X7pv|PXifl_SHW*Vtgf^$>HEd$*>pKMh|UC~e`&p9`>0*125
zfCarK)G61W+LlY^o9+X+fUr&%1j-~bs{Zm+?^Vb-s&|^EJ`vLy8OG|F-~v~CzaI*#
zW|*-#ES{aF&7(@TY#Uz(_6#%VwQ7|WzN*ivlC0ou)=|9^qe^b9ANM1mV4C{{?}|Cu
zv}g}>kFL?swp=n_t29N*QZs4l))>g5`!hDP5*5|hz_S5-D>%7MMfWess9hQYYWjHk
zdIo^0aoz<uG#s+K+M!0ql1&#C>}y7$$tdBi>bvzkHoo%dQj9M(G&Z<BeSEo6ltFoi
drRnqE@(p3)q+2h24psmF002ovPDHLkV1jwR;EDhM

literal 0
HcmV?d00001

diff --git a/src/assets/images/jd_dev.png b/src/assets/images/jd_dev.png
new file mode 100644
index 0000000000000000000000000000000000000000..545cb969d0847b697774ec3f2faa0449c75179df
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zoCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{yt9^$B+ufw^JR34k_@sPVSSoZI!llx0(4Z
zrHJ>d%qu^h;FK)ZV2#6C`OeQLf1Awb$snRC+|xPRHd3G>hS!O4^_8}*2?7UQN|NR-
zn6PA_@nfA|E6?5B-MV1gLzx?YPMp@<D*yYftce@%YGJ*zRqp904je7sm>1ab)5bpk
z*@x5{y+vD-Zt{QB*FNsU+4lW(0n_n0evcn5-6T<OEW;$Vxb14>74O>O_r>>qn$J7o
p-zG2Ht+p`XMY^18iEHL*=?NW1omcrJ3xPgi@O1TaS?83{1OQQDZqxt(

literal 0
HcmV?d00001

diff --git a/src/assets/images/video/back.png b/src/assets/images/video/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3cd716902d5daae9f214dbcb9f61cf0e2ce1a7f
GIT binary patch
literal 13363
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/video/back3.png b/src/assets/images/video/back3.png
new file mode 100644
index 0000000000000000000000000000000000000000..43f51067a5260a4e19c106b23bd8575f02ff4deb
GIT binary patch
literal 1622
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
U9_Qu$S^xk507*qoM6N<$g8Oz9&;S4c

literal 0
HcmV?d00001

diff --git a/src/assets/images/video/left_btn.png b/src/assets/images/video/left_btn.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bdcefccf483c67a70809cede7742628983b6d16
GIT binary patch
literal 1750
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

literal 0
HcmV?d00001

diff --git a/src/utils/request.js b/src/utils/request.js
index f70b994..2250d20 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -62,7 +62,7 @@ service.interceptors.request.use(config => {
       const s_url = sessionObj.url;                  // 请求地址
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      const interval = 3000;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)
diff --git a/src/views/base/team/index.vue b/src/views/base/team/index.vue
index c2dc11a..06ee054 100644
--- a/src/views/base/team/index.vue
+++ b/src/views/base/team/index.vue
@@ -15,6 +15,7 @@
             placeholder="请输入班组名称"
             clearable
             @keyup.enter.native="handleQuery"
+            maxlength="30"
           />
         </el-form-item>
         <el-form-item label="班组长" prop="teamLeader">
@@ -23,6 +24,7 @@
             placeholder="请输入班组长"
             clearable
             @keyup.enter.native="handleQuery"
+            maxlength="30"
           />
         </el-form-item>
         <!-- <el-form-item label="项目部" prop="roleCode">
@@ -88,10 +90,15 @@
   
       <el-table v-loading="loading" :data="teamList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="班组名称" align="center" prop="teamName" />
-        <el-table-column label="所属工程 " align="center" prop="proName" />
-        <el-table-column label="班组长" align="center" prop="teamLeader" />
-        <el-table-column label="班组成员(在施\未施)" align="center" prop="workNum">
+        <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="teamName" sortable/>
+        <el-table-column label="所属工程 " align="center" prop="proName" sortable/>
+        <el-table-column label="班组长" align="center" prop="teamLeader" sortable/>
+        <el-table-column label="班组成员(在施\未施)" align="center" prop="workNum" sortable>
             <template slot-scope="scope">
                 <div style="cursor: pointer;" @click="openTeamTable(scope.row)">
                     <span style="color: green;">{{ scope.row.workNum }}/</span><span>{{ scope.row.notWorkNum }}</span>
@@ -100,13 +107,13 @@
             </template>
         </el-table-column>
         
-        <el-table-column label="班组状态" align="center" prop="teamStatus">
+        <el-table-column label="班组状态" align="center" prop="teamStatus" sortable>
             <template slot-scope="scope">
                 <div v-if="scope.row.teamStatus==0" style="color: green;">{{ stateList[Number(scope.row.teamStatus)] }}</div>
                 <div v-if="scope.row.teamStatus==1" style="color: red;">{{ stateList[Number(scope.row.teamStatus)] }}</div>
             </template>
         </el-table-column>
-        <el-table-column label="创建日期" align="center" prop="createTime" width="180">
+        <el-table-column label="创建日期" align="center" prop="createTime" width="180" sortable>
             <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -126,13 +133,13 @@
               @click="handleUpdate(scope.row)"
               v-hasPermi="['basic:team:edit']"
             >修改</el-button>
-            <el-button
+            <!-- <el-button
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['basic:team:del']"
-            >删除</el-button>
+            >删除</el-button> -->
             <el-button
               size="mini"
               type="text"
@@ -166,6 +173,7 @@
                         placeholder="请输入姓名"
                         clearable
                         @keyup.enter.native="handleQuery"
+                        maxlength="30"
                     />
                 </el-form-item>
                 <el-form-item label="性别" prop="sex">
@@ -274,7 +282,7 @@
                     <el-table-column label="电话" align="center" prop="phone" />
                     <el-table-column label="操作" align="center" >
                         <template slot-scope="scope">
-                            <el-button size="mini" type="text" @click="delUser(scope.row)">删除</el-button>
+                            <el-button size="mini" type="text" @click="delUser(scope.row)" v-if="scope.row.isLeader!=0">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -385,6 +393,7 @@
         // 表单参数
         form: {},
         teamUserList:[],//新增编辑弹窗-班组成员
+        leaderData:{},//新增编辑弹窗-班组长
         chosenUser:[],//人员列表右侧-选中人员
         peopleDataList:[],//接口获取-所有人员列表
         peopleList:[],//人员列表左侧-表格渲染
@@ -411,7 +420,7 @@
      
     created() {
       this.getProList();
-      this.getPersonList();
+      
       this.getList();
     },
     methods: {
@@ -422,12 +431,12 @@
             });
         },
         // 获取人员列表
-        getPersonList(){
+        getPersonList(teamId){
             let param = {
-                type:1,//1.全部人员 2.未分配人员 3.已分配人员 4.班组长
+                type:4,//1.全部人员 2.未分配人员 3.已分配人员 4.班组长
                 roleCode: this.$store.getters.roleCode,
                 departId: this.$store.getters.departId,
-                teamId: this.$store.getters.teamId,
+                teamId: teamId
             }
             getPersonList(param).then(response => {
                this.personList = response.data;
@@ -440,8 +449,21 @@
                 if(item.id==val){
                     this.form.teamLeader = item.name;
                     this.form.leaderPhone = item.phone;
+                    this.leaderData=item;
                 }
             })
+            this.leaderData.isLeader=0;//是否班组长，0是1否
+            if(this.teamUserList.length==0){
+                this.teamUserList.push(this.leaderData)
+            }else{
+                var index = this.teamUserList.findIndex(uItem => {return uItem.isLeader == 0})
+                if(index>-1){
+                    this.teamUserList.splice(index,1)
+                    this.teamUserList.unshift(this.leaderData)
+                }else{
+                    this.teamUserList.unshift(this.leaderData)
+                }
+            }
         },
         /** 查询班组列表 */
         getList() {
@@ -594,21 +616,15 @@
         },
         //选择人员弹窗-确认
         submitPeople(){
-            // let arrs=[...this.chosenUser,...this.teamUserList];
-            // //根据id去重
-            // let map=new Map();
-            // for(let item of arrs){
-            //     if(!map.has(item.id)){
-            //         map.set(item.id,item)
-            //     }
-            // }
-            // let newArr=[...map.values()];
+            // console.log(this.teamUserList)
+            // console.log(this.chosenUser)
             this.teamUserList = this.chosenUser;
-           
+            this.teamUserList.unshift(this.leaderData)
             this.openPeople = false;
         },
         /** 新增按钮操作 */
         handleAdd() {
+            this.getPersonList("");
             this.reset();
             this.checkList = []
             this.open = true;
@@ -618,12 +634,20 @@
         handleUpdate(row) {
             this.reset();
             const teamId = row.teamId
+            this.getPersonList(teamId);
             getTeamInfo({id:teamId}).then(response => {
                 this.form = response.data;
+                this.personList.forEach(item=>{
+                    if(item.id==this.form.teamLeaderId){
+                        this.leaderData=item;
+                        this.leaderData.isLeader=0;
+                    }
+                })
                 this.$set(this.form,'proId',response.data.proId+'')
                 this.checkList = response.data.checkList;
                 // this.$set(this.form,'sex',response.data.sex+'')
                 this.teamUserList = response.data.checkList.slice();
+                this.teamUserList.unshift(this.leaderData)
                 this.open = true;
                 this.title = "修改班组";
             });
diff --git a/src/views/construction/manage/hoistManage/hoistManage.vue b/src/views/construction/manage/hoistManage/hoistManage.vue
index 436588e..6e30bcf 100644
--- a/src/views/construction/manage/hoistManage/hoistManage.vue
+++ b/src/views/construction/manage/hoistManage/hoistManage.vue
@@ -3,7 +3,7 @@
     <div class="left">
       <div class="layout">
         <el-input placeholder="请输入关键字" prefix-icon="el-icon-search" v-model="keyWord" maxlength="30"
-          style="margin: 10px 10px 10px 0;width: 80%;" @keydown="searchData"></el-input>
+          style="margin: 10px 10px 10px 0;width: 80%;" @keydown.enter="searchData"></el-input>
         <el-button type="primary" plain @click="searchData">查询</el-button>
       </div>
       <div class="dev-box" v-if="isShow">
@@ -19,7 +19,6 @@
         </div>
       </div>
       <div class="no-data-box layout" v-if="!isShow">
-        <!-- <div>暂无数据</div> -->
         <el-empty description="暂无数据"></el-empty>
       </div>
     </div>
@@ -45,124 +44,137 @@
       </div>
     </div>
     <div class="right">
-      <div class="dev-config"></div>
-      <div class="warn-info"></div>
-    </div>
-
-    <el-dialog title="近电感应配置" :visible.sync="dialogVisible" :append-to-body="true" :draggable="true"
-      :destroy-on-close="true" width="40%" custom-class="my-dialog1">
-      <div style="width: 100%;height: 50vh;overflow: auto;">
-        <div v-for="(item, index) in hoistSetUpData" style="width: 100%;height: 60%;">
-          <div>配置{{ index + 1 }}</div>
-          <el-form label-width="120px">
-            <el-form-item label="线路属性：">
-              <el-radio-group v-model="item.lineType" class="ml-4" @change="lineTypeRadioChange(item, index)"
-                style="margin-top: 10px;">
-                <el-radio label="1" size="large">交流</el-radio>
-                <el-radio label="2" size="large">直流</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="电压等级：">
-              <el-radio-group v-model="item.level" class="ml-4" @change="levelRadioChange(item, index)"
-                style="margin-top: 10px;">
-                <el-radio label="1" size="large">≤10kV</el-radio>
-                <el-radio label="2" size="large">20~35kV</el-radio>
-                <el-radio label="3" size="large">66~110kV</el-radio>
-                <el-radio label="4" size="large">220kV</el-radio>
-                <el-radio label="5" size="large">330kV</el-radio>
-                <el-radio label="6" size="large">500kV</el-radio>
-                <el-radio label="7" size="large">700kV</el-radio>
-                <el-radio label="8" size="large">1000kV</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="报警距离：">
-              <el-input v-model="item.distance" type="number" placeholder="请输入" style="width: 25%;">
-              </el-input>&nbsp;米
-            </el-form-item>
-          </el-form>
-          <el-button @click="delHoistSetUp(index)" v-if="index > 0" style="margin-left: 80%;">删除配置</el-button>
+      <div class="dev-config layout" v-if="isShow2">
+        <div class="jd-dev-info layout" v-for="item in jdDevArr" :key="item.devId">
+          <div class="jd-dev-detail layout">
+            <img :src="jd_dev_img" alt="近电感应设备" style="margin-right: 5px;">
+            <span>{{ item.devName }}</span>
+          </div>
+          <div class="jd-dev-elec layout">
+            <img :src="battery1" alt="电量" v-if="parseFloat(item.electricQuantity) == 100">
+            <img :src="battery2" alt="电量"
+              v-if="parseFloat(item.electricQuantity) < 100 && parseFloat(item.electricQuantity) >= 20">
+            <img :src="battery3" alt="电量" v-if="parseFloat(item.electricQuantity) < 20">
+            <span style="margin-left: 5px;">{{ item.electricQuantity }}%</span>
+          </div>
+          <div class="jd-dev-img layout"><img :src="config" alt="配置" @click.stop="clickJdDev(item.devId)"></div>
         </div>
       </div>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button type="primary" @click="addHoistSetUp">添加配置</el-button>
-          <el-button @click="provingDialogClose">取消</el-button>
-          <el-button type="primary" @click="provingDialogConfirm">确定</el-button>
-        </span>
-      </template>
+      <div class="no-data-box layout" v-if="!isShow2">
+        <el-empty description="暂无数据"></el-empty>
+      </div>
+      <div class="warn-info">
+        <el-table :data="tableData" style="width: 100%" max-height="400">
+          <el-table-column prop="devName" label="设备名称" align="center">
+          </el-table-column>
+            <el-table-column prop="warnTime" label="告警时间" align="center">
+            </el-table-column>
+            <el-table-column prop="warnContent" label="告警内容" align="center">
+            </el-table-column>
+          </el-table>
+      </div>
+    </div>
+    <el-dialog title="近电感应配置" :visible.sync="dialogVisible" :append-to-body="true" width="700px"
+      @close="closeConfigItem">
+      <el-form ref="form" :model="form" :rules="rules" v-loading="loading" element-loading-text="数据加载中，请稍候..."
+        element-loading-spinner="el-icon-loading">
+        <div class="form-box">
+          <div v-for="(data, index) in form.configItems" :key="data.key">
+            <h3>配置{{ index + 1 }}</h3>
+            <el-form-item label="线路属性" :key="data.key">
+              <el-radio-group v-model="data.configType">
+                <el-radio v-for="item in configTypeArr" :label="item.id" :key="item.id"
+                  @change="chooseConfigType(index, data.configType)">{{ item.name }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="电压等级">
+              <el-radio-group v-model="data.voltageLevel" v-if="data.configType === 'communication'">
+                <el-radio v-for="item in jlArr" :label="item.id" :key="item.id">{{ item.name }}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="data.voltageLevel" v-if="data.configType === 'direct_current'">
+                <el-radio v-for="item in zlArr" :label="item.id" :key="item.id">{{ item.name }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="报警距离" :prop="'configItems.' + index + '.distance'" :rules="[
+              {
+                required: true, message: '报警距离不能为空', trigger: 'blur'
+              },
+              {
+                pattern: /^(?:100(?:\.0{1,2})?|[1-9][0-9]?(?:\.\d{1,2})?|1(?:\.\d{1,2})?)$/,
+                message: '距离为（1-100米）区间内,最多保留两位小数',
+                trigger: 'blur'
+              }
+            ]">
+              <el-col :span="12">
+                <el-input v-model="data.distance"></el-input>
+              </el-col>
+              <el-col :span="5" style="margin-left: 10px;"><el-button type="danger" plain
+                  @click.prevent="removeConfig(data)"><i class="el-icon-delete"></i></el-button></el-col>
+            </el-form-item>
+            <hr>
+          </div>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确定</el-button>
+        <el-button type="primary" @click="addConfigItem">添加配置</el-button>
+        <el-button @click="closeConfigItem">取消</el-button>
+      </div>
     </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { getDzWarnList } from "@/api/construction/manage/hoistManage.js";
+import { getDzWarnList, getJdList, getLineStats, getVoltageLevelByLineStats, configJdDevice, getConfigJdDevice,getJdWarnList } from "@/api/construction/manage/hoistManage.js";
 import dz_dev_img from "@/assets/images/dz_dev.png";
 import dz_dev_warn_img from "@/assets/images/test.jpg";
+import jd_dev_img from "@/assets/images/jd_dev.png";
 export default {
   name: 'hoistManage',
   data() {
     return {
       keyWord: '',
-      // 吊装设备图片
       dz_dev_img: dz_dev_img,
       dz_dev_warn_img: dz_dev_warn_img,
+      jd_dev_img: jd_dev_img,
       //保存左侧 吊装设备信息
       devArr: [],
+      // 近电感应设备
+      jdDevArr: [],
       // 吊装预警设备无数据时处理
-      isShow: true,
+      isShow: false,
+      // 近电感应设备无数据时处理
+      isShow2: false,
+      // 线路属性配置
+      configTypeArr: [],
+      // 交流属性的电压等级
+      jlArr: [],
+      // 直流属性的电压等级
+      zlArr: [],
+      loading: false,
       //电量图标
-      batterys: {
-        battery1: require('../../../../assets/images/battery1.png'),
-        battery2: require('../../../../assets/images/battery2.png'),
-        battery3: require('../../../../assets/images/battery3.png'),
-      },
-
-      //近电感应设备信息
-      vibeDeviceData: [
-        {
-          name: '近电感应设备DX-J431',
-          battery: 90
-        },
-        {
-          name: '近电感应设备DX-J431',
-          battery: 30
-        }
-      ],
-
+      battery1: require('../../../../assets/images/battery1.png'),
+      battery2: require('../../../../assets/images/battery2.png'),
+      battery3: require('../../../../assets/images/battery3.png'),
+      config: require('../../../../assets/images/config.png'),
       //右侧表格数据
-      tableData: [
-        {
-          deviceName: '近电感应设备DX-J431',
-          time: '2024-03-03 13:26',
-          reason: '低于安全施工sss距离'
-        },
-        {
-          deviceName: '近电感应设备DX-J431',
-          time: '2024-03-03 13:26',
-          reason: '低于安全施工sss距离'
-        },
-        {
-          deviceName: '近电感应设备DX-J431',
-          time: '2024-03-03 13:26',
-          reason: '低于安全施工sss距离'
-        },
-      ],
+      tableData: [],
       //对话框开关
       dialogVisible: false,
-
       //保存近电感应设置信息
-      hoistSetUpData: [
-        {
-          lineType: '1',
-          level: '1',
-          distance: 10
-        }
-      ]
+      form: {
+        devId: null,
+        configItems: [],
+      },
+      // 表单校验
+      rules: {},
     };
   },
   created() {
     this.laodDzWarnList();
+    this.loadJdList();
+    this.loadJdWarnList();
   },
   methods: {
     /* 加载吊装预警设备列表 */
@@ -180,12 +192,173 @@ export default {
         }
       }).catch(() => { })
     },
+    /* 加载近电感应设备 */
+    loadJdList() {
+      let params = {};
+      getJdList(params).then((res) => {
+        const data = res.data
+        this.jdDevArr = data;
+        if (data && data.length > 0) {
+          this.isShow2 = true;
+        } else {
+          this.isShow2 = false;
+        }
+      }).catch(() => { })
+    },
+    /* 加载近电感应设备预警信息 */
+    loadJdWarnList() {
+      let params = {};
+      getJdWarnList(params).then((res) => {
+        const data = res.data
+        this.tableData = data;
+      }).catch(() => { })
+    },
+    /* 加载线路属性 */
+    async loadLineStats() {
+      this.loading = true;
+      let params = {};
+      await getLineStats(params).then((res) => {
+        const data = res.data
+        this.configTypeArr = data;
+      }).catch(() => { })
+      await this.loadVoltageLevelByLineStats(this.configTypeArr[0].id);
+      await this.loadVoltageLevelByLineStats(this.configTypeArr[1].id);
+      await this.loadConfigJdDevice();
+      if (this.form.configItems.length === 0) {
+        this.form.configItems.push({
+          configType: this.configTypeArr[0].id,
+          voltageLevel: this.jlArr[0].id,
+          distance: 1,
+          key: Date.now()
+        });
+      }
+      this.loading = false;
+      // loading.close();
+    },
+    /* 线路属性的电压等级 */
+    async loadVoltageLevelByLineStats(param) {
+      let params = {
+        id: param
+      };
+      await getVoltageLevelByLineStats(params).then((res) => {
+        const data = res.data
+        if (param === 'communication') { // 交流
+          this.jlArr = data;
+        } else if (param === 'direct_current') { // 直流
+          this.zlArr = data;
+        }
+      }).catch(() => { })
+    },
+    /* 加载近电感应设备配置 */
+    async loadConfigJdDevice() {
+      const params = {
+        'devId': this.form.devId
+      }
+      await getConfigJdDevice(params).then((res) => {
+        const data = res.data
+        data.forEach((item, index) => {
+          this.form.configItems.push({
+            configType: item.configType,
+            voltageLevel: item.voltageLevel,
+            distance: item.distance,
+            key: Date.now()
+          })
+        })
+      }).catch(() => { })
+    },
     searchData() {
       this.laodDzWarnList();
     },
     /* 吊装设备点击事件 */
     clickDev(id) {
 
+    },
+    /* 近电感应设备点击事件 */
+    clickJdDev(id) {
+      this.form.devId = id;
+      this.loadLineStats();
+      this.dialogVisible = true;
+    },
+    // 添加配置
+    addConfigItem() {
+      if (this.form.configItems.length >= 10) {
+        return this.$message({
+          message: '最多添加十个配置',
+          type: 'warning'
+        });
+      }
+      this.form.configItems.push({
+        configType: this.configTypeArr[0].id,
+        voltageLevel: this.jlArr[0].id,
+        distance: 1,
+        key: Date.now()
+      });
+    },
+    // 删除配置
+    removeConfig(item) {
+      if (this.form.configItems.length === 1) {
+        return this.$message({
+          message: '最少保留一个配置',
+          type: 'warning'
+        });
+      }
+      var index = this.form.configItems.indexOf(item)
+      if (index !== -1) {
+        this.form.configItems.splice(index, 1)
+      }
+    },
+    // 关闭配置
+    closeConfigItem() {
+      this.form.configItems.splice(0);
+      this.form.devId = null;
+      this.dialogVisible = false;
+    },
+    // 线路属性切换
+    chooseConfigType(index, val) {
+      if (val === 'communication') { // 交流
+        this.form.configItems[index].voltageLevel = this.jlArr[0].id
+      } else if (val === 'direct_current') { // 直流
+        this.form.configItems[index].voltageLevel = this.zlArr[0].id
+      }
+
+    },
+    //验证对话框确认按钮
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          const flag = this.hasDuplicates();
+          if (flag) {
+            return this.$message({
+              message: '存在相同配置',
+              type: 'warning'
+            });
+          }
+          const obj = {
+            'devId': this.form.devId,
+            'configItems': this.form.configItems
+          }
+          configJdDevice(obj).then((res) => {
+            this.$modal.msgSuccess(res.msg);
+            this.closeConfigItem();
+          }).catch((res) => { });
+        }
+      });
+    },
+
+    // 判断是否存在相同数据
+    hasDuplicates() {
+      const configTypes = new Set();
+      const voltageLevels = new Set();
+      const distances = new Set();
+      for (const item of this.form.configItems) {
+        if (configTypes.has(item.configType) && voltageLevels.has(item.voltageLevel) && distances.has(item.distance)) {
+          return true;
+        }
+        configTypes.add(item.configType);
+        voltageLevels.add(item.voltageLevel);
+        distances.add(item.distance);
+      }
+      return false;
     },
     //搜索框点击
     searchClick() {
@@ -324,17 +497,51 @@ export default {
 
 .dev-config {
   width: 100%;
-  min-height: 150px;
   max-height: 300px;
   overflow-y: auto;
   border: 1px solid #cccccc;
   border-radius: 6px;
+  flex-direction: column;
+}
+
+.jd-dev-info {
+  width: 100%;
+  min-height: 50px;
+  flex-direction: row;
+
+}
+
+.jd-dev-detail {
+  width: calc(100% - 130px);
+  height: 100%;
+}
+
+.jd-dev-elec {
+  width: 100px;
+  height: 100%;
+  align-items: center;
+  justify-content: flex-start;
+}
+
+.jd-dev-img {
+  width: 30px;
+  height: 100%;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
 }
 
 .warn-info {
   width: 100%;
+  margin-top: 10px;
   min-height: calc(100% - 300px);
   max-height: calc(100% - 150px);
   overflow-y: auto;
 }
+
+.form-box {
+  min-height: 12vh;
+  max-height: 70vh;
+  overflow-y: auto;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/construction/manage/personManage/personManage.vue b/src/views/construction/manage/personManage/personManage.vue
index 8f610e9..a6c3d89 100644
--- a/src/views/construction/manage/personManage/personManage.vue
+++ b/src/views/construction/manage/personManage/personManage.vue
@@ -111,7 +111,7 @@
     </div>
 
 
-    <el-dialog title="选择抽检范围" :visible.sync="dialogVisible1" :append-to-body="true" width="500px">
+    <el-dialog title="选择抽检范围" :visible.sync="dialogVisible1" :append-to-body="true" width="500px" @close="dialogVisible1 = false">
       <el-input placeholder="请输入关键字" prefix-icon="el-icon-search" v-model="filterText2" maxlength="30"
         style="margin-bottom: 10px;"></el-input>
       <el-tree :data="teamTreeData" class="tree-container tree" icon="el-icon-search" show-checkbox node-key="id"
@@ -124,7 +124,7 @@
     </el-dialog>
 
 
-    <el-dialog title="自动验证人脸配置" :visible.sync="dialogVisible2" :append-to-body="true" width="500px">
+    <el-dialog title="自动验证人脸配置" :visible.sync="dialogVisible2" :append-to-body="true" width="500px" @close="closeTimeConfig">
       <el-form ref="form" :model="form" :label-position="labelPosition" :rules="rules">
         <el-form-item label="模式选择">
           <el-radio-group v-model="form.configType">
diff --git a/src/views/construction/manage/realTimeManage/realTimeManage.vue b/src/views/construction/manage/realTimeManage/realTimeManage.vue
index e3f0acc..5eed1d8 100644
--- a/src/views/construction/manage/realTimeManage/realTimeManage.vue
+++ b/src/views/construction/manage/realTimeManage/realTimeManage.vue
@@ -2,8 +2,17 @@
   <div class="realTimeManage">
     <div class="left">
       <!-- 云平台 -->
-      <div class="cloud-platform-box">
-
+      <div class="cloud-platform-box layout">
+        <div id="platform-left" class="layout">
+          <div class="left-right-btn-box layout"></div>
+        </div>
+        <div id="platform-center">
+          <div id="center-btn-top-box"></div>
+          <div id="center-btn-bottom-box"></div>
+        </div>
+        <div id="platform-right">
+          <div class="left-right-btn-box layout"></div>
+        </div>
       </div>
       <!-- 球机树 -->
       <div class="tree-box tree">
@@ -56,8 +65,6 @@ export default {
   },
   data() {
     return {
-      // 默认播放窗口
-      winDom: 'videoPlayer1',
       //页码
       pageNo: 1,
       //每页条数
@@ -167,7 +174,7 @@ export default {
         // 点击球机时触发的事件
       }
     },
-    
+
     //给梳妆街头不同层级设置不同的icon
     renderContent(h, { node, data }) {
       // 根据层级使用不同的图标
@@ -217,12 +224,48 @@ export default {
 
 .cloud-platform-box {
   width: 100%;
-  height: 250px;
+  height: 35%;
+  justify-items: center;
+  justify-content: space-evenly;
+}
+
+#platform-left,
+#platform-right {
+  width: 15%;
+  height: 52%;
+  margin-top: 30%;
+  align-items: center;
+}
+
+.left-right-btn-box {
+  width: 100%;
+  height: 100%;
+  background: url("../../../../assets/images/video/left_btn.png") no-repeat;
+  background-position: center center !important;
+}
+
+#platform-center {
+  width: 67%;
+  height: 100%;
+}
+
+#center-btn-top-box {
+  width: 100%;
+  height: 80%;
+  background: url("../../../../assets/images/video/back.png") no-repeat;
+  background-position: center center !important;
+}
+
+#center-btn-bottom-box {
+  width: 100%;
+  height: 20%;
+  background: url("../../../../assets/images/video/back3.png") no-repeat;
+  background-position: center center !important;
 }
 
 .tree-box {
   width: 100%;
-  height: calc(100% - 250px);
+  height: 65%;
   overflow-y: auto;
 }
 

From dcfd841e804b8c5a0508291551d57855b51ef67c Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 20 Aug 2024 18:17:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/bracelet/index.vue         |  7 ++++++
 src/views/base/device/index.vue           | 22 +++++++++++++----
 src/views/base/engineering/index.vue      |  7 ++++++
 src/views/base/project/index.vue          |  7 ++++++
 src/views/base/staff/index.vue            | 29 +++++++++++++++++++----
 src/views/construction/sideband/index.vue |  5 +++-
 6 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index 2ea0072..3bc8a12 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -1723,6 +1723,13 @@
 
         /** 删除按钮操作 */
         handleDelete(row) {
+            if (row.shPersonName!=null && row.shPersonName!='') {
+                this.$alert('存在领用人，无法删除', '提示', {
+                  type: 'warning',
+                  confirmButtonText: '确定',
+                });
+                return;
+              }
             if(row.shboxName!=this.boxName){
               this.$alert('请先解绑手环', '提示', {
                 type: 'warning',
diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue
index 16f683a..a0e9a99 100644
--- a/src/views/base/device/index.vue
+++ b/src/views/base/device/index.vue
@@ -1,8 +1,8 @@
 <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="deviceType">
-          <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable style="width: 100%;">
+        <el-form-item prop="deviceTypeName">
+          <el-select v-model="queryParams.deviceTypeName" placeholder="设备类型" clearable style="width: 100%;">
             <el-option
               v-for="dict in dict.type.sys_device_type"
               v-if = "dict.value != 'shx'"
@@ -146,8 +146,8 @@
       <!-- 添加或修改设备对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="600px"   append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="100px" >
-                    <el-form-item label="设备类型" prop="devcieType">
-                        <el-select v-model="form.deviceType" placeholder="请选择设备类型" clearable style="width: 100%;">
+                    <el-form-item label="设备类型" prop="devcieType" >
+                        <el-select v-if="flag == true" v-model="form.deviceTypeName" placeholder="请选择设备类型" clearable style="width: 100%;" disabled>
                          <el-option
                            v-for="dict in dict.type.sys_device_type"
                            v-if = "dict.value != 'shx'"
@@ -156,6 +156,15 @@
                            :value="dict.value"
                              />
                          </el-select>
+                         <el-select v-else v-model="form.deviceTypeName" placeholder="请选择设备类型" clearable style="width: 100%;">
+                          <el-option
+                            v-for="dict in dict.type.sys_device_type"
+                            v-if = "dict.value != 'shx'"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                              />
+                          </el-select>
                     </el-form-item>
                     <el-form-item label="设备编码" prop="deviceCode">
                         <el-input v-model="form.deviceCode" placeholder="请输入设备编码" maxlength="20"/>
@@ -407,11 +416,13 @@
         totalThree:0,
         // 设备表格数据
         tableData: [],
+        queckName: "",
         // 弹出层标题
         title: "",
         delFileId: undefined,
         // 是否显示弹出层
         open: false,
+        flag: false,
         //所属工程
         proList: [],
         deviceAttributeList : [],
@@ -696,6 +707,7 @@
         /** 新增按钮操作 */
         handleAdd() {
             this.reset();
+            this.flag = false;
             this.open = true;
             this.title = "添加设备";
         },
@@ -832,6 +844,8 @@
         /** 修改按钮操作 */
         handleUpdate(row) {
             this.reset();
+            this.flag = true;
+            this.queckName = row.lyName;
             const deviceId = row.deviceId
             getDeviceInfo(deviceId).then(response => {
               this.form = response.data;
diff --git a/src/views/base/engineering/index.vue b/src/views/base/engineering/index.vue
index 04487eb..2f20402 100644
--- a/src/views/base/engineering/index.vue
+++ b/src/views/base/engineering/index.vue
@@ -904,6 +904,13 @@
             const  param = {
               gtId:row.gtId
             }
+            if(row.teamNum>0){
+              this.$alert('该杆塔下存在班组，无法删除', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+            }
             this.$modal.confirm('是否确认删除杆塔编号为"' + row.gtCode + '"的数据项？').then(function() {
               return delGt(param);
             }).then(() => {
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index a8e7404..bf5497d 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -452,6 +452,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const projectId = row.projectId || this.ids;
+      if(row.pronum>0){
+              this.$alert('该项目部存在工程，无法删除', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+      }
       if(row.appnum>0){
               this.$alert('该项目部存在APP轮播图，无法删除', '提示', {
                 type: 'warning',
diff --git a/src/views/base/staff/index.vue b/src/views/base/staff/index.vue
index cd60bcb..4768dcb 100644
--- a/src/views/base/staff/index.vue
+++ b/src/views/base/staff/index.vue
@@ -7,6 +7,7 @@
             placeholder="请输入姓名"
             clearable
             @keyup.enter.native="handleQuery"
+            maxlength="30"
           />
         </el-form-item>
         <el-form-item label="性别" prop="sex">
@@ -174,12 +175,12 @@
           <!-- 文件格式下载，图片格式预览 -->
           <el-form-item label="高处作业证">
             <el-upload
+                class = "upload-demo"
                 action="#"
                 :limit="5"
                 :file-list="highImgList"
                 :show-file-list="true"
                 :auto-upload="false"
-                :before-upload="beforeUpload"
                 list-type="picture-card"
                 accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
                 :on-change="handleChangeHighImgList"
@@ -206,6 +207,7 @@
 
 
                 <i class="el-icon-plus avatar-uploader-icon" ></i>
+                <!-- <div  slot="tip" class="el-upload__tip">只能上传jpg/png/jpeg/pdf/doc/docx文件，且不超过10Mb</div> -->
             </el-upload>
           </el-form-item>
           <el-form-item label="电工作业证">
@@ -633,7 +635,13 @@
                         return item.uid != file.uid
                     })
                 }
-                if(fileListTemp.some(item =>item.name === file.name)){
+            if(file.name.length > 40){
+                    this.$message.warning('文件名长度不能超过40个字符')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+            if(fileListTemp.some(item =>item.name === file.name)){
                     this.$message.warning('文件名重复')
                     fileList = fileList.filter(item => {
                         return item.uid != file.uid
@@ -657,7 +665,13 @@
                         return item.uid != file.uid
                     })
                 }
-                if(fileListTemp.some(item =>item.name === file.name)){
+            if(file.name.length > 40){
+                    this.$message.warning('文件名长度不能超过40个字符')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+            if(fileListTemp.some(item =>item.name === file.name)){
                     this.$message.warning('文件名重复')
                     fileList = fileList.filter(item => {
                         return item.uid != file.uid
@@ -681,7 +695,13 @@
                         return item.uid != file.uid
                     })
                 }
-                if(fileListTemp.some(item =>item.name === file.name)){
+            if(file.name.length > 40){
+                    this.$message.warning('文件名长度不能超过40个字符')
+                    fileList = fileList.filter(item => {
+                        return item.uid != file.uid
+                    })
+                }
+            if(fileListTemp.some(item =>item.name === file.name)){
                     this.$message.warning('文件名重复')
                     fileList = fileList.filter(item => {
                         return item.uid != file.uid
@@ -1057,4 +1077,5 @@
           display: none;
       }
   }
+
   </style>
\ No newline at end of file
diff --git a/src/views/construction/sideband/index.vue b/src/views/construction/sideband/index.vue
index fdaed2e..66e220f 100644
--- a/src/views/construction/sideband/index.vue
+++ b/src/views/construction/sideband/index.vue
@@ -642,7 +642,10 @@
               bindNum:row.bindNum,
             }
             if(row.bindNum>0){
-              this.$modal.msgWarning("该边带已绑定设备，无法删除");
+              this.$alert('该边带已绑定设备，无法删除', '提示', {
+                  type: 'warning',
+                  confirmButtonText: '确定',
+                });
               return;
             }
             this.$modal.confirm('是否确认删除边带名称为"' + row.sidebandId + '"的数据项？').then(function() {