From 158f2b9d08cc1ca5995e778bb76b72b4eb66973a Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Tue, 8 Aug 2023 10:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=91=E6=9E=97=E6=B9=BE/?=
 =?UTF-8?q?=E4=B8=B4=E8=BE=B9/=E6=9C=89=E6=AF=92=E6=B0=94=E4=BD=93/?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=83=9F=E6=84=9F=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/config.js                           |   4 +-
 src/assets/js/api/edgeProtection.js           |  26 +--
 src/assets/js/http.js                         |   5 +-
 src/store/index.js                            |   8 +-
 .../jlw/laborManage/centerTop.vue             |   2 +-
 .../projectFront/carManage/carManage.vue      |  19 ++-
 .../concreteMonitoring/devManage.vue          |   2 +-
 .../edgeProtection/alarmMonitor.vue           |  83 ++++------
 .../edgeProtection/edgequtManagement.vue      |  19 ++-
 .../edgeProtection/monitorData.vue            |  13 +-
 .../projectFront/highModulus/pointManage.vue  |  27 ++-
 .../quality/material/forwardingUnit.vue       |   6 +
 .../quality/material/makeAnAppointment.vue    |  72 +++++---
 .../quality/material/receivingUnit.vue        |  12 +-
 .../quality/material/tradeName.vue            | 155 +++++++++++++++---
 .../smokeAlarmSystem/smokeAlarmMonitoring.vue |  48 ++----
 .../smokeAlarmSystem/smokeManagement.vue      |  17 +-
 .../projectFront/towerCrane/basicInfo.vue     | 144 ++++++++++------
 src/views/projectFront/towerCrane/home.vue    |   1 +
 .../towerCrane/monitoringStatistics.vue       |   1 +
 .../toxicGasDetection/gasAlarmMonitoring.vue  |  47 +++---
 .../toxicGasDetection/gasEqtManagement.vue    |  16 +-
 .../toxicGasDetection/gasMonitoringData.vue   |  12 +-
 23 files changed, 453 insertions(+), 286 deletions(-)

diff --git a/public/js/config.js b/public/js/config.js
index bff9bf94..e9918cd1 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,4 +1,4 @@
-var COMPANY = ''; //通用
+// var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@@ -14,7 +14,7 @@ var COMPANY = ''; //通用
 // COMPANY = 'zjwj'//中建五局
 // COMPANY = 'sccr'//四川成润
 // COMPANY = 'pssh'//坪山沙湖项目
-// COMPANY = 'jlw'//金林湾
+COMPANY = 'jlw'//金林湾
 // COMPANY = 'shzj'//上海张江
 
 
diff --git a/src/assets/js/api/edgeProtection.js b/src/assets/js/api/edgeProtection.js
index 0e72114a..0e0c424d 100644
--- a/src/assets/js/api/edgeProtection.js
+++ b/src/assets/js/api/edgeProtection.js
@@ -43,6 +43,8 @@ export const editePoisonousGasDevApi = (data) =>
   post('/xmgl/poisonousGasDev/edit', data)
 export const getPoisonousGasDevPageApi = (data) =>
   get('/xmgl/poisonousGasDev/page', data)
+export const getPoisonousGasDevListApi = (data) =>
+  get('/xmgl/poisonousGasDev/list', data)
 
 //有毒气体监测-监测数据
 export const getPoisonousGasPageApi = (data) =>
@@ -60,21 +62,19 @@ export const editPoisonousGasDevAlarmApi = (data) =>
   post('/xmgl/poisonousGasDevAlarm/edit', data)
 
 //烟感设备管理-设备管理
-export const addSmokeDevApi = (data) =>
-  post('/xmgl/smokeDev/add', data)
-export const deleteSmokeDevApi = (data) =>
-  post('/xmgl/smokeDev/delete', data)
-export const editeSmokeDevApi = (data) =>
-  post('/xmgl/smokeDev/edit', data)
-export const getSmokeDevPageApi = (data) =>
-  get('/xmgl/smokeDev/page', data)
+export const addSmokeDevApi = (data) => post('/xmgl/smokeDev/add', data)
+export const deleteSmokeDevApi = (data) => post('/xmgl/smokeDev/delete', data)
+export const editeSmokeDevApi = (data) => post('/xmgl/smokeDev/edit', data)
+export const getSmokeDevPageApi = (data) => get('/xmgl/smokeDev/page', data)
 
-
-  //烟感设备管理-告警监测
+//烟感设备管理-告警监测
 export const deleteSmokeDevAlarmApi = (data) =>
-post('/xmgl/smokeDevAlarm/delete', data)
+  post('/xmgl/smokeDevAlarm/delete', data)
 export const getSmokeDevAlarmPageApi = (data) =>
-get('/xmgl/smokeDevAlarm/page', data)
+  get('/xmgl/smokeDevAlarm/page', data)
 //编辑
 export const editSmokeDevAlarmApi = (data) =>
-post('/xmgl/smokeDevAlarm/edit', data)
+  post('/xmgl/smokeDevAlarm/edit', data)
+
+export const getSmokeDevAlarmListApi = (data) =>
+  get('/xmgl/smokeDev/list', data)
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 9ab11b13..7fb6d363 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -69,7 +69,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
   // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
   // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
-  // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
+  axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
   // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
@@ -82,7 +82,8 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL ='http://61.145.163.135:12345/' //坪山沙湖
     // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
     // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
-    axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地
+    // axios.defaults.baseURL ='http://101.43.164.214:45011' //上海优益
+    // axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'
 } else if (process.env.NODE_ENV == 'production') {
diff --git a/src/store/index.js b/src/store/index.js
index 2b6c9f23..a1e32524 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -105,10 +105,10 @@ export default new Vuex.Store({
     // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上）
     // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式）
     // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式）
-    // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
-    // FILEURL: 'http://121.196.214.246/api/image/',//金林湾
-    UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
-    FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
+    UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
+    FILEURL: 'http://121.196.214.246/api/image/',//金林湾
+    // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
+    // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
 
     ACCOUNTTYPE: [
       "系统管理员",
diff --git a/src/views/projectAdmin/jlw/laborManage/centerTop.vue b/src/views/projectAdmin/jlw/laborManage/centerTop.vue
index 1a2555a9..b5791b40 100644
--- a/src/views/projectAdmin/jlw/laborManage/centerTop.vue
+++ b/src/views/projectAdmin/jlw/laborManage/centerTop.vue
@@ -9,7 +9,7 @@
           <div class="box">
             <div class="outBox" v-for="(item,index) in workerTypeList" :key="index">
               <span class="name">{{item.typeName}}</span>
-              <p class="num">{{item.workerNum}}</p>
+              <p class="num">{{item.totalPersonNum}}</p>
             </div>
           </div>
         </div>
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue
index a3c3fd60..7f2e91aa 100644
--- a/src/views/projectFront/carManage/carManage.vue
+++ b/src/views/projectFront/carManage/carManage.vue
@@ -44,7 +44,7 @@
           :label="$t('message.carManage.carNumber')"
         ></el-table-column>
         <el-table-column
-        v-if="COMPANY != 'neimenggu'"
+          v-if="COMPANY != 'neimenggu'"
           prop="carColor"
           :label="$t('message.carManage.carColor')"
           align="center"
@@ -167,6 +167,8 @@
             prop="carNumber"
           >
             <el-input
+              :maxlength="7"
+              @input="handleInput"
               v-model="addEditForm.carNumber"
               :placeholder="$t('message.deviceManage.placeholder')"
             ></el-input>
@@ -260,6 +262,7 @@
           <!-- 司机电话 -->
           <el-form-item label="司机电话" prop="driverTelephone">
             <el-input
+            type="number"
               v-model="addEditForm.driverTelephone"
               placeholder="请输入"
             ></el-input>
@@ -324,6 +327,9 @@
   </div>
 </template>
 <script>
+import {
+  checkPhone,
+} from '@/assets/js/util.js'
 import {
   addCarInfoApi,
   editCarInfoApi,
@@ -415,6 +421,11 @@ export default {
     }
   },
   methods: {
+    //限制只能输入英文和数字
+    handleInput() {
+      // 使用正则表达式匹配只允许输入英文和数字
+      this.addEditForm.carNumber = this.addEditForm.carNumber.replace(/[^a-zA-Z0-9]/g, '')
+    },
     changeDriverFn() {
       // let arr1=[],arr2=[]
       // for (let index = 0; index < this.appWorkerList.length; index++) {
@@ -496,6 +507,12 @@ export default {
       if (this.addEditForm.driverWorkerId) {
         params.driverWorkerId = this.addEditForm.driverWorkerId.join(',');
       }
+      if (this.addEditForm.driverTelephone) {
+        if (!checkPhone(this.addEditForm.driverTelephone)) {
+          this.$message.error("请输入正确的负责人电话");
+          return;
+        }
+      }
       this.$refs.addEditForm.validate((valid) => {
         if (valid) {
           if (this.Popup.type === 'add') {
diff --git a/src/views/projectFront/concreteMonitoring/devManage.vue b/src/views/projectFront/concreteMonitoring/devManage.vue
index 0c45a1fd..e256a5ec 100644
--- a/src/views/projectFront/concreteMonitoring/devManage.vue
+++ b/src/views/projectFront/concreteMonitoring/devManage.vue
@@ -28,7 +28,7 @@
       ></el-table-column>
       <el-table-column
         prop="devSn"
-        :label="$t('message.devManage.devNo')"
+        label="设备id"
       ></el-table-column>
       <!-- 监控点位数（个） -->
       <el-table-column
diff --git a/src/views/projectFront/edgeProtection/alarmMonitor.vue b/src/views/projectFront/edgeProtection/alarmMonitor.vue
index 91ff0845..ce5bd7e3 100644
--- a/src/views/projectFront/edgeProtection/alarmMonitor.vue
+++ b/src/views/projectFront/edgeProtection/alarmMonitor.vue
@@ -8,9 +8,9 @@
           <el-select v-model="devName" placeholder="请选择">
             <el-option
               :label="item.devName"
-              :value="item.id"
+              :value="item.devSn"
               v-for="(item, index) in towerList"
-              :key="item.id"
+              :key="item.devSn"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -78,7 +78,6 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        style="margin-top: 136px"
         class="pagerBox"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -133,7 +132,7 @@
               type="textarea"
               :rows="2"
               v-model="addEditForm.description"
-              placeholder="请输入"
+              :placeholder="disTitle == '处置记录' ? '' : '请输入'"
             ></el-input>
           </el-form-item>
           <el-form-item label="上传图片" prop="image">
@@ -190,60 +189,30 @@
         <el-form
           size="medium"
           ref="addEditForm"
-          :model="addEditForm"
-          :rules="addEditRules"
           label-width="120px"
           class="dialogFormBox"
         >
           <el-form-item label="安装位置">
-            <el-input
-              v-model="addEditForm.location"
-              placeholder="请输入"
-              disabled
-            ></el-input>
+            <el-input v-model="detailData.location" disabled></el-input>
           </el-form-item>
           <el-form-item label="设备名称">
-            <el-input
-              v-model="addEditForm.devName"
-              placeholder="请输入"
-              disabled
-            ></el-input>
+            <el-input v-model="detailData.devName" disabled></el-input>
           </el-form-item>
           <el-form-item label="编号">
-            <el-input
-              v-model="addEditForm.devSn"
-              placeholder="请输入"
-              disabled
-            ></el-input>
+            <el-input v-model="detailData.devSn" disabled></el-input>
           </el-form-item>
           <el-form-item label="监测对象">
-            <el-input
-              v-model="addEditForm.monitorObject"
-              placeholder="请输入"
-              disabled
-            ></el-input>
+            <el-input v-model="detailData.monitorObject" disabled></el-input>
           </el-form-item>
           <el-form-item label="告警详情">
-            <el-input
-              v-model="addEditForm.alarmDetail"
-              placeholder="请输入"
-              disabled
-            ></el-input>
+            <el-input v-model="detailData.alarmDetail" disabled></el-input>
           </el-form-item>
           <el-form-item label="报警时间">
-            <el-input
-              v-model="addEditForm.alarmTime"
-              placeholder="请输入"
-              disabled
-            ></el-input>
+            <el-input v-model="detailData.alarmTime" disabled></el-input>
           </el-form-item>
           <div class="dialog-footer">
-            <el-button
-              @click="detailsShow = false"
-              type="primary"
-              icon="el-icon-circle-check"
-              size="medium"
-              >确认
+            <el-button @click="detailsShow = false" type="primary" size="medium"
+              >关闭
             </el-button>
           </div>
         </el-form>
@@ -262,6 +231,7 @@ import {
 export default {
   data() {
     return {
+      detailData:{},
       disTitle: '',
       fileList: [],
       dialogShow: false,//处置详情弹框
@@ -275,8 +245,8 @@ export default {
         handleDone: 0,
         image: '',
         id: '',
-        monitorObject: '',
-        alarmDetail: '',
+        // monitorObject: '',
+        // alarmDetail: '',
         alarmTime: '',
       },
       addEditRules: {
@@ -320,7 +290,7 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
-        devName: this.devName,
+        devSn: this.devName,
       };
       getDevAlarmPageApi(data).then((res) => {
         if (res.code == 200) {
@@ -330,19 +300,19 @@ export default {
           res.result.records.map((item) => {
             if (item.image != null) {
               item.image = JSON.parse(item.image)
-            if (
-              item.image.length !== 0 &&
-              !item.image[0].url.includes(this.$store.state.FILEURL)
-            ) {
-              item.image[0].url =
-                this.$store.state.FILEURL + item.image[0].url
-            }
-            }else{
+              if (
+                item.image.length !== 0 &&
+                !item.image[0].url.includes(this.$store.state.FILEURL)
+              ) {
+                item.image[0].url =
+                  this.$store.state.FILEURL + item.image[0].url
+              }
+            } else {
               item.image = []
             }
-           
+
           })
-         
+
         }
       });
     },
@@ -368,6 +338,7 @@ export default {
       this.disTitle = '处置详情'
       this.recordShow = true
       this.addEditForm.id = val
+      this.addEditForm.handleResult=1
     },
     //点击已闭合
     closedBtn(obj) {
@@ -409,6 +380,8 @@ export default {
     },
     //查看详情
     detailBtn(val) {
+      this.detailData=val
+      console.log('查看详情1111', this.detailData);
       this.detailsShow = true
       console.log('查看详情', val);
       this.addEditForm = JSON.parse(JSON.stringify(val))
diff --git a/src/views/projectFront/edgeProtection/edgequtManagement.vue b/src/views/projectFront/edgeProtection/edgequtManagement.vue
index 07c74d89..82346942 100644
--- a/src/views/projectFront/edgeProtection/edgequtManagement.vue
+++ b/src/views/projectFront/edgeProtection/edgequtManagement.vue
@@ -56,9 +56,9 @@
             />
           </div>
         </el-table-column>
-        <el-table-column prop="status" label="使用状态" align="center">
+        <el-table-column prop="online" label="使用状态" align="center">
           <template slot-scope="scope">{{
-            scope.row.status == 1 ? '正常' : '异常'
+            scope.row.online == 1 ? '在线' : '离线'
           }}</template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -123,29 +123,28 @@
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.devName"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="设备编号" prop="devSn">
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.devSn"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="安装位置" prop="location">
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.location"
-              placeholder="请输入"
-              type="number"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="责任班组" prop="dutyTeamInfoId">
             <el-select
               :disabled="title == '设备详情'"
               v-model="addEditForm.dutyTeamInfoId"
-              placeholder="请选择"
+              :placeholder="isAdding ? '请输入' : ''"
             >
               <el-option
                 v-for="item in options"
@@ -189,7 +188,8 @@
               type="textarea"
               :rows="2"
               v-model="addEditForm.remark"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
+
             ></el-input>
           </el-form-item>
           <div class="dialog-footer" v-if="title != '设备详情'">
@@ -228,6 +228,7 @@ export default {
   },
   data() {
     return {
+      isAdding:true,
       searchFormInput: {
         devName: '',
       },
@@ -308,6 +309,7 @@ export default {
   methods: {
     //查看详情
     deilBtn(val) {
+      this.isAdding=false
       console.log('查看详情', val);
       this.title = '设备详情'
       this.diaLogShow = true
@@ -330,6 +332,7 @@ export default {
       this.diaLogShow = true
       this.title = '新增设备'
       this.fileList = []
+      this.isAdding=true
     },
     edit(obj) {
       this.diaLogShow = true
diff --git a/src/views/projectFront/edgeProtection/monitorData.vue b/src/views/projectFront/edgeProtection/monitorData.vue
index 8d2c2f78..5f1cfbdd 100644
--- a/src/views/projectFront/edgeProtection/monitorData.vue
+++ b/src/views/projectFront/edgeProtection/monitorData.vue
@@ -19,9 +19,9 @@
           <el-select v-model="devName" placeholder="请选择">
             <el-option
               :label="item.devName"
-              :value="item.id"
+              :value="item.devSn"
               v-for="(item, index) in towerList"
-              :key="item.id"
+              :key="item.devSn"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -40,16 +40,13 @@
         style="width: 100%"
         height="600px"
       >
-        <el-table-column prop="createDate" align="center" label="上报时间">
+        <el-table-column prop="receiveTime" align="center" label="上报时间">
         </el-table-column>
         <el-table-column prop="devName" align="center" label="设备名称">
         </el-table-column>
         <el-table-column prop="devSn" align="center" label="编号">
         </el-table-column>
         <el-table-column prop="operatingStatus" align="center" label="运行状态">
-          <template slot-scope="scope">{{
-            scope.row.operatingStatus == 1 ? '正常' : '异常'
-          }}</template>
         </el-table-column>
         <el-table-column prop="portStatus1" align="center" label="线锁一">
           <template slot-scope="scope">{{
@@ -109,7 +106,6 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        style="margin-top: 136px"
         class="pagerBox"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -145,6 +141,7 @@ export default {
     this.projectSn = this.$store.state.projectSn;
     this.getTowerList();
     this.getListData();
+    this.time=['', '']
   },
   methods: {
     //获取设备下拉
@@ -166,7 +163,7 @@ export default {
         current: this.current,
         size: this.size,
         projectSn: this.projectSn,
-        devName: this.devName,
+        devSn: this.devName,
       };
       getfpdcdPageApi(data).then((res) => {
         if (res.code == 200) {
diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue
index 527b5301..7429d21e 100644
--- a/src/views/projectFront/highModulus/pointManage.vue
+++ b/src/views/projectFront/highModulus/pointManage.vue
@@ -121,6 +121,7 @@
             prop="measurePointNumber"
           >
             <el-input
+              type="number"
               v-model="ruleForm.measurePointNumber"
               :placeholder="$t('message.highModulus.placeholderText')"
               :disabled="!isAdd"
@@ -132,6 +133,7 @@
             prop="acquisitionInstrumentNumber"
           >
             <el-input
+              type="number"
               v-model="ruleForm.acquisitionInstrumentNumber"
               :placeholder="$t('message.highModulus.placeholderText')"
             ></el-input>
@@ -164,8 +166,9 @@
                 <el-input
                   size="medium"
                   v-model="scope.row.warningValue"
-                  type="number"
-                  oninput="if(value.length>3)value=value.slice(0,3)"
+                  onkeyup="value=value.match(/\d+\.?\d{0,2}/)"
+                  onafterpaste="this.value=this.value.match(/\d+\.?\d{0,2}/)"
+                  maxlength="9"
                 ></el-input>
               </template>
             </el-table-column>
@@ -176,10 +179,11 @@
             >
               <template slot-scope="scope">
                 <el-input
+                  onkeyup="value=value.match(/\d+\.?\d{0,2}/)"
+                  onafterpaste="this.value=this.value.match(/\d+\.?\d{0,2}/)"
+                  maxlength="9"
                   size="medium"
                   v-model="scope.row.alarmValue"
-                  type="number"
-                  oninput="if(value.length>3)value=value.slice(0,3)"
                 ></el-input>
               </template>
             </el-table-column>
@@ -518,7 +522,8 @@ export default {
       dialogDev: false,
       devList: [],
       devOpType: 1, //1：添加  2：编辑  3：详细
-      deviceTypeArr: ['倾角', '压力', '沉降']
+      deviceTypeArr: ['倾角', '压力', '沉降'],
+      cancelList: [] // 取消的数据数组
     }
   },
   mounted() {
@@ -773,7 +778,17 @@ export default {
     },
     // 取消
     canselDevInfo(val, index) {
-      this.devList.splice(index, 1)
+      const originalItem = this.devList[index];
+      console.log('取消的类型---', originalItem.devOpType);
+      if (originalItem.devOpType === 1) {
+        // 如果是新增的设备，直接从列表中移除
+        this.devList.splice(index, 1);
+      } else if (originalItem.devOpType === 2) {
+        // 如果是编辑的设备，将原始数据还原到列表中
+        this.$set(this.devList, index, originalItem);
+        this.dialogDev = true
+        this.loadDevList()
+      }
     }
   }
 }
diff --git a/src/views/projectFront/quality/material/forwardingUnit.vue b/src/views/projectFront/quality/material/forwardingUnit.vue
index 2d85b96c..6601a28c 100644
--- a/src/views/projectFront/quality/material/forwardingUnit.vue
+++ b/src/views/projectFront/quality/material/forwardingUnit.vue
@@ -96,6 +96,7 @@
         >
           <el-form-item label="发货单位：" prop="unitName">
             <el-input
+            :maxlength="30"
               v-model="form.unitName"
               style="width: 350px"
               placeholder="请输入"
@@ -103,6 +104,7 @@
           </el-form-item>
           <el-form-item label="单位负责人：" prop="unitChargeName">
             <el-input
+            :maxlength="30"
               v-model="form.unitChargeName"
               style="width: 350px"
               placeholder="请输入"
@@ -119,6 +121,7 @@
           </el-form-item>
           <el-form-item label="单位地址：" prop="unitAddress">
             <el-input
+            :maxlength="30"
               v-model="form.unitAddress"
               style="width: 350px"
               placeholder="请输入"
@@ -152,6 +155,7 @@
         >
           <el-form-item label="发货单位：" prop="unitName">
             <el-input
+            :maxlength="30"
               v-model="editForm.unitName"
               style="width: 350px"
               placeholder="请输入"
@@ -159,6 +163,7 @@
           </el-form-item>
           <el-form-item label="单位负责人：" prop="unitChargeName">
             <el-input
+            :maxlength="30"
               v-model="editForm.unitChargeName"
               style="width: 350px"
               placeholder="请输入"
@@ -175,6 +180,7 @@
           </el-form-item>
           <el-form-item label="单位地址：" prop="unitAddress">
             <el-input
+            :maxlength="30"
               v-model="editForm.unitAddress"
               style="width: 350px"
               placeholder="请输入"
diff --git a/src/views/projectFront/quality/material/makeAnAppointment.vue b/src/views/projectFront/quality/material/makeAnAppointment.vue
index 831216e3..af6f7e5d 100644
--- a/src/views/projectFront/quality/material/makeAnAppointment.vue
+++ b/src/views/projectFront/quality/material/makeAnAppointment.vue
@@ -33,7 +33,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="addDateTime" label="录入时间" align="center"></el-table-column>
-          <el-table-column label="操作" align="center"  width="160">
+          <el-table-column label="操作" align="center" width="160">
             <template slot-scope="scope">
               <div class="tableBtns">
                 <div @click="editBtn(scope.row)" class="operationText">
@@ -48,37 +48,33 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination
-          class="pagerBox"
-          background
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="pageNo"
-          :page-sizes="$store.state.PAGESIZRS"
-          :page-size="pageSize"
-          layout="total, sizes, prev, pager, next"
-          :total="Number(total)"
-        ></el-pagination>
+        <el-pagination class="pagerBox" background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          :current-page="pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pageSize"
+          layout="total, sizes, prev, pager, next" :total="Number(total)"></el-pagination>
       </vue-scroll>
     </div>
-    <el-dialog :modal-append-to-body="false" title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
+    <el-dialog :modal-append-to-body="false" title="新增" :visible.sync="dialogVisibleAdd" width="30%"
+      :before-close="handleClose">
       <el-form ref="form" :model="form" label-width="150px" :rules="addEditRules">
         <el-form-item label="车牌号码：" prop="licensePlate">
-          <el-input v-model="form.licensePlate" style="width:350px" placeholder="请输入"></el-input>
+          <el-input v-model="form.licensePlate" style="width:350px" placeholder="请输入" @input="handleInput(1)" :maxlength="7"></el-input>
         </el-form-item>
         <el-form-item label="发货单位：" prop="forwardingUnit">
           <el-select v-model="form.forwardingUnit" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in faowardList" :key="item.unitName" :label="item.unitName" :value="item.unitName"> </el-option>
+            <el-option v-for="item in faowardList" :key="item.unitName" :label="item.unitName" :value="item.unitName">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="收货单位：" prop="receivingUnit">
           <el-select v-model="form.receivingUnit" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in receiveList" :key="item.unitName" :label="item.unitName" :value="item.unitName"> </el-option>
+            <el-option v-for="item in receiveList" :key="item.unitName" :label="item.unitName" :value="item.unitName">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="货物名称：" prop="goodsName">
           <el-select v-model="form.goodsName" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in tradeNameList" :key="item.goodsName" :label="item.goodsName" :value="item.goodsName"> </el-option>
+            <el-option v-for="item in tradeNameList" :key="item.goodsName" :label="item.goodsName"
+              :value="item.goodsName"> </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="规格型号：" prop="specifications">
@@ -89,7 +85,8 @@
         </el-form-item>
         <el-form-item label="过磅类型：" prop="weighingType">
           <el-select v-model="form.weighingType" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in makeAnAppointmentList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+            <el-option v-for="item in makeAnAppointmentList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -98,24 +95,29 @@
         <el-button type="primary" @click="okAdd">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose">
+    <el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%"
+      :before-close="handleClose">
       <el-form ref="editForm" :model="editForm" label-width="150px" :rules="addEditRules">
         <el-form-item label="车牌号码：" prop="licensePlate">
-          <el-input v-model="editForm.licensePlate" style="width:350px" placeholder="请输入"></el-input>
+          <el-input v-model="editForm.licensePlate" style="width:350px" placeholder="请输入"
+            @input="handleInput(2)" :maxlength="7"></el-input>
         </el-form-item>
         <el-form-item label="发货单位：" prop="forwardingUnit">
           <el-select v-model="editForm.forwardingUnit" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in faowardList" :key="item.unitName" :label="item.unitName" :value="item.unitName"> </el-option>
+            <el-option v-for="item in faowardList" :key="item.unitName" :label="item.unitName" :value="item.unitName">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="收货单位：" prop="receivingUnit">
           <el-select v-model="editForm.receivingUnit" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in receiveList" :key="item.unitName" :label="item.unitName" :value="item.unitName"> </el-option>
+            <el-option v-for="item in receiveList" :key="item.unitName" :label="item.unitName" :value="item.unitName">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="货物名称：" prop="goodsName">
           <el-select v-model="editForm.goodsName" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in tradeNameList" :key="item.goodsName" :label="item.goodsName" :value="item.goodsName"> </el-option>
+            <el-option v-for="item in tradeNameList" :key="item.goodsName" :label="item.goodsName"
+              :value="item.goodsName"> </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="规格型号：" prop="specifications">
@@ -126,7 +128,8 @@
         </el-form-item>
         <el-form-item label="过磅信息：" prop="weighingType">
           <el-select v-model="editForm.weighingType" placeholder="请选择" style="width:350px">
-            <el-option v-for="item in makeAnAppointmentList" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+            <el-option v-for="item in makeAnAppointmentList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -215,6 +218,17 @@ export default {
     this.getListData()
   },
   methods: {
+    //限制只能输入英文和数字
+    handleInput(type) {
+      if (type == 1) {
+        // 使用正则表达式匹配只允许输入英文和数字
+        this.form.licensePlate = this.form.licensePlate.replace(/[^a-zA-Z0-9]/g, '')
+      } else {
+        // 使用正则表达式匹配只允许输入英文和数字
+        this.editForm.licensePlate = this.editForm.licensePlate.replace(/[^a-zA-Z0-9]/g, '')
+      }
+
+    },
     getEquipmentList() {
       getAllRefuelingRecordList({ projectSn: this.projectSn }).then(res => {
         this.EquipmentList = res.result
@@ -392,19 +406,23 @@ export default {
   width: 100%;
   height: 100%;
 }
+
 .title {
   padding: 20px 15px 0;
   width: 100%;
 }
+
 .content {
   margin-top: 15px;
   height: calc(100% - 93px);
 }
+
 .table_wrap {
   width: 100%;
   height: 100%;
   padding: 15px 20px;
 }
+
 table {
   border-collapse: collapse;
 }
@@ -422,16 +440,18 @@ th {
 .setTd {
   width: 25%;
 }
+
 .site {
   text-align: right;
 }
+
 .site2 {
   text-align: center;
 }
+
 .ellipsis {
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-}
-</style>
+}</style>
diff --git a/src/views/projectFront/quality/material/receivingUnit.vue b/src/views/projectFront/quality/material/receivingUnit.vue
index 7e639376..86864608 100644
--- a/src/views/projectFront/quality/material/receivingUnit.vue
+++ b/src/views/projectFront/quality/material/receivingUnit.vue
@@ -50,16 +50,16 @@
       <el-dialog :modal-append-to-body="false" title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
         <el-form ref="form" :model="form" label-width="150px" :rules="addEditRules">
           <el-form-item label="收货单位：" prop="unitName">
-            <el-input v-model="form.unitName" style="width:350px" placeholder="请输入"></el-input>
+            <el-input v-model="form.unitName" style="width:350px" placeholder="请输入" :maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="单位负责人：" prop="unitChargeName">
-            <el-input v-model="form.unitChargeName" style="width:350px" placeholder="请输入"></el-input>
+            <el-input v-model="form.unitChargeName" style="width:350px" placeholder="请输入" :maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="负责人电话：" prop="chargePhone">
             <el-input v-model="form.chargePhone" style="width:350px" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="单位地址：" prop="unitAddress">
-            <el-input v-model="form.unitAddress" style="width:350px" placeholder="请输入"></el-input>
+            <el-input v-model="form.unitAddress" style="width:350px" placeholder="请输入" :maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="统一社会信用代码：" prop="socialCode">
             <el-input v-model="form.socialCode" style="width:350px" placeholder="请输入"></el-input>
@@ -73,16 +73,16 @@
       <el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose">
         <el-form ref="editForm" :model="editForm" label-width="150px" :rules="addEditRules">
           <el-form-item label="收货单位：" prop="unitName">
-            <el-input v-model="editForm.unitName" style="width:350px" placeholder="请输入"></el-input>
+            <el-input v-model="editForm.unitName" style="width:350px" placeholder="请输入" :maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="单位负责人：" prop="unitChargeName">
-            <el-input v-model="editForm.unitChargeName" style="width:350px" placeholder="请输入"></el-input>
+            <el-input v-model="editForm.unitChargeName" style="width:350px" placeholder="请输入" :maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="负责人电话：" prop="chargePhone">
             <el-input v-model="editForm.chargePhone" style="width:350px" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="单位地址：" prop="unitAddress">
-            <el-input v-model="editForm.unitAddress" style="width:350px" placeholder="请输入"></el-input>
+            <el-input v-model="editForm.unitAddress" style="width:350px" placeholder="请输入" :maxlength="30"></el-input>
           </el-form-item>
           <el-form-item label="统一社会信用代码：" prop="socialCode">
             <el-input v-model="editForm.socialCode" style="width:350px" placeholder="请输入"></el-input>
diff --git a/src/views/projectFront/quality/material/tradeName.vue b/src/views/projectFront/quality/material/tradeName.vue
index d3ef806a..009c5241 100644
--- a/src/views/projectFront/quality/material/tradeName.vue
+++ b/src/views/projectFront/quality/material/tradeName.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="diaryList">
     <div class="whiteBlock title">
-      <el-form :inline="true" size="medium" :model="formInline" class="demo-form-inline">
+      <el-form
+        :inline="true"
+        size="medium"
+        :model="formInline"
+        class="demo-form-inline"
+      >
         <el-form-item label="名称：">
           <el-input v-model="formInline.name" placeholder="请输入"></el-input>
         </el-form-item>
@@ -15,20 +20,46 @@
     <div class="content whiteBlock">
       <vue-scroll style="height: 100%">
         <el-table class="tables" :data="tableList">
-          <el-table-column prop="goodsName" label="货名" align="center"></el-table-column>
-          <el-table-column prop="unitPrice" label="单价" align="center"></el-table-column>
-          <el-table-column prop="foldSquare" label="折方系数" align="center"></el-table-column>
-          <el-table-column prop="goodsBuckledHeavily" label="货名扣重" align="center"></el-table-column>
-          <el-table-column prop="goodsInventory" label="货物存量" align="center"></el-table-column>
-          <el-table-column label="操作" align="center"  width="160">
+          <el-table-column
+            prop="goodsName"
+            label="货名"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="unitPrice"
+            label="单价"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="foldSquare"
+            label="折方系数"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="goodsBuckledHeavily"
+            label="货名扣重"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="goodsInventory"
+            label="货物存量"
+            align="center"
+          ></el-table-column>
+          <el-table-column label="操作" align="center" width="160">
             <template slot-scope="scope">
               <div class="tableBtns">
                 <div @click="editBtn(scope.row)" class="operationText">
-                  <i class="el-icon-edit" style="color: #8dacfa; font-size: 16px; margin-right: 2px"></i>
+                  <i
+                    class="el-icon-edit"
+                    style="color: #8dacfa; font-size: 16px; margin-right: 2px"
+                  ></i>
                   <span>编辑</span>
                 </div>
                 <div @click="deleteBtn(scope.row)" class="operationText">
-                  <i class="el-icon-delete" style="color: #eb5760; font-size: 16px; margin-right: 2px"></i>
+                  <i
+                    class="el-icon-delete"
+                    style="color: #eb5760; font-size: 16px; margin-right: 2px"
+                  ></i>
                   <span>删除</span>
                 </div>
               </div>
@@ -47,22 +78,61 @@
           :total="Number(total)"
         ></el-pagination>
       </vue-scroll>
-      <el-dialog :modal-append-to-body="false" title="新增" :visible.sync="dialogVisibleAdd" width="30%" :before-close="handleClose">
-        <el-form ref="form" :model="form" label-width="150px" :rules="addEditRules">
+      <el-dialog
+        :modal-append-to-body="false"
+        title="新增"
+        :visible.sync="dialogVisibleAdd"
+        width="30%"
+        :before-close="handleClose"
+      >
+        <el-form
+          ref="form"
+          :model="form"
+          label-width="150px"
+          :rules="addEditRules"
+        >
           <el-form-item label="货名：" prop="goodsName">
-            <el-input v-model="form.goodsName" style="width:350px" placeholder="请输入"></el-input>
+            <el-input
+              v-model="form.goodsName"
+              style="width: 350px"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
           <el-form-item label="单价：" prop="unitPrice">
-            <el-input v-model="form.unitPrice" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="form.unitPrice"
+              style="width: 350px"
+              placeholder="请输入"
+              onkeyup="value=value.match(/\d+\.?\d{0,2}/)"
+              onafterpaste="this.value=this.value.match(/\d+\.?\d{0,2}/)"
+            ></el-input>
           </el-form-item>
           <el-form-item label="折方系数：" prop="foldSquare">
-            <el-input v-model="form.foldSquare" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="form.foldSquare"
+              style="width: 350px"
+              placeholder="请输入"
+              onkeyup="value=value.match(/\d+\.?\d{0,2}/)"
+              onafterpaste="this.value=this.value.match(/\d+\.?\d{0,2}/)"
+            ></el-input>
           </el-form-item>
           <el-form-item label="货名扣重：" prop="goodsBuckledHeavily">
-            <el-input v-model="form.goodsBuckledHeavily" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="form.goodsBuckledHeavily"
+              style="width: 350px"
+              placeholder="请输入"
+              type="number"
+              oninput="value=value.replace(/^0|[^0-9]/g,'')"
+            ></el-input>
           </el-form-item>
           <el-form-item label="货物存量：" prop="goodsInventory">
-            <el-input v-model="form.goodsInventory" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="form.goodsInventory"
+              style="width: 350px"
+              placeholder="请输入"
+              type="number"
+              oninput="value=value.replace(/^0|[^0-9]/g,'')"
+            ></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -70,22 +140,61 @@
           <el-button type="primary" @click="okAdd">确 定</el-button>
         </span>
       </el-dialog>
-      <el-dialog :modal-append-to-body="false" title="编辑" :visible.sync="dialogVisibleEdit" width="30%" :before-close="handleClose">
-        <el-form ref="editForm" :model="editForm" label-width="150px" :rules="addEditRules">
+      <el-dialog
+        :modal-append-to-body="false"
+        title="编辑"
+        :visible.sync="dialogVisibleEdit"
+        width="30%"
+        :before-close="handleClose"
+      >
+        <el-form
+          ref="editForm"
+          :model="editForm"
+          label-width="150px"
+          :rules="addEditRules"
+        >
           <el-form-item label="货名：" prop="goodsName">
-            <el-input v-model="editForm.goodsName" style="width:350px" placeholder="请输入"></el-input>
+            <el-input
+              v-model="editForm.goodsName"
+              style="width: 350px"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
           <el-form-item label="单价：" prop="unitPrice">
-            <el-input v-model="editForm.unitPrice" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="editForm.unitPrice"
+              style="width: 350px"
+              placeholder="请输入"
+              onkeyup="value=value.match(/\d+\.?\d{0,2}/)"
+              onafterpaste="this.value=this.value.match(/\d+\.?\d{0,2}/)"
+            ></el-input>
           </el-form-item>
           <el-form-item label="折方系数：" prop="foldSquare">
-            <el-input v-model="editForm.foldSquare" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="editForm.foldSquare"
+              style="width: 350px"
+              placeholder="请输入"
+              onkeyup="value=value.match(/\d+\.?\d{0,2}/)"
+              onafterpaste="this.value=this.value.match(/\d+\.?\d{0,2}/)"
+            ></el-input>
           </el-form-item>
           <el-form-item label="货名扣重：" prop="goodsBuckledHeavily">
-            <el-input v-model="editForm.goodsBuckledHeavily" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="editForm.goodsBuckledHeavily"
+              style="width: 350px"
+              placeholder="请输入"
+              type="number"
+              oninput="value=value.replace(/^0|[^0-9]/g,'')"
+            ></el-input>
           </el-form-item>
           <el-form-item label="货物存量：" prop="goodsInventory">
-            <el-input v-model="editForm.goodsInventory" style="width:350px" placeholder="请输入" type="number"></el-input>
+            <el-input
+              v-model="editForm.goodsInventory"
+              style="width: 350px"
+              placeholder="请输入"
+              type="number"
+              oninput="value=value.replace(/^0|[^0-9]/g,'')"
+            ></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
diff --git a/src/views/projectFront/smokeAlarmSystem/smokeAlarmMonitoring.vue b/src/views/projectFront/smokeAlarmSystem/smokeAlarmMonitoring.vue
index bdce9aed..fb7fb033 100644
--- a/src/views/projectFront/smokeAlarmSystem/smokeAlarmMonitoring.vue
+++ b/src/views/projectFront/smokeAlarmSystem/smokeAlarmMonitoring.vue
@@ -8,9 +8,9 @@
           <el-select v-model="devName" placeholder="请选择">
             <el-option
               :label="item.devName"
-              :value="item.id"
+              :value="item.devSn"
               v-for="(item, index) in towerList"
-              :key="item.id"
+              :key="item.devSn"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -99,7 +99,6 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        style="margin-top: 136px"
         class="pagerBox"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -154,7 +153,7 @@
               type="textarea"
               :rows="2"
               v-model="addEditForm.description"
-              placeholder="请输入"
+              :placeholder="disTitle == '处置记录' ? '' : '请输入'"
             ></el-input>
           </el-form-item>
           <el-form-item label="上传图片" prop="image">
@@ -210,50 +209,42 @@
       <div class="dialog_content">
         <el-form
           size="medium"
-          ref="addEditForm"
-          :model="addEditForm"
-          :rules="addEditRules"
           label-width="120px"
           class="dialogFormBox"
         >
           <el-form-item label="安装位置">
             <el-input
-              v-model="addEditForm.location"
-              placeholder="请输入"
+              v-model="detailData.location"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="设备名称">
             <el-input
-              v-model="addEditForm.devName"
-              placeholder="请输入"
+              v-model="detailData.devName"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="设备编号">
             <el-input
-              v-model="addEditForm.devSn"
-              placeholder="请输入"
+              v-model="detailData.devSn"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="设备状态">
             <el-input
-              :placeholder="addEditForm.deviceStatus == 0 ? '报警恢复' : '报警'"
+              :placeholder="detailData.deviceStatus == 0 ? '报警恢复' : '报警'"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="警情状态">
             <el-input
-              v-model="addEditForm.alarmDetailStatus"
-              placeholder="请输入"
+              v-model="detailData.alarmDetailStatus"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="报警时间">
             <el-input
-              v-model="addEditForm.alarmTime"
-              placeholder="请输入"
+              v-model="detailData.alarmTime"
               disabled
             ></el-input>
           </el-form-item>
@@ -261,9 +252,8 @@
             <el-button
               @click="detailsShow = false"
               type="primary"
-              icon="el-icon-circle-check"
               size="medium"
-              >确认
+              >关闭
             </el-button>
           </div>
         </el-form>
@@ -277,11 +267,12 @@ import {
   deleteSmokeDevAlarmApi,
   getSmokeDevAlarmPageApi,
   editSmokeDevAlarmApi,
-  getfpdcdListApi,//设备下拉
+  getSmokeDevAlarmListApi,//设备下拉
 } from "@/assets/js/api/edgeProtection";
 export default {
   data() {
     return {
+      detailData:{},
       disTitle: '',
       fileList: [],
       dialogShow: false,//处置详情弹框
@@ -290,16 +281,11 @@ export default {
       addEditForm: {
         operateName: '',//操作人
         operateTime: '',//操作时间
-        handleResult: 1,
+        handleResult: 0,
         description: '',
         handleDone: 0,
         image: '',
         id: '',
-        monitorObject: '',
-        alarmDetail: '',
-        alarmTime: '',
-        deviceStatus: '',
-        alarmDetailStatus: '',
       },
       addEditRules: {
         handleResult: [
@@ -328,7 +314,7 @@ export default {
       let data = {
         projectSn: this.projectSn,
       };
-      getfpdcdListApi(data).then((res) => {
+      getSmokeDevAlarmListApi(data).then((res) => {
         if (res.code == 200) {
           this.towerList = res.result;
         }
@@ -342,7 +328,7 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
-        devName: this.devName,
+        devSn: this.devName,
       };
       getSmokeDevAlarmPageApi(data).then((res) => {
         if (res.code == 200) {
@@ -390,6 +376,7 @@ export default {
       this.disTitle = '处置详情'
       this.recordShow = true
       this.addEditForm.id = val
+      this.addEditForm.handleResult=1
     },
     //点击已闭合
     closedBtn(obj) {
@@ -401,7 +388,7 @@ export default {
     //点击详情修改
     editRecord() {
       this.disTitle = '修改处置记录'
-      this.dialogShow = true
+      this.recordShow = true
     },
     //待处置提交
     addBtn() {
@@ -431,6 +418,7 @@ export default {
     },
     //查看详情
     detailBtn(val) {
+      this.detailData=val
       this.detailsShow = true
       console.log('查看详情', val);
       this.addEditForm = JSON.parse(JSON.stringify(val))
diff --git a/src/views/projectFront/smokeAlarmSystem/smokeManagement.vue b/src/views/projectFront/smokeAlarmSystem/smokeManagement.vue
index 7569f134..5d502271 100644
--- a/src/views/projectFront/smokeAlarmSystem/smokeManagement.vue
+++ b/src/views/projectFront/smokeAlarmSystem/smokeManagement.vue
@@ -56,9 +56,10 @@
             />
           </div>
         </el-table-column>
-        <el-table-column prop="status" label="使用状态" align="center">
+        <el-table-column prop="online " label="使用状态" align="center">
           <template slot-scope="scope">{{
-            scope.row.status == 1 ? '正常' : '异常'
+                       scope.row.online  == 0 ? '离线' : '在线'
+
           }}</template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -123,22 +124,21 @@
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.devName"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="设备编号" prop="devSn">
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.devSn"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="安装位置" prop="location">
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.location"
-              placeholder="请输入"
-              type="number"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="责任班组" prop="dutyTeamInfoId">
@@ -188,7 +188,7 @@
               type="textarea"
               :rows="2"
               v-model="addEditForm.remark"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <div class="dialog-footer" v-if="title != '设备详情'">
@@ -227,6 +227,7 @@ export default {
   },
   data() {
     return {
+      isAdding:true,
       searchFormInput: {
         devName: '',
       },
@@ -307,6 +308,7 @@ export default {
   methods: {
     //查看详情
     deilBtn(val) {
+      this.isAdding=false
       console.log('查看详情',val);
       this.title = '设备详情'
       this.diaLogShow = true
@@ -329,6 +331,7 @@ export default {
       this.diaLogShow = true
       this.title = '新增设备'
       this.fileList = []
+      this.isAdding=true
     },
     edit(obj) {
       this.diaLogShow = true
diff --git a/src/views/projectFront/towerCrane/basicInfo.vue b/src/views/projectFront/towerCrane/basicInfo.vue
index bfe19771..970bcc83 100644
--- a/src/views/projectFront/towerCrane/basicInfo.vue
+++ b/src/views/projectFront/towerCrane/basicInfo.vue
@@ -97,6 +97,7 @@
                   :value="2">
                 </el-option>
               </el-select> -->
+              <!-- 隐藏切换2D/3D操作 -->
           <!-- <div
             class="nav_box"
             v-if="$route.path != '/equipmentCenter/towerCraneList'"
@@ -118,11 +119,7 @@
             </div>
           </div> -->
         </div>
-        <div
-          ref="imgBgBox"
-          v-if="mapType == 1"
-          style="height: 100%"
-        >
+        <div ref="imgBgBox" v-if="mapType == 1" style="height: 100%">
           <div style="overflow: hidden; height: 0px">
             <img
               :src="bgUrl"
@@ -145,7 +142,7 @@
               id="bgPackImg2"
               :style="{
                 width: mapDate.width + 'px',
-                height: mapDate.height + 'px'
+                height: mapDate.height + 'px',
               }"
               style="border: 1px solid #0d2b53"
             />
@@ -205,6 +202,7 @@
                     prop="superintendNo"
                   >
                     <el-input
+                      @input="handleInput"
                       v-model="facilityForm.superintendNo"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                     >
@@ -786,10 +784,9 @@
                     prop="forearmLength"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
                       v-model="facilityForm.forearmLength"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
-                      type="number"
-                      oninput="if(value.length>11)value=value.slice(0,11)"
                     ></el-input>
                   </el-form-item>
                   <!-- 工作时长判定时间(min) -->
@@ -800,8 +797,7 @@
                     <el-input
                       v-model="facilityForm.workingHoursJudge"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
-                      type="number"
-                      oninput="if(value.length>11)value=value.slice(0,11)"
+                      oninput="value=value.replace(/^0|[^0-9]/g,'')"
                     ></el-input>
                   </el-form-item>
                   <!-- 后臂长(m) -->
@@ -812,7 +808,7 @@
                     <el-input
                       v-model="facilityForm.posteriorArmLength"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
-                      type="number"
+                      oninput="value=value.replace(/^0|[^0-9]/g,'')"
                     ></el-input>
                   </el-form-item>
                   <!-- 塔顶高度(m) -->
@@ -822,6 +818,8 @@
                     type="number"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.referenceHeight"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -835,6 +833,8 @@
                     prop="maxLiftingMoment"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.maxLiftingMoment"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -846,6 +846,8 @@
                     prop="relatedX"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.relatedX"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -859,6 +861,8 @@
                     prop="maxLiftingCapacity"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.maxLiftingCapacity"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -870,6 +874,8 @@
                     prop="relatedY"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.relatedY"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -881,6 +887,8 @@
                     prop="maxScope"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.maxScope"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -892,6 +900,8 @@
                     prop="minScope"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.minScope"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -903,6 +913,8 @@
                     prop="maxHeight"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.maxHeight"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -914,10 +926,11 @@
                     prop="maxAngle"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.maxAngle"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
-                      oninput="if(value.length>3)value=value.slice(0,3)"
                     ></el-input>
                   </el-form-item>
                   <!-- 最小角度(°) -->
@@ -926,10 +939,11 @@
                     prop="minAngle"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.minAngle"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
-                      oninput="if(value.length>3)value=value.slice(0,3)"
                     ></el-input>
                   </el-form-item>
                   <!-- 额定倾角(°) -->
@@ -938,10 +952,11 @@
                     prop="ratedObliguity"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.ratedObliguity"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
-                      oninput="if(value.length>3)value=value.slice(0,3)"
                     ></el-input>
                   </el-form-item>
                   <!-- 额定风速(m/s) -->
@@ -950,6 +965,8 @@
                     prop="ratedWindSpeed"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.ratedWindSpeed"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -977,11 +994,10 @@
                     </el-select>
                   </el-form-item>
                   <!-- 大臂高(m) -->
-                  <el-form-item
-                    label="塔身高度(m)"
-                    prop="towerHeight"
-                  >
+                  <el-form-item label="塔身高度(m)" prop="towerHeight">
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.towerHeight"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -993,6 +1009,8 @@
                     prop="multiple"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.multiple"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -1004,6 +1022,8 @@
                     prop="mapX"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.mapX"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -1015,6 +1035,8 @@
                     prop="mapY"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.mapY"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -1036,6 +1058,8 @@
                     prop="nodeCount"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.nodeCount"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -1047,6 +1071,8 @@
                     prop="standardHigh"
                   >
                     <el-input
+                    oninput="value=value.replace(/^0|[^0-9]/g,'')"
+
                       v-model="facilityForm.standardHigh"
                       :placeholder="$t('message.towerCrane.pleaseEnter')"
                       type="number"
@@ -1335,30 +1361,31 @@
               </el-form>
             </div>
             <div class="form-h2" :class="{ 'dark-h2': styleType == 2 }">
-               钢丝绳信息
-              </div>
-              <el-form
-                size="medium"
-                :model="facilityForm"
-                ref="facilityForm3"
-                :rules="rules"
-                label-width="80px"
-                style="padding-left: 20px"
-                class="demo-facilityForm"
-                :inline="true"
+              钢丝绳信息
+            </div>
+            <el-form
+              size="medium"
+              :model="facilityForm"
+              ref="facilityForm3"
+              :rules="rules"
+              label-width="80px"
+              style="padding-left: 20px"
+              class="demo-facilityForm"
+              :inline="true"
+            >
+              <el-form-item
+                label-width="150px"
+                label="钢丝绳设备id"
+                prop="tckwWireRopeId"
               >
-                <el-form-item
-                    label-width="150px"
-                    label="钢丝绳设备id"
-                    prop="tckwWireRopeId"
-                  >
-                    <el-input
-                      v-model="facilityForm.tckwWireRopeId" type="number"
-                      placeholder="请输入数字"
-                    ></el-input>
-                  </el-form-item>
-              </el-form>
-              
+                <el-input
+                  v-model="facilityForm.tckwWireRopeId"
+                  type="number"
+                  placeholder="请输入数字"
+                ></el-input>
+              </el-form-item>
+            </el-form>
+
             <div style="text-align: center">
               <el-button
                 style="width: 200px; margin: 30px 0 0 200px"
@@ -1423,14 +1450,17 @@
             >
               <el-table-column type="selection" width="60"> </el-table-column>
               <!-- 姓名 -->
-              <el-table-column :label="$t('message.towerCrane.fullName')"  align="center">
+              <el-table-column
+                :label="$t('message.towerCrane.fullName')"
+                align="center"
+              >
                 <template slot-scope="scope">{{
                   scope.row.workerName
                 }}</template>
               </el-table-column>
               <!-- 性别 -->
               <el-table-column
-              align="center"
+                align="center"
                 prop="sex"
                 :label="$t('message.towerCrane.gender')"
                 width="60"
@@ -1444,14 +1474,14 @@
               </el-table-column>
               <!-- 身份证号 -->
               <el-table-column
-              align="center"
+                align="center"
                 prop="idCard"
                 :label="$t('message.towerCrane.idNumber')"
               >
               </el-table-column>
               <!-- 特种资格证书编号 -->
               <el-table-column
-              align="center"
+                align="center"
                 prop="specialCertificateNumber"
                 width="200"
                 :label="$t('message.towerCrane.specialCertificateNo')"
@@ -1467,7 +1497,6 @@
                 width="120"
               >
               </el-table-column>
-              
             </el-table>
           </vue-scroll>
         </div>
@@ -1858,7 +1887,7 @@ export default {
         factoryId: '', //厂商id
         brandId: '', //品牌id
         mastSection: '', //标准节数
-        tckwWireRopeId:'',//钢丝绳设备id
+        tckwWireRopeId: '',//钢丝绳设备id
       },
       checkTowerId: '', //选中的塔吊id 只作为列表选中状态切换
       checkedId: 0, //选中的设备 -1 新增状态 控制取消按钮  获取选中设备
@@ -1938,6 +1967,11 @@ export default {
     // }, 500)
   },
   methods: {
+    //限制只能输入英文和数字
+    handleInput() {
+      // 使用正则表达式匹配只允许输入英文和数字
+      this.facilityForm.superintendNo = this.facilityForm.superintendNo.replace(/[^a-zA-Z0-9]/g, '')
+    },
     getImgUrl() {
       getProjectDetail({ projectSn: this.projectSn }).then((res) => {
         console.log(res.result)
@@ -2032,7 +2066,7 @@ export default {
     changeSelect() {
       console.log(this.facilityForm.ratedWindLevel)
     },
-    chekDriver() {},
+    chekDriver() { },
     deleteDriver(index) {
       this.allSelectData.splice(index, 1)
     },
@@ -2418,6 +2452,10 @@ export default {
 
     //新增塔吊按钮
     newTowerBtn() {
+    
+      this.$refs['facilityForm2'].resetFields()
+      this.$refs['facilityForm3'].resetFields()
+      this.$refs['facilityForm'].resetFields()
       console.log(this.ratedWindLevel)
       this.searchName = []
       this.allSelectData = []
@@ -2659,22 +2697,22 @@ export default {
 
     //保存新增
     submit() {
-      let flag = true
+      let flag = false
       this.$refs['facilityForm2'].validate((valid) => {
         if (!valid) {
-          flag = false
+          flag = true
           return
         }
       })
       this.$refs['facilityForm3'].validate((valid) => {
         if (!valid) {
-          flag = false
+          flag = true
           return
         }
       })
-      // console.log(flag)
+      console.log(flag)
       this.$refs['facilityForm'].validate((valid) => {
-        if (valid && flag) {
+        if (valid) {
           let data = JSON.parse(JSON.stringify(this.facilityForm))
           data.projectSn = this.projectSn
           if (!data.mapX) {
diff --git a/src/views/projectFront/towerCrane/home.vue b/src/views/projectFront/towerCrane/home.vue
index 5563ebe2..2cf77fc2 100644
--- a/src/views/projectFront/towerCrane/home.vue
+++ b/src/views/projectFront/towerCrane/home.vue
@@ -125,6 +125,7 @@
                         <div class="head titile_box">
                             <!-- 群塔防碰撞 -->
                             <span>{{ $t('message.towerCrane.antiCollision') }}</span> 
+                            <!-- 隐藏切换2D/3D按钮 -->
                             <!-- <div class="nav_box" >
                                 <div class="nav_item" :class="{'active_item': mapType == 1}" @click="chekMapType(1)">2D</div>
                                 <div v-if="nowCompany != 'jlw'" class="nav_item" :class="{'active_item': mapType == 2}" @click="chekMapType(2)">3D</div>
diff --git a/src/views/projectFront/towerCrane/monitoringStatistics.vue b/src/views/projectFront/towerCrane/monitoringStatistics.vue
index ec97fa57..b98ffea2 100644
--- a/src/views/projectFront/towerCrane/monitoringStatistics.vue
+++ b/src/views/projectFront/towerCrane/monitoringStatistics.vue
@@ -333,6 +333,7 @@
                 })
             },
             createdEchart1(){
+                // 图表数据显示异常修复
                 let chart1 = echarts.init(this.$refs['echart1']);
                 this.chart1 = chart1;
                 chart1.clear();
diff --git a/src/views/projectFront/toxicGasDetection/gasAlarmMonitoring.vue b/src/views/projectFront/toxicGasDetection/gasAlarmMonitoring.vue
index b2d69c4c..cf967996 100644
--- a/src/views/projectFront/toxicGasDetection/gasAlarmMonitoring.vue
+++ b/src/views/projectFront/toxicGasDetection/gasAlarmMonitoring.vue
@@ -8,9 +8,9 @@
           <el-select v-model="devName" placeholder="请选择">
             <el-option
               :label="item.devName"
-              :value="item.id"
+              :value="item.devSn"
               v-for="(item, index) in towerList"
-              :key="item.id"
+              :key="item.devSn"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -100,7 +100,6 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        style="margin-top: 136px"
         class="pagerBox"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -155,7 +154,7 @@
               type="textarea"
               :rows="2"
               v-model="addEditForm.description"
-              placeholder="请输入"
+              :placeholder="disTitle == '处置记录' ? '' : '请输入'"
             ></el-input>
           </el-form-item>
           <el-form-item label="上传图片" prop="image">
@@ -211,51 +210,42 @@
       <div class="dialog_content">
         <el-form
           size="medium"
-          ref="addEditForm"
-          :model="addEditForm"
-          :rules="addEditRules"
           label-width="120px"
           class="dialogFormBox"
         >
           <el-form-item label="安装位置">
             <el-input
-              v-model="addEditForm.location"
-              placeholder="请输入"
+              v-model="detailData.location"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="设备名称">
             <el-input
-              v-model="addEditForm.devName"
-              placeholder="请输入"
+              v-model="detailData.devName"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="编号">
             <el-input
-              v-model="addEditForm.devSn"
-              placeholder="请输入"
+              v-model="detailData.devSn"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="监测对象">
             <el-input
-              v-model="addEditForm.monitorObject"
-              placeholder="请输入"
+              v-model="detailData.monitorObject"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="告警详情">
             <el-input
-              v-model="addEditForm.alarmDetail"
-              placeholder="请输入"
+              v-model="detailData.alarmDetail"
               disabled
             ></el-input>
           </el-form-item>
           <el-form-item label="报警时间">
             <el-input
-              v-model="addEditForm.alarmTime"
-              placeholder="请输入"
+              v-model="detailData.alarmTime"
               disabled
             ></el-input>
           </el-form-item>
@@ -263,9 +253,8 @@
             <el-button
               @click="detailsShow = false"
               type="primary"
-              icon="el-icon-circle-check"
               size="medium"
-              >确认
+              >关闭
             </el-button>
           </div>
         </el-form>
@@ -279,11 +268,12 @@ import {
   deletePoisonousGasDevAlarmApi,
   getPoisonousGasDevAlarmPageApi,
   editPoisonousGasDevAlarmApi,
-  getfpdcdListApi,//设备下拉
+  getPoisonousGasDevListApi,//设备下拉
 } from "@/assets/js/api/edgeProtection";
 export default {
   data() {
     return {
+      detailData:{},
       disTitle: '',
       fileList: [],
       dialogShow: false,//处置详情弹框
@@ -297,9 +287,9 @@ export default {
         handleDone: 0,
         image: '',
         id: '',
-        monitorObject: '',
-        alarmDetail: '',
-        alarmTime: '',
+        // monitorObject: '',
+        // alarmDetail: '',
+        // alarmTime: '',
       },
       addEditRules: {
         handleResult: [
@@ -328,7 +318,7 @@ export default {
       let data = {
         projectSn: this.projectSn,
       };
-      getfpdcdListApi(data).then((res) => {
+      getPoisonousGasDevListApi(data).then((res) => {
         if (res.code == 200) {
           this.towerList = res.result;
         }
@@ -342,7 +332,7 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
-        devName: this.devName,
+        devSn: this.devName,
       };
       getPoisonousGasDevAlarmPageApi(data).then((res) => {
         if (res.code == 200) {
@@ -389,6 +379,8 @@ export default {
       this.disTitle = '处置详情'
       this.recordShow = true
       this.addEditForm.id = val
+      this.addEditForm.handleResult=1
+
     },
     //点击已闭合
     closedBtn(obj) {
@@ -430,6 +422,7 @@ export default {
     },
     //查看详情
     detailBtn(val) {
+      this.detailData=val
       this.detailsShow = true
       console.log('查看详情', val);
       this.addEditForm = JSON.parse(JSON.stringify(val))
diff --git a/src/views/projectFront/toxicGasDetection/gasEqtManagement.vue b/src/views/projectFront/toxicGasDetection/gasEqtManagement.vue
index 4c182f50..1fd1d660 100644
--- a/src/views/projectFront/toxicGasDetection/gasEqtManagement.vue
+++ b/src/views/projectFront/toxicGasDetection/gasEqtManagement.vue
@@ -56,9 +56,9 @@
             />
           </div>
         </el-table-column>
-        <el-table-column prop="status" label="使用状态" align="center">
+        <el-table-column prop="online" label="使用状态" align="center">
           <template slot-scope="scope">{{
-            scope.row.status == 1 ? '正常' : '异常'
+            scope.row.online == 1 ? '在线' : '离线'
           }}</template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -123,22 +123,21 @@
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.devName"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="设备编号" prop="devSn">
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.devSn"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="安装位置" prop="location">
             <el-input
               :disabled="title == '设备详情'"
               v-model="addEditForm.location"
-              placeholder="请输入"
-              type="number"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <el-form-item label="责任班组" prop="dutyTeamInfoId">
@@ -189,7 +188,7 @@
               type="textarea"
               :rows="2"
               v-model="addEditForm.remark"
-              placeholder="请输入"
+              :placeholder="isAdding ? '请输入' : ''"
             ></el-input>
           </el-form-item>
           <div class="dialog-footer" v-if="title != '设备详情'">
@@ -228,6 +227,7 @@ export default {
   },
   data() {
     return {
+      isAdding:true,
       searchFormInput: {
         devName: '',
       },
@@ -308,6 +308,7 @@ export default {
   methods: {
     //查看详情
     deilBtn(val) {
+      this.isAdding=false
       console.log('查看详情', val);
       this.title = '设备详情'
       this.diaLogShow = true
@@ -330,6 +331,7 @@ export default {
       this.diaLogShow = true
       this.title = '新增设备'
       this.fileList = []
+      this.isAdding=true
     },
     edit(obj) {
       this.diaLogShow = true
diff --git a/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue b/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue
index 4504eb32..77089b0a 100644
--- a/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue
+++ b/src/views/projectFront/toxicGasDetection/gasMonitoringData.vue
@@ -19,9 +19,9 @@
           <el-select v-model="devName" placeholder="请选择">
             <el-option
               :label="item.devName"
-              :value="item.id"
+              :value="item.devSn"
               v-for="(item, index) in towerList"
-              :key="item.id"
+              :key="item.devSn"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -54,7 +54,6 @@
         </el-table-column>
       </el-table>
       <el-pagination
-        style="margin-top: 136px"
         class="pagerBox"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -71,7 +70,7 @@
 <script>
 import {
   getPoisonousGasPageApi,//分页
-  getfpdcdListApi,//设备名称下拉
+  getPoisonousGasDevListApi,//设备名称下拉
 } from "@/assets/js/api/edgeProtection";
 export default {
   data() {
@@ -90,6 +89,7 @@ export default {
     this.projectSn = this.$store.state.projectSn;
     this.getTowerList();
     this.getListData();
+    this.time=['', '']
   },
   methods: {
     //获取设备下拉
@@ -97,7 +97,7 @@ export default {
       let data = {
         projectSn: this.projectSn,
       };
-      getfpdcdListApi(data).then((res) => {
+      getPoisonousGasDevListApi(data).then((res) => {
         if (res.code == 200) {
           this.towerList = res.result;
         }
@@ -111,7 +111,7 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
-        devName: this.devName,
+        devSn: this.devName,
       };
       getPoisonousGasPageApi(data).then((res) => {
         if (res.code == 200) {