admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-cjw' into dev-lhk

Browse Source
This commit is contained in:
kun 2024-03-08 14:20:47 +08:00
commit 8988acf60f
10 changed files with 135 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/i18n/langs/cn/carManage/carManage.js
View File

@ -31,6 +31,10 @@ export default {
out:'出',
carPhotosUrl: '车辆图片',
carType: '车辆类型',
carModuleType: '固定/临时车辆',
reserveStartTime: '预约开始时间',
reserveEndTime: '预约结束时间',
entryAndExitPermit: '允许进出次数',
carType2: '车型',
carTypeArr: ['渣土车辆', '外来车辆', '工作车辆'],//1渣土车辆，2外来车辆，3工作车辆
// createTime: '创建时间',

1
src/assets/i18n/langs/cn/safeMangeCheck.js
View File

@ -125,6 +125,7 @@ export default {
yesOrNoNeedChange:'是否需要整改',
noNeedChange:'无需整改',
askFinshTime:'要求完成时间',
inspectTime:'检查时间',
chooseDate:'选择日期',
answerSuccess:'回复成功',
deleteSuccess:'删除成功',

56
src/views/projectFront/carManage/carManage.vue
View File

@ -162,6 +162,38 @@
label-width="120px"
class="dialogFormBox"
>
<!-- 司机姓名 -->
<el-form-item
:label="$t('message.carManage.driverName')"
prop="driverName"
>
<el-input
v-model="addEditForm.driverName"
:placeholder="$t('message.deviceManage.placeholder')"
></el-input>
</el-form-item>
<!-- 预约时间 -->
<el-form-item
label="预约时间"
prop="carTimes"
v-if="true"
>
<el-date-picker
v-model="time"
type="daterange"
:range-separator="$t('message.deviceManage.to')"
:start-placeholder="$t('message.carManage.reserveStartTime')"
value-format="yyyy-MM-dd HH:mm:ss"
:end-placeholder="$t('message.carManage.reserveEndTime')"
@change="testCOnsole()"
width="10"
>
</el-date-picker>
</el-form-item>
<!-- 车牌号 -->
<el-form-item
:label="$t('message.carManage.carNumber')"
prop="carNumber"
@ -172,6 +204,8 @@
:placeholder="$t('message.deviceManage.placeholder')"
></el-input>
</el-form-item>
<!-- 车辆图片 -->
<el-form-item
:label="$t('message.carManage.carPhotosUrl')"
prop="carPhotosUrl"
@ -190,6 +224,8 @@
><!--:on-preview="handlePictureCardPreview"-->
<!-- {{showImgUrl}}-->
</el-form-item>
<!-- 车辆颜色 -->
<el-form-item
:label="$t('message.carManage.carColor')"
prop="carColor"
@ -208,6 +244,8 @@
</el-option>
</el-select>
</el-form-item>
<!-- 车辆类型 -->
<el-form-item :label="$t('message.carManage.carType')" prop="carType">
<el-select
v-model="addEditForm.carType"
@ -222,6 +260,7 @@
</el-option>
</el-select>
</el-form-item>
<!-- 司机姓名 -->
<el-form-item
:label="$t('message.carManage.driverName')"
@ -233,6 +272,7 @@
:placeholder="$t('message.deviceManage.placeholder')"
></el-input>
</el-form-item>
<!-- 司机姓名 -->
<el-form-item
:label="$t('message.carManage.driverName')"
@ -258,6 +298,7 @@
</el-option>
</el-select>
</el-form-item>
<!-- 司机电话 -->
<el-form-item label="司机电话" prop="driverTelephone">
<el-input
@ -286,6 +327,7 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('message.deviceManage.alarmPushWorkerId')">
<el-select
v-model="addEditForm.alarmPushWorkerId"
@ -294,11 +336,11 @@
:placeholder="$t('message.deviceManage.placeholder_select')"
>
<el-option
v-if="item.workerId != ''"
v-for="item in options"
:key="item.workerId"
:label="item.workerName"
:value="item.workerId"
v-for="item in options"
:key="item.workerId"
:label="item.workerName"
:value="item.workerId"
v-if="item.workerId != ''"
>
</el-option>
</el-select>
@ -350,6 +392,7 @@ export default {
},
data() {
return {
time: '',
COMPANY: COMPANY,
fileList: [],
showImgUrl: '',
@ -420,6 +463,9 @@ export default {
}
},
methods: {
testCOnsole(){
console.log(this.time);
},
//限制只能输入英文和数字
// handleInput() {
// // 使用正则表达式匹配只允许输入英文和数字

37
src/views/projectFront/safeManage/v2/checkStandingBook.vue
View File

@ -165,7 +165,7 @@
<template slot-scope="scope">
<p>{{ scope.row.createUserName }}</p>
<!-- <p>{{ scope.row.createEnterpriseName }}</p> -->
<p class="table_bottom_txt">{{ scope.row.createTime }}</p>
<p class="table_bottom_txt">{{ scope.row.inspectTime }}</p>
</template>
</el-table-column>
<!-- 隐患信息 -->
@ -373,7 +373,7 @@
$t('message.safeMangeCheck.time') +
'：'
}}</span>
<span class="value">{{ detailData.createTime }}</span>
<span class="value">{{ detailData.inspectTime }}</span>
</div>
</el-col>
</el-row>
@ -852,12 +852,26 @@
<!-- @expand-change="showSecondTree" -->
</el-form-item>
<!-- 检查时间 -->
<el-form-item
prop="inspectTime"
:label="$t('message.safeMangeCheck.dialog.inspectTime')"
>
<el-date-picker
v-model="formData.inspectTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('message.safeMangeCheck.dialog.chooseDate')"
>
</el-date-picker>
</el-form-item>
<!-- 责任区域 -->
<el-form-item
label="责任区域"
prop="hiddenDangerInspectRegionId"
>
<el-cascader
<el-cascader
v-model="formData.hiddenDangerInspectRegionId"
style="width: 100%"
clearable
@ -866,7 +880,7 @@
:props="checkPointProps"
@change="changeRegion"
></el-cascader>
</el-form-item>
</el-form-item>
<!-- 隐患内容 -->
<el-form-item
@ -1005,6 +1019,7 @@
>
</el-date-picker>
</el-form-item>
<!-- 补充说明 -->
<el-form-item
:label="$t('message.safeMangeCheck.dialog.allInstruction')"
@ -1120,7 +1135,8 @@ export default {
checkItem2: '',
changeUser: '',
enterpriseSn: '',
changeLimitTime: ''
changeLimitTime: '',
inspectTime: ''
},
opts: {
value: 'id',
@ -1215,6 +1231,14 @@ export default {
trigger: 'change'
}
],
inspectTime: [
{
// 请选择检查时间
required: true,
message:"请选择检查时间",
trigger: 'change'
}
],
inspectTypeId: [
{
// 请选择检查类型
@ -1412,6 +1436,7 @@ export default {
imgList.push(item.name)
})
let data = {
inspectTime: this.formData.inspectTime,
changeLimitTime: this.formData.changeLimitTime,
changeUser: this.formData.changeUser,
checkContent: this.formData.checkContent,
@ -1431,7 +1456,7 @@ export default {
reviewId: this.$store.state.userInfo.userId,
status: this.formData.status,
hiddenDangerInspectRegionId: this.formData.hiddenDangerInspectRegionId[0],
hiddenDangerInspectRegionName: this.hiddenDangerInspectRegionName
hiddenDangerInspectRegionName: this.hiddenDangerInspectRegionName,
}
console.log(data)
addHiddenDangerInspectRecordApi(data).then((res) => {

40
src/views/projectFront/safeManage/v2/inspectionRecord.vue
View File

@ -103,7 +103,7 @@
<template slot-scope="scope">
<p>{{ scope.row.createUserName }}</p>
<!-- <p>{{ scope.row.createEnterpriseName }}</p> -->
<p class="table_bottom_txt">{{ scope.row.createTime }}</p>
<p class="table_bottom_txt">{{ scope.row.inspectTime }}</p>
</template>
</el-table-column>
<!-- 隐患信息 -->
@ -315,7 +315,7 @@
$t('message.safeMangeCheck.time') +
'：'
}}</span>
<span class="value">{{ detailData.createTime }}</span>
<span class="value">{{ detailData.inspectTime }}</span>
</div>
</el-col>
</el-row>
@ -721,6 +721,25 @@
</el-option>
</el-select>
</el-form-item>
<!-- 检查时间 -->
<!-- <el-form-item
v-if="formData.status == 2"
:label="$t('message.safeMangeCheck.dialog.inspectTime')"
> -->
<el-form-item
prop="inspectTime"
:label="$t('message.safeMangeCheck.dialog.inspectTime')"
>
<el-date-picker
v-model="formData.inspectTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('message.safeMangeCheck.dialog.chooseDate')"
>
</el-date-picker>
</el-form-item>
<!-- 是否需要整改 -->
<el-form-item
:label="$t('message.safeMangeCheck.dialog.yesOrNoNeedChange')"
@ -786,6 +805,7 @@
></el-cascader>
<!-- @expand-change="showSecondTree" -->
</el-form-item>
<!-- 隐患内容 -->
<el-form-item
v-if="formData.status == 2"
@ -917,8 +937,8 @@
>
<el-date-picker
v-model="formData.changeLimitTime"
type="date"
value-format="yyyy-MM-dd"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:placeholder="$t('message.safeMangeCheck.dialog.chooseDate')"
>
</el-date-picker>
@ -1028,7 +1048,8 @@ export default {
checkItem2: '',
changeUser: '',
enterpriseSn: '',
changeLimitTime: ''
changeLimitTime: '',
inspectTime: ''
},
opts: {
value: 'id',
@ -1127,6 +1148,14 @@ export default {
trigger: 'change'
}
],
inspectTime: [
{
// 请选择检查时间
required: true,
message:"请选择检查时间",
trigger: 'change'
}
],
checkItem: [
{
// 请选择隐患类型
@ -1303,6 +1332,7 @@ export default {
imgList.push(item.name)
})
let data = {
inspectTime: this.formData.inspectTime,
changeLimitTime: this.formData.changeLimitTime,
changeUser: this.formData.changeUser,
checkContent: this.formData.checkContent,

3
src/views/projectFront/towerCrane/alarmsTable.vue
View File

@ -456,7 +456,8 @@ export default {
hours >= 0 && hours <= 9 ? (hours = "0" + hours) : "";
minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : "";
seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : "";
var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
// var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
let timer = year + '-' + month + '-' + day + ' ' + '00:00:00';
// var timer = year + '-' + month + '-' + day
let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59'
this.valueTime = [timer, timerOut]

5
src/views/projectFront/towerCrane/liveDataTable.vue
View File

@ -478,10 +478,11 @@ export default {
hours >= 0 && hours <= 9 ? (hours = "0" + hours) : "";
minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : "";
seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : "";
var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
// var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
let timer = year + '-' + month + '-' + day + ' ' + '00:00:00';
// var timer = year + '-' + month + '-' + day
let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59'
this.valueTime = [timer, timerOut]
this.valueTime = [timer, timerOut]
console.log(timer)
// return timer;
},

3
src/views/projectFront/towerCrane/violationData.vue
View File

@ -226,7 +226,8 @@ export default {
hours >= 0 && hours <= 9 ? (hours = '0' + hours) : ''
minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : ''
seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : ''
var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
// var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
let timer = year + '-' + month + '-' + day + ' ' + '00:00:00';
// var timer = year + '-' + month + '-' + day
let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59'
this.valueTime = [timer, timerOut]

6
src/views/projectFront/towerCrane/wireRopeMonitoring.vue
View File

@ -206,9 +206,11 @@ export default {
hours >= 0 && hours <= 9 ? (hours = '0' + hours) : ''
minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : ''
seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : ''
var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
// var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
let timer = year + '-' + month + '-' + day + ' ' + '00:00:00';
// var timer = year + '-' + month + '-' + day
this.timeValue = [timer, timer]
let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59'
this.timeValue = [timer, timerOut]
console.log(timer)
// return timer;
},

3
src/views/projectFront/towerCrane/workCycleTable.vue
View File

@ -527,7 +527,8 @@ export default {
hours >= 0 && hours <= 9 ? (hours = '0' + hours) : ''
minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : ''
seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : ''
let timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
// let timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
let timer = year + '-' + month + '-' + day + ' ' + '00:00:00';
// var timer = year + '-' + month + '-' + day
let timerOut = year + '-' + month + '-' + day + ' ' + '23:59:59'
this.valueTime = [timer, timerOut]