fix: BUG修改

This commit is contained in:
jxj_yjl 2023-07-04 15:13:41 +08:00
parent 4033993c2b
commit 753a1d376d
4 changed files with 21 additions and 3 deletions

View File

@ -89,8 +89,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
// axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // 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:8079' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖 // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖

View File

@ -184,6 +184,7 @@
<el-date-picker <el-date-picker
v-model="dialogdata.startTime" v-model="dialogdata.startTime"
type="date" type="date"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:placeholder="$t('message.deepFoundConfig.changeTime')" :placeholder="$t('message.deepFoundConfig.changeTime')"
></el-date-picker> ></el-date-picker>
@ -1435,6 +1436,11 @@ import {
export default { export default {
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
show: true, show: true,
deleteInfo: false, deleteInfo: false,
isPreview: false, isPreview: false,
@ -1669,7 +1675,7 @@ export default {
pageSize: 10, pageSize: 10,
title: '', title: '',
dialogType: 1, // 1 2 dialogType: 1, // 1 2
id: '' id: '',
} }
}, },
created() { created() {

View File

@ -164,6 +164,9 @@
<el-input <el-input
size="medium" size="medium"
v-model="scope.row.warningValue" v-model="scope.row.warningValue"
:maxlength="2"
onkeyup="if(isNaN(value))execCommand('undo')"
onafterpaste="if(isNaN(value))execCommand('undo')"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>
@ -176,6 +179,9 @@
<el-input <el-input
size="medium" size="medium"
v-model="scope.row.alarmValue" v-model="scope.row.alarmValue"
:maxlength="2"
onkeyup="if(isNaN(value))execCommand('undo')"
onafterpaste="if(isNaN(value))execCommand('undo')"
></el-input> ></el-input>
</template> </template>
</el-table-column> </el-table-column>

View File

@ -260,13 +260,17 @@ export default {
// //
mousedown(e, index) { mousedown(e, index) {
let bgPackImg = this.$refs.bgPackImg; // let bgPackImg = this.$refs.bgPackImg; //
let maxH = bgPackImg.scrollHeight - 30; // let maxH = bgPackImg.scrollHeight - 30; //
let maxW = bgPackImg.scrollWidth - 30; // let maxW = bgPackImg.scrollWidth - 30; //
let objDiv = document.getElementsByClassName('point')[index]; let objDiv = document.getElementsByClassName('point')[index];
let zoom = window.localStorage.getItem('zoom');
// //
let disX = e.clientX - objDiv.offsetLeft; let disX = e.clientX - objDiv.offsetLeft;
let disY = e.clientY - objDiv.offsetTop; 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 left = e.clientX - disX;
let top = e.clientY - disY; let top = e.clientY - disY;
console.log(e.clientX,e.clientY)
console.log(disX,disY)
console.log(left,top) console.log(left,top)
if (left < 0 || top < 0 || top>maxH || left>maxW) { if (left < 0 || top < 0 || top>maxH || left>maxW) {
return; return;