From 753a1d376d3dc30731ce09c29b8369fb07b84435 Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Tue, 4 Jul 2023 15:13:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                                     | 4 ++--
 .../projectFront/deepFoundationPitManage/dataConfig.vue   | 8 +++++++-
 src/views/projectFront/highModulus/pointManage.vue        | 6 ++++++
 .../projectFront/projectSummary/devicePointConfig.vue     | 6 ++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 73c6e08e..a1ac1e48 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -89,8 +89,8 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
   // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
   // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
-    axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
-    // axios.defaults.baseURL ='http://192.168.34.221:8079' //郭圣雄本地
+    // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+    axios.defaults.baseURL ='http://192.168.34.221:8079' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
     // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖
diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
index 3cd8cc19..d758a903 100644
--- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
+++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
@@ -184,6 +184,7 @@
                 <el-date-picker
                   v-model="dialogdata.startTime"
                   type="date"
+                  :picker-options="pickerOptions"
                   value-format="yyyy-MM-dd"
                   :placeholder="$t('message.deepFoundConfig.changeTime')"
                 ></el-date-picker>
@@ -1435,6 +1436,11 @@ import {
 export default {
   data() {
     return {
+      pickerOptions: {
+          disabledDate(time) {
+              return time.getTime() < Date.now() - 8.64e7;
+          }
+      },
       show: true,
       deleteInfo: false,
       isPreview: false,
@@ -1669,7 +1675,7 @@ export default {
       pageSize: 10,
       title: '',
       dialogType: 1, // 1添加 2 编辑
-      id: ''
+      id: '',
     }
   },
   created() {
diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue
index b07d2668..04efcd1b 100644
--- a/src/views/projectFront/highModulus/pointManage.vue
+++ b/src/views/projectFront/highModulus/pointManage.vue
@@ -164,6 +164,9 @@
                 <el-input
                   size="medium"
                   v-model="scope.row.warningValue"
+                  :maxlength="2"
+                  onkeyup="if(isNaN(value))execCommand('undo')"
+                  onafterpaste="if(isNaN(value))execCommand('undo')"
                 ></el-input>
               </template>
             </el-table-column>
@@ -176,6 +179,9 @@
                 <el-input
                   size="medium"
                   v-model="scope.row.alarmValue"
+                  :maxlength="2"
+                  onkeyup="if(isNaN(value))execCommand('undo')"
+                  onafterpaste="if(isNaN(value))execCommand('undo')"
                 ></el-input>
               </template>
             </el-table-column>
diff --git a/src/views/projectFront/projectSummary/devicePointConfig.vue b/src/views/projectFront/projectSummary/devicePointConfig.vue
index 201ee71c..75199d68 100644
--- a/src/views/projectFront/projectSummary/devicePointConfig.vue
+++ b/src/views/projectFront/projectSummary/devicePointConfig.vue
@@ -260,13 +260,17 @@ export default {
 
     //移动塔吊位置
     mousedown(e, index) {
+      
       let bgPackImg = this.$refs.bgPackImg; //获取背景图
       let maxH = bgPackImg.scrollHeight - 30; //可移动的最大高度
       let maxW = bgPackImg.scrollWidth - 30; //可移动的最大宽度
       let objDiv = document.getElementsByClassName('point')[index];
+      let zoom =  window.localStorage.getItem('zoom');
       //算出鼠标相对元素的位置
       let disX = e.clientX - objDiv.offsetLeft;
       let disY = e.clientY - objDiv.offsetTop;
+      // let disX = e.clientY ;
+      // let disY = e.clientY ;
 // 
 
       //鼠标移动时
@@ -275,6 +279,8 @@ export default {
         //用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
         let left = e.clientX - disX;
         let top = e.clientY - disY;
+        console.log(e.clientX,e.clientY)
+        console.log(disX,disY)
         console.log(left,top)
         if (left < 0 || top < 0 || top>maxH || left>maxW) {
           return;