safecheck-client 3.0.33-11 → 3.0.33-13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "safecheck-client",
|
|
3
3
|
"//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
|
|
4
|
-
"version": "3.0.33-
|
|
4
|
+
"version": "3.0.33-13",
|
|
5
5
|
"description": "安检模块 前端组件",
|
|
6
6
|
"author": "丁新 <417755458@qq.com>",
|
|
7
7
|
"license": "ISC",
|
|
@@ -416,6 +416,7 @@
|
|
|
416
416
|
import getNowDate from "../../utils/getNowDate";
|
|
417
417
|
import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
|
|
418
418
|
import BenzAMRRecorder from 'benz-amr-recorder'
|
|
419
|
+
import {toEndDateString, toStartDateString} from "../Util";
|
|
419
420
|
|
|
420
421
|
//获取json配置文件
|
|
421
422
|
let asyncReady = async function (self) {
|
|
@@ -650,11 +651,11 @@ export default {
|
|
|
650
651
|
asyncReady(this).then(() => {
|
|
651
652
|
if (row.f_safe_type == '已挂表未办卡安检'){
|
|
652
653
|
row.f_upload_state = '已传'
|
|
653
|
-
this.$goto('new-check-paper-temp', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self'
|
|
654
|
+
this.$goto('new-check-paper-temp', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
|
|
654
655
|
return
|
|
655
656
|
}
|
|
656
657
|
row.f_upload_state = '已传'
|
|
657
|
-
this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self'
|
|
658
|
+
this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
|
|
658
659
|
}).catch(
|
|
659
660
|
(respanse) => {
|
|
660
661
|
alert('获取配置文件失败')
|
|
@@ -742,15 +743,15 @@ export default {
|
|
|
742
743
|
}
|
|
743
744
|
this.excelHeaders = Object.assign({}, this.excelHeaders, oa)
|
|
744
745
|
}
|
|
745
|
-
////tag
|
|
746
746
|
this.function = this.f
|
|
747
|
-
////tag
|
|
748
747
|
//获取气表品牌
|
|
749
748
|
this.getTableBrands()
|
|
750
749
|
let gen = select(this)
|
|
751
750
|
//this.pianqu()
|
|
752
751
|
this.Mreadibook(`('${this.$login.f.orgid}')`)
|
|
753
752
|
co(gen)
|
|
753
|
+
this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
|
|
754
|
+
this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
|
|
754
755
|
},
|
|
755
756
|
watch: {
|
|
756
757
|
'model.f_no_checkplan'(val) {
|
|
@@ -1,115 +1,120 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<div id='app' class="basic-main" style="height: 100%">
|
|
3
|
-
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
-
<criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
|
|
5
|
-
<div novalidate class="form-inline auto" partial>
|
|
6
|
-
<div class="row">
|
|
7
|
-
<div class="col-sm-4 form-group">
|
|
8
|
-
<role-selector-safe
|
|
9
|
-
role-name="安检员"
|
|
10
|
-
role-lable="安 检 员"
|
|
11
|
-
@re-res="$parent.$parent.getRes"
|
|
12
|
-
:value.sync="model.f_checker_id"
|
|
13
|
-
v-model="model.f_checker_id"
|
|
14
|
-
condition="f_checker_name = '{}'">
|
|
15
|
-
</role-selector-safe>
|
|
16
|
-
</div>
|
|
17
|
-
<div
|
|
18
|
-
<label
|
|
19
|
-
<
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
</div>
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
<tr>
|
|
56
|
-
<th colspan='5' style="font-weight: normal; text-align:
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
</
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
</
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<div id='app' class="basic-main" style="height: 100%">
|
|
3
|
+
<criteria-paged :model="model" :pager='false' v-ref:paged>
|
|
4
|
+
<criteria partial='criteria' @condition-changed='$parent.search' class="search_area" v-ref:criteria>
|
|
5
|
+
<div novalidate class="form-inline auto" partial>
|
|
6
|
+
<div class="row">
|
|
7
|
+
<div class="col-sm-4 form-group">
|
|
8
|
+
<role-selector-safe
|
|
9
|
+
role-name="安检员"
|
|
10
|
+
role-lable="安 检 员"
|
|
11
|
+
@re-res="$parent.$parent.getRes"
|
|
12
|
+
:value.sync="model.f_checker_id"
|
|
13
|
+
v-model="model.f_checker_id"
|
|
14
|
+
condition="f_checker_name = '{}'">
|
|
15
|
+
</role-selector-safe>
|
|
16
|
+
</div>
|
|
17
|
+
<div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
|
|
18
|
+
<label class="font_normal_body">小区名称</label>
|
|
19
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
|
|
20
|
+
condition="f_residential_area like '%{}%'" v-next-el="cx" v-el:qjmc>
|
|
21
|
+
</div>
|
|
22
|
+
<div class="col-sm-2 form-group">
|
|
23
|
+
<label for="startDate" class="font_normal_body">开始日期:</label>
|
|
24
|
+
<datepicker id="startDate" placeholder="开始日期"
|
|
25
|
+
v-model="model.startDate"
|
|
26
|
+
:value.sync="model.startDate"
|
|
27
|
+
style="width: 60%;"
|
|
28
|
+
:disabled-days-of-Week="[]"
|
|
29
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
30
|
+
:show-reset-button="reset">
|
|
31
|
+
</datepicker>
|
|
32
|
+
</div>
|
|
33
|
+
<div class="col-sm-2 form-group">
|
|
34
|
+
<label for="endDate" class="font_normal_body">结束日期:</label>
|
|
35
|
+
<datepicker id="endDate" placeholder="结束日期"
|
|
36
|
+
v-model="model.endDate"
|
|
37
|
+
:value.sync="model.endDate"
|
|
38
|
+
:disabled-days-of-Week="[]"
|
|
39
|
+
style="width: 60%;"
|
|
40
|
+
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
41
|
+
:show-reset-button="reset">
|
|
42
|
+
</datepicker>
|
|
43
|
+
</div>
|
|
44
|
+
<div class="col-sm-3 form-group" style="margin-top: 8px">
|
|
45
|
+
<button class="button_search button_spacing" @click="search()">查询</button>
|
|
46
|
+
<report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
|
|
47
|
+
<report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
|
|
48
|
+
</div>
|
|
49
|
+
</div>
|
|
50
|
+
</div>
|
|
51
|
+
</criteria>
|
|
52
|
+
<div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
|
|
53
|
+
<table class='tableprint' style="margin: 0px auto">
|
|
54
|
+
<thead>
|
|
55
|
+
<tr>
|
|
56
|
+
<th colspan='5' style="font-weight: normal; text-align: left;">
|
|
57
|
+
<h3 style="text-align: center">安检数据报表</h3>
|
|
58
|
+
</th>
|
|
59
|
+
</tr>
|
|
60
|
+
<tr>
|
|
61
|
+
<th colspan='5' style="font-weight: normal; text-align: center;">
|
|
62
|
+
开始时间：{{model.model.startDate}}
|
|
63
|
+
结束时间：{{ model.model.endDate }}
|
|
64
|
+
</th>
|
|
65
|
+
</tr>
|
|
66
|
+
</thead>
|
|
67
|
+
<tr>
|
|
68
|
+
<th colspan='5' style="font-weight: normal;">
|
|
69
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
70
|
+
</th>
|
|
71
|
+
</tr>
|
|
72
|
+
</table>
|
|
73
|
+
</div>
|
|
74
|
+
</criteria-paged>
|
|
75
|
+
</div>
|
|
76
|
+
|
|
77
|
+
</template>
|
|
78
|
+
|
|
79
|
+
<script>
|
|
80
|
+
import {DataModel} from 'vue-client'
|
|
81
|
+
import * as Util from "../Util";
|
|
82
|
+
|
|
83
|
+
export default {
|
|
84
|
+
title: '维修员报表',
|
|
85
|
+
data() {
|
|
86
|
+
let model = new DataModel('/rs/safecheck/report/CheckPlanCountChartArea', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_filialeid: 'this.f_filialeid'})
|
|
87
|
+
model.f_filialeid = '(' + this.$login.f.orgid + ')'
|
|
88
|
+
return {
|
|
89
|
+
filialeNameStr: '',
|
|
90
|
+
filialeCodeStr: '',
|
|
91
|
+
userid: this.$login.f.id,
|
|
92
|
+
source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
|
|
93
|
+
model: model
|
|
94
|
+
}
|
|
95
|
+
},
|
|
96
|
+
methods: {
|
|
97
|
+
getRes(obj) {
|
|
98
|
+
this.model.f_filialeid = this.$login.convertToIn(obj.resids);
|
|
99
|
+
},
|
|
100
|
+
search(args){
|
|
101
|
+
if (args.model.endDate){
|
|
102
|
+
args.condition += ` and f_offsite_time <= '${args.model.endDate}'`
|
|
103
|
+
}
|
|
104
|
+
if (args.model.startDate){
|
|
105
|
+
args.condition += ` and f_offsite_time >= '${args.model.startDate}'`
|
|
106
|
+
}
|
|
107
|
+
this.model.search(args.condition,args.model)
|
|
108
|
+
}
|
|
109
|
+
},
|
|
110
|
+
ready() {
|
|
111
|
+
this.$refs.paged.$refs.criteria.model.startDate = Util.toStandardDateString()+' 00:00:00'
|
|
112
|
+
this.$refs.paged.$refs.criteria.model.endDate = Util.toStandardDateString()+' 23:59:59'
|
|
113
|
+
},
|
|
114
|
+
computed: {
|
|
115
|
+
selected() {
|
|
116
|
+
return this.$refs.grid.selected
|
|
117
|
+
},
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
</script>
|