-
+
{
+ // this.$emit('getTableDataByType')
+ // })
this.$EventBus.$emit('openUploader', this.uploadFileData)
},
// 新建文件夹按钮：打开模态框
@@ -178,10 +181,10 @@ export default {
inputErrorMessage: '请输入文件夹名称！'
}).then(({ value }) => {
this.createFile(value)
- this.$message({
- type: 'success',
- message: '新增成功'
- });
+ // this.$message({
+ // type: 'success',
+ // message: '新增成功'
+ // });
}).catch(() => {
this.$message({
diff --git a/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue b/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue
index be7300eb..690ba740 100644
--- a/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue
+++ b/src/views/projectFront/laborManage/LEDBigScreen/addLED.vue
@@ -409,6 +409,12 @@ export default {
components: {},
data() {
return {
+ workTypeOption: null,
+ chockInOption: null,
+ classGroupOption: null,
+
+ modeType: null,
+
showMenu: true,
visible: false,
left: 0,
@@ -475,20 +481,97 @@ export default {
created() {
// 模拟查询数据
// this.initLED()
- // this.getChockList()
- // this.getWorkTypeList()
- // this.getClassGroupList()
+ this.getChockList()
+ this.getWorkTypeList()
+ this.getClassGroupList()
this.getLargeScreenList()
},
methods: {
+ getModelData(e) {
+ if(e == 1) {
+ return this.workTypeOption
+ }
+ else if(e == 2) {
+ return this.classGroupOption
+ }
+ else if(e == 3) {
+ return this.chockInOption
+ }
+ else {
+ return null
+ }
+ },
+
getLargeScreenList() {
- let data = {}
+ let data = {
+ projectSn: this.$store.state.projectSn,
+ }
getLEDList(data).then((res) => {
- console.log('LED',res)
+ let ledData = res.result.ledBigScreenRegions.map((item,index) => {
+ return {
+ col: item.customColumnNum,//col
+ row: item.customRowNum, //row
+ modelData: this.getModelData(item.dataModule), // modelData
+ modeType : item.dataModule,
+ fontSize: item.fontSize, //fontSize
+ value: item.regionContent, //value
+ height: item.regionHeight, //height
+ direction: item.regionScrollEffect, //type
+ animationTime: item.scrollDuration, //animationTime
+ type: item.type
+ }
+ })
+
+ this.boxHeight = res.result.high,
+ this.boxWidth = res.result.wide,
+ this.LEDContentList = ledData,
+ console.log('LED',ledData)
});
},
saveLargeScreenList() {
+ console.log('LEDTYPE',this.LEDContentList)
+ let ledData = this.LEDContentList.map((item,index)=>
+ {
+ return {
+ customColumnNum: item.col,//col
+ customRowNum: item.row, //row
+ dataModule: item.modeType, // modelData
+ fontSize: item.fontSize, //fontSize
+ regionContent: item.value, //value
+ regionHeight: item.height, //height
+ regionScrollEffect: item.direction, //type
+ scrollDuration: item.animationTime, //animationTime
+ type: item.type
+ }
+ })
+
+ let data = {
+ high: this.boxHeight - 0,
+ wide: this.boxWidth - 0,
+ projectSn: this.$store.state.projectSn,
+ ledBigScreenRegions: ledData,
+
+ // id: 0,
+ // ledBigScreenRegions: [
+ // {
+ // createTime: "",
+ // customColumnNum: 0,
+ // customRowNum: 0,
+ // dataModule: 0,
+ // fontSize: 0,
+ // id: 0,
+ // ledBigScreenId: 0,
+ // projectSn: "",
+ // regionContent: "",
+ // regionHeight: 0,
+ // regionScrollEffect: 0,
+ // scrollDuration: 0,
+ // updateTime: ""
+ // }
+ // ],
+ }
+ console.log('LED',data)
saveLEDList(data).then((res) => {
console.log('LED',res)
});
@@ -496,27 +579,74 @@ export default {
getChockList() {
let data = {
- projectSn: '',
+ projectSn: this.$store.state.projectSn,
}
getChockingList(data).then((res) => {
- console.log('考勤',res)
+ let data = res.result.personType.toaltPerson
+ this.chockInOption = [
+ {
+ name:'管理人员人数',
+ num:data.glPersonTotal,
+ },
+ {
+ name:'临时工人数',
+ num:data.lsPersonTotal,
+ },
+ {
+ name:'劳务工人数',
+ num:data.lwPersonTotal,
+ },
+ {
+ name:'总人数',
+ num:data.totalPerson,
+ },
+ // {
+ // name:'',
+ // num:data.total_team_num,
+ // },
+ ]
+ // let arr = res.result.map((item,index)=>
+ // {
+ // return {
+ // name: item.typeName,
+ // num: item.num
+ // }
+ // })
+ // this.OptionchockInOption = arr
+ console.log('考勤',this.chockInOption)
});
},
getWorkTypeList() {
let data = {
- projectSn: '',
+ projectSn: this.$store.state.projectSn,
}
getWorkList(data).then((res) => {
- console.log('工种',res)
+ let arr = res.result.map((item,index)=>
+ {
+ return {
+ name: item.typeName,
+ num: item.num
+ }
+ })
+ this.workTypeOption = arr
+ console.log('工种',arr)
});
},
getClassGroupList() {
let data = {
- projectSn: '',
+ projectSn: this.$store.state.projectSn,
}
getClassGroupList(data).then((res) => {
- console.log('班组',res)
+ let arr = res.result.map((item,index)=>
+ {
+ return {
+ name: item.name,
+ num: item.totalPerson
+ }
+ })
+ this.classGroupOption = arr
+ console.log('班组',arr)
});
},
@@ -566,6 +696,7 @@ export default {
},
saveLED() {
+ this.saveLargeScreenList()
console.log('打印LED',this.LEDContentList)
},
@@ -771,46 +902,34 @@ export default {
this.LEDContentList.splice(val, 1);
},
checkModel(val, type) {
- val.modeType = type;
- val.modelData = [
- {
- name: "木工班组",
- num: "22",
- },
- {
- name: "木工班组",
- num: "23",
- },
- {
- name: "木工班组",
- num: "24",
- },
- {
- name: "木工班组",
- num: "25",
- },
- {
- name: "木工班组",
- num: "26",
- },
- {
- name: "木工班组",
- num: "27",
- },
- {
- name: "木工班组",
- num: "28",
- },
- {
- name: "木工班组",
- num: "29",
- },
- {
- name: "木工班组",
- num: "30",
- },
- ];
- console.log(val);
+ // val.modeType = type;
+ // console.log(type)
+ // val.modelData = [
+ // {
+ // name: "木工班组",
+ // num: "22",
+ // },
+ // {
+ // name: "木工班组",
+ // num: "23",
+ // },
+ // ];
+ // console.log(val);
+ // console.log('工种',this.workTypeOption)
+ // console.log('班组',this.classGroupOption)
+
+ if(type == 1) {
+ val.modeType = type;
+ val.modelData = this.workTypeOption
+ }
+ if(type == 2) {
+ val.modeType = type;
+ val.modelData = this.classGroupOption
+ }
+ if(type == 3) {
+ val.modeType = type;
+ val.modelData = this.chockInOption
+ }
},
},
};
@@ -1189,14 +1308,21 @@ export default {
// from { right: 100%; }
// to { left: 100%; }
0% {
- transform: translateX(0px);
- -webkit-transform: translateX(0px);
- }
-
- 100% {
transform: translateX(-100%);
-webkit-transform: translateX(-100%);
}
+ 100% {
+ transform: translateX(100%);
+ -webkit-transform: translateX(100%);
+ }
+ // 0% {
+ // transform: translateX(-100%);
+ // -webkit-transform: translateX(-100%);
+ // }
+ // 100% {
+ // transform: translateX(0px);
+ // -webkit-transform: translateX(0px);
+ // }
}
@-webkit-keyframes wordsLoop2 {
diff --git a/src/views/projectFront/laborManage/overview.vue b/src/views/projectFront/laborManage/overview.vue
index fa87c620..e6211fa8 100644
--- a/src/views/projectFront/laborManage/overview.vue
+++ b/src/views/projectFront/laborManage/overview.vue
@@ -572,13 +572,13 @@ export default {
mqttMSG() {
// mqtt连接 +"/#" +workerId
client2.on('connect', (e) => {
- console.log('连接成功:', this.topicName + this.$store.state.projectSn)
+ // console.log('连接成功:', this.topicName + this.$store.state.projectSn)
client2.subscribe(
this.topicName + this.$store.state.projectSn,
{ qos: 0 },
(error) => {
if (!error) {
- console.log('订阅成功')
+ // console.log('订阅成功')
} else {
console.log('订阅失败')
}
diff --git a/src/views/projectFront/laborManage/penalize.vue b/src/views/projectFront/laborManage/penalize.vue
index 5fb0ba24..682fca02 100644
--- a/src/views/projectFront/laborManage/penalize.vue
+++ b/src/views/projectFront/laborManage/penalize.vue
@@ -290,6 +290,7 @@
@input="transformFn"
v-model="dialogForm.finePrice"
type="number"
+ oninput="if(value.length>12)value=value.slice(0,12)"
>
{{ dialogForm.finePrice }}
@@ -325,6 +326,7 @@
name="files"
:file-list="fileList"
style="width: 100%"
+ limit="3"
>
{{
$t("message.laborMange.clickOnTheUpload")
@@ -456,7 +458,8 @@ export default {
created() {
this.projectSn = this.$store.state.projectSn;
this.projectName = this.$store.state.currentProDetail.projectName;
- this.uploadUrl = this.$store.state.UPLOADURL;
+ this.uploadUrl = 'http://192.168.34.221:8079/upload/image';
+ console.log(this.$store.state,'文件服务')
this.fileUrl = this.$store.state.FILEURL;
this.selectData();
},
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index 848e5828..9fcd961a 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -295,7 +295,7 @@
-
+
@@ -1416,7 +1416,7 @@
v-model="scope.row.personHeight"
:placeholder="$t('message.laborMange.placeholder2')"
type="number"
- oninput="if(value.length>3)value=value.slice(0,3)"
+ oninput="if(value < 0) value = ''; if(value.length>3)value=value.slice(0,3)"
>
{{ scope.row.personHeight }}
@@ -1432,7 +1432,7 @@
v-model="scope.row.personWeight"
:placeholder="$t('message.laborMange.placeholder2')"
type="number"
- oninput="if(value.length>3)value=value.slice(0,3)"
+ oninput="if(value < 0) value = ''; if(value.length>3)value=value.slice(0,3)"
>
{{ scope.row.personWeight }}
@@ -2926,8 +2926,11 @@ export default {
},
//取消编辑表格里的某一项数据-----公用
cancelEditTableInfo(type, index) {
+
//type == 1 证书 2 体检报告 3 保险 4 合同 5 基本信息 6 详细信息
let data = JSON.parse(JSON.stringify(this.originalData));
+ // console.log('取消',index,this.physicalsList)
+
if (type == 1) {
//获取证书附件
if (data.certificateList.length > 0) {
@@ -2941,7 +2944,8 @@ export default {
}
});
}
- this.certificateList = data.certificateList;
+ this.certificateList.splice(index, 1)
+ // rows.splice(index, 1);
} else if (type == 2) {
//获取体检列表
if (data.physicalsList.length > 0) {
@@ -2949,7 +2953,7 @@ export default {
item.physicalState = false; //设置可编辑状态
});
}
- this.physicalsList = data.physicalsList;
+ this.physicalsList.splice(index, 1)
} else if (type == 3) {
//获取保险列表
if (data.insuranceList.length > 0) {
@@ -2957,7 +2961,7 @@ export default {
item.insuranceState = false; //设置可编辑状态
});
}
- this.insuranceList = data.insuranceList;
+ this.insuranceList.splice(index, 1)
} else if (type == 4) {
//获取合同照片
if (data.contractList.length > 0) {
@@ -2990,8 +2994,17 @@ export default {
saveTableInfo(type, index) {
//type == 1 证书 2 体检报告； 3 保险
if (type == 1) {
+ let date1_s=this.certificateList[index].effectTime.replace(/\-/g,'/')
+ let date2_s=this.certificateList[index].issueTime.replace(/\-/g,'/')
+ let date1_unix=Date.parse(date1_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
+ let date2_unix=Date.parse(date2_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
//新增
+ console.log('effectTime issueTime',this.certificateList[index].effectTime, this.certificateList[index].issueTime)
if (!this.certificateList[index].id) {
+ if (date1_unix < date2_unix) {
+ this.$message.error('开始日期不能大于截止有效期');
+ return;
+ }
if (this.certificateList[index].certificateType == "") {
this.$message.error(
this.$t("message.laborMange.pleaseChoose") +
@@ -2999,6 +3012,8 @@ export default {
);
return;
}
+
+
addCertificateApi(this.certificateList[index]).then((res) => {
if (res.code == 200) {
this.certificateList[index].certificateState = false;
@@ -3019,7 +3034,9 @@ export default {
}
});
}
- } else if (type == 2) {
+ }
+ else if (type == 2) {
+
if (this.physicalsList[index].personHeight == "") {
this.$message.error(
this.$t("message.laborMange.placeholder2") +
@@ -3050,6 +3067,16 @@ export default {
});
}
} else if (type == 3) {
+ let date1_s=this.insuranceList[index].insuranceTime.replace(/\-/g,'/')
+ let date2_s=this.insuranceList[index].expireTime.replace(/\-/g,'/')
+ let date1_unix=Date.parse(date1_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
+ let date2_unix=Date.parse(date2_s) //將字符串格式日期转化为时间戳，就是1970年到当前日期的毫秒数
+ console.log('日期',date1_unix,date2_unix)
+ if (date1_unix > date2_unix) {
+ this.$message.error('到期日期不能大于购买日期');
+ return;
+ }
+
if (this.insuranceList[index].state == "") {
this.$message.error(
this.$t("message.laborMange.pleaseChoose") +
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index 8ab80e1f..c374cfa8 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -2028,7 +2028,7 @@ export default {
exportM() {
window.location.href =
this.$http.defaults.baseURL +
- 'xmgl/download/exporExcelWorkerTemplate?projectSn=' +
+ '/xmgl/download/exporExcelWorkerTemplate?projectSn=' +
this.projectSn
},
// 下发通行设备
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index 336403e2..19f340a8 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -2301,7 +2301,7 @@ export default {
exportM() {
window.location.href =
this.$http.defaults.baseURL +
- 'xmgl/download/exporExcelWorkerTemplate?projectSn=' +
+ '/xmgl/download/exporExcelWorkerTemplate?projectSn=' +
this.projectSn
},
// 下发通行设备
diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index f5c9d198..c4628bdf 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -372,6 +372,9 @@
class="tableInput"
v-model="scope.row.score"
:placeholder="$t('message.personnelPosition.please_enter')"
+ onkeyup="if(isNaN(value))execCommand('undo')"
+ onafterpaste="if(isNaN(value))execCommand('undo')"
+ oninput="if(value > 100) value = 100; if(value < 0 || value == '' || value == null) value = ''; if(value.length>3)value=value.slice(0,3);"
>
From e9862f5245a2b3cf14bf6648275ed2ce3f9bd5ae Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Wed, 26 Jul 2023 09:49:30 +0800
Subject: [PATCH 2/3] =?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 | 3 ++-
src/components/account.vue | 8 ++++----
src/store/index.js | 4 ++--
src/views/companyAdmin/bigScreen/index.vue | 8 ++++----
src/views/companyAdmin/bigScreen/leftMenu.vue | 6 ++++--
src/views/companyAdmin/bigScreen/rightMenu.vue | 12 +++++++-----
.../projectAdmin/dataBoard/laborManage.vue | 18 +++++++++---------
.../projectFront/highModulus/pointManage.vue | 6 ++----
8 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 126cf079..10a4abea 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -72,11 +72,12 @@ if (process.env.NODE_ENV == 'development') {
// 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)
+ // 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:8188' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
+ axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
diff --git a/src/components/account.vue b/src/components/account.vue
index db3c9f1c..66817933 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -70,16 +70,16 @@
class="width_100"
@click="goProjectBackstage"
v-if="
- $route.path.indexOf('/projectIndex') == -1 ||
- ($route.path.indexOf('/equipmentCenterIndx') == -1 &&
+ $route.path.indexOf('/equipmentCenterIndx') == -1 &&
$store.state.userInfo.accountType != 5 &&
$store.state.userInfo.accountType != 6 &&
- $store.state.userInfo.enterProjectBackType == 0)
+ $store.state.userInfo.enterProjectBackType === 0
"
>
- {{ projectBackground }}
+ {{ projectBackground }}
+
- {{ projectBackground }}
+ {{ projectBackground }}
+
质量
安全
@@ -29,8 +30,9 @@
diff --git a/src/views/projectAdmin/dataBoard/laborManage.vue b/src/views/projectAdmin/dataBoard/laborManage.vue
index 56d6332b..fce5eb56 100644
--- a/src/views/projectAdmin/dataBoard/laborManage.vue
+++ b/src/views/projectAdmin/dataBoard/laborManage.vue
@@ -593,9 +593,9 @@ export default {
}).then((res) => {
console.log('在场人员', res)
this.inSecenList = res.result
- this.timer = window.setTimeout(() => {
- this.selectProjectPresentWorkerList()
- }, 5000)
+ // this.timer = window.setTimeout(() => {
+ // this.selectProjectPresentWorkerList()
+ // }, 5000)
})
},
//项目人员统计
@@ -610,17 +610,17 @@ export default {
var json2 = this.statisticsCount.workercount
var yData1 = [
json1.age18,
- json1.age18to25,
- json1.age25to35,
- json1.age35to45,
+ json1.age18to25 + json1.age25to35 + json1.age35to45,
+ // json1.age25to35,
+ // json1.age35to45,
json1.age45to60,
json1.age60
]
var yData2 = [
json2.age18,
- json2.age18to25,
- json2.age25to35,
- json2.age35to45,
+ json2.age18to25 + json1.age25to35 + json1.age35to45,
+ // json2.age25to35,
+ // json2.age35to45,
json2.age45to60,
json2.age60
]
diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue
index 5df1eadb..ef3bb562 100644
--- a/src/views/projectFront/highModulus/pointManage.vue
+++ b/src/views/projectFront/highModulus/pointManage.vue
@@ -164,8 +164,7 @@
- 待整改：{{ qualityCount.notCloseNum }} + 待整改：{{ qualityCount.rectificationNum }}
整改率：{{ qualityCount.completeRatio }}% @@ -133,7 +133,7 @@
- 待整改：{{ securityCount.notRectificationNum }} + 待整改：{{ securityCount.rectificationNum }}
整改率：{{ securityCount.completeRatio }}% @@ -583,7 +583,7 @@ export default { selectProjectWorkAndInspectCount({ projectSn: data.projectSn, }).then((res) => { - console.log(res); + console.log('大屏项目',res); if (res.code == 200) { this.personCount = res.result.personCount; this.attendancePerson = this.personCount.attendancePerson; @@ -653,7 +653,7 @@ export default { sn: this.projectSn, }; selectCompanyProjectTypeCountApi(data).then((res) => { - // console.log(res.result) + console.log('大屏顶部数据',res.result) if (res.code == 200) { this.companyProjectData = res.result; this.projectCount = res.result.count; diff --git a/src/views/companyAdmin/bigScreen/leftMenu.vue b/src/views/companyAdmin/bigScreen/leftMenu.vue index e35d56de..1aeb5e0b 100644 --- a/src/views/companyAdmin/bigScreen/leftMenu.vue +++ b/src/views/companyAdmin/bigScreen/leftMenu.vue @@ -268,6 +268,7 @@ export default { } arr.sort(sortNum) this.newProjectData = arr + console.log("项目概览数据",arr) if (this.pageType == 1 ){ this.$nextTick(()=>{ this.createEchart1(); @@ -468,6 +469,7 @@ export default { let data1 = [], data2 = [], data3 = []; + console.log("左上角数据",this.projectData) this.projectData.list.forEach((item)=>{ for(let j = 1; j < 13; j++){ if(Number(item.monthTitle.split('-')[1]) == j){ @@ -593,7 +595,7 @@ export default { } ] } - + // console.log("左上角项目概览数据",data1,data2,data3) echart1.setOption(this.option1); }, createEchart2(){ @@ -949,7 +951,7 @@ export default { .seamless-warp{ width: 100%; - height: 164px; + height: 80px; overflow: auto; li:nth-child(2n){ background: rgba(2, 251, 226, 0.07); diff --git a/src/views/companyAdmin/bigScreen/rightMenu.vue b/src/views/companyAdmin/bigScreen/rightMenu.vue index 167d5d91..b91b33ef 100644 --- a/src/views/companyAdmin/bigScreen/rightMenu.vue +++ b/src/views/companyAdmin/bigScreen/rightMenu.vue @@ -19,9 +19,10 @@
巡检情况
- 暂无数据
-
+
+
+
检查总数208
+
累计预警工程排行
- 暂无数据
-
+
+
+
-
-
+ -->
{
- var item = {
+ let item = {
isQualified: element.isQualified,
score: element.score,
- workerId: this.isAdd ? element.id : element.workerId,
+ workerId: element.id,
projectSn: this.$store.state.projectSn,
};
if (!this.isAdd) {
@@ -848,7 +848,7 @@ export default {
});
json.list = arr;
if (this.isAdd) {
- console.log(json);
+ console.log(json,"新增");
workerSafeEducationAddApi(json).then((res) => {
this.cardDialog = false;
this.loadCardData();
@@ -858,7 +858,8 @@ export default {
});
} else {
// console.log(this.cardForm)
- workerSafeEducationEditApi(this.cardForm).then((res) => {
+ console.log(json,"修改")
+ workerSafeEducationEditApi(json).then((res) => {
this.cardDialog = false;
this.loadCardData();
this.$message.success(
diff --git a/src/views/projectFront/towerCrane/alarmsTable.vue b/src/views/projectFront/towerCrane/alarmsTable.vue
index 843b2a9a..9b831803 100644
--- a/src/views/projectFront/towerCrane/alarmsTable.vue
+++ b/src/views/projectFront/towerCrane/alarmsTable.vue
@@ -346,7 +346,7 @@ export default {
pageSize: 10,
total: 0,
moment: moment,
- valueTime: '',
+ valueTime: null,
selectAlarmType: '',
// 1力矩，2风速，3高度上限位，4幅度内限位，5幅度外限位，6顺时针回转限位,7逆时针回转限位,8倾角,9环境防撞,10多机防撞
alarmTypeList: [
@@ -404,7 +404,7 @@ export default {
created() {
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn;
this.queryDev()
- this.selectNowDate()
+ // this.selectNowDate()
this.queryTowerAlarmList()
},
computed: {
diff --git a/src/views/projectFront/towerCrane/liveDataTable.vue b/src/views/projectFront/towerCrane/liveDataTable.vue
index 4b872622..5b05e81a 100644
--- a/src/views/projectFront/towerCrane/liveDataTable.vue
+++ b/src/views/projectFront/towerCrane/liveDataTable.vue
@@ -425,7 +425,7 @@ export default {
this.projectSn = this.sn ? this.sn:this.$store.state.projectSn;
this.startTime = this.endTime = moment(new Date()).format('YYYY-MM-DD')
console.log(this.startTime, this.endTime)
- this.selectNowDate()
+ // this.selectNowDate()
this.queryDev()
this.queryTowerCurrentDataList()
},
diff --git a/src/views/projectFront/towerCrane/violationData.vue b/src/views/projectFront/towerCrane/violationData.vue
index ff96e45f..7ee0ad96 100644
--- a/src/views/projectFront/towerCrane/violationData.vue
+++ b/src/views/projectFront/towerCrane/violationData.vue
@@ -157,7 +157,7 @@ export default {
created() {
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
this.queryDev()
- this.selectNowDate()
+ // this.selectNowDate()
this.queryTowerWorkCycle()
},
computed: {
diff --git a/src/views/projectFront/towerCrane/workCycleTable.vue b/src/views/projectFront/towerCrane/workCycleTable.vue
index b0756e9d..6681c130 100644
--- a/src/views/projectFront/towerCrane/workCycleTable.vue
+++ b/src/views/projectFront/towerCrane/workCycleTable.vue
@@ -458,7 +458,7 @@ export default {
created() {
this.projectSn = this.sn ? this.sn : this.$store.state.projectSn
this.queryDev()
- this.selectNowDate()
+ // this.selectNowDate()
this.queryTowerWorkCycle()
},
computed: {