safecheck-client 3.0.35-5 → 3.0.35-50
Sign up to get free protection for your applications and to get access to all the features.
- package/.babelrc +5 -5
- package/.editorconfig +9 -9
- package/android.html +18 -18
- package/config/dev.env.js +6 -6
- package/config/index.js +38 -38
- package/config/prod.env.js +3 -3
- package/config/test.env.js +6 -6
- package/docs/AppBase.md +22 -22
- package/docs/Busy.md +14 -14
- package/docs/CriteriaPaged.md +47 -47
- package/docs/DataGrid.md +54 -54
- package/docs/DataModel.md +22 -22
- package/docs/Dynamic.md +42 -42
- package/docs/GetParams.md +11 -11
- package/docs/HttpBusy.md +13 -13
- package/docs/HttpStore.md +29 -29
- package/docs/MessageBox.md +28 -28
- package/docs/PagedList.md +29 -29
- package/docs/Pager.md +21 -21
- package/docs/Project.md +23 -23
- package/docs/Route.md +105 -105
- package/docs/SafetyCheck/AdjustPlan.md +13 -13
- package/docs/SafetyCheck/CheckerPlan.md +12 -12
- package/docs/Task.md +46 -46
- package/docs/TreeList.md +28 -28
- package/docs/TreeMixin.md +18 -18
- package/docs/all.md +10 -10
- package/docs/list.md +42 -42
- package/docs/partial.md +75 -75
- package/docs/selector.md +82 -82
- package/docs//345/274/200/345/217/221/346/226/207/346/241/243/Snippets.md +28 -28
- package/docs//345/274/200/345/217/221/346/226/207/346/241/243/vue-strap/345/217/230/346/233/264/350/256/260/345/275/225.md +7 -7
- package/docs//345/274/200/345/217/221/346/226/207/346/241/243/vue/345/217/230/346/233/264/350/256/260/345/275/225.md +13 -13
- package/docs//345/274/200/345/217/221/346/226/207/346/241/243//345/274/200/345/217/221/347/216/257/345/242/203/350/256/276/347/275/256.md +77 -77
- package/docs//347/225/214/351/235/242/345/210/266/344/275/234/350/247/204/350/214/203.md +54 -54
- package/examples/AddressList/App.vue +13 -13
- package/examples/AddressList/index.html +11 -11
- package/examples/DispatchList/App.vue +10 -10
- package/examples/DispatchList/BaseTree.vue +13 -13
- package/examples/DispatchList/Init.vue +22 -22
- package/examples/DispatchList/Test.vue +20 -20
- package/examples/DispatchList/index.html +11 -11
- package/examples/DispatchList/main.js +18 -18
- package/home.html +16 -16
- package/package.json +1 -1
- package/publish.bat +7 -7
- package/release.bat +5 -5
- package/src/Widget.vue +13 -13
- package/src/android-bootstrap/fonts/glyphicons-halflings-regular.svg +287 -287
- package/src/android-bootstrap/less/.csscomb.json +304 -304
- package/src/android-bootstrap/less/.csslintrc +19 -19
- package/src/android-bootstrap/less/alerts.less +73 -73
- package/src/android-bootstrap/less/badges.less +66 -66
- package/src/android-bootstrap/less/bootstrap.less +56 -56
- package/src/android-bootstrap/less/breadcrumbs.less +26 -26
- package/src/android-bootstrap/less/button-groups.less +247 -247
- package/src/android-bootstrap/less/buttons.less +173 -173
- package/src/android-bootstrap/less/carousel.less +269 -269
- package/src/android-bootstrap/less/close.less +34 -34
- package/src/android-bootstrap/less/code.less +69 -69
- package/src/android-bootstrap/less/component-animations.less +33 -33
- package/src/android-bootstrap/less/grid.less +84 -84
- package/src/android-bootstrap/less/input-groups.less +167 -167
- package/src/android-bootstrap/less/jumbotron.less +52 -52
- package/src/android-bootstrap/less/labels.less +64 -64
- package/src/android-bootstrap/less/list-group.less +141 -141
- package/src/android-bootstrap/less/media.less +66 -66
- package/src/android-bootstrap/less/mixins/alerts.less +14 -14
- package/src/android-bootstrap/less/mixins/background-variant.less +9 -9
- package/src/android-bootstrap/less/mixins/border-radius.less +18 -18
- package/src/android-bootstrap/less/mixins/buttons.less +69 -69
- package/src/android-bootstrap/less/mixins/center-block.less +7 -7
- package/src/android-bootstrap/less/mixins/clearfix.less +22 -22
- package/src/android-bootstrap/less/mixins/forms.less +90 -90
- package/src/android-bootstrap/less/mixins/gradients.less +59 -59
- package/src/android-bootstrap/less/mixins/grid-framework.less +92 -92
- package/src/android-bootstrap/less/mixins/grid.less +122 -122
- package/src/android-bootstrap/less/mixins/hide-text.less +21 -21
- package/src/android-bootstrap/less/mixins/image.less +33 -33
- package/src/android-bootstrap/less/mixins/labels.less +12 -12
- package/src/android-bootstrap/less/mixins/list-group.less +30 -30
- package/src/android-bootstrap/less/mixins/nav-divider.less +10 -10
- package/src/android-bootstrap/less/mixins/nav-vertical-align.less +9 -9
- package/src/android-bootstrap/less/mixins/opacity.less +8 -8
- package/src/android-bootstrap/less/mixins/pagination.less +24 -24
- package/src/android-bootstrap/less/mixins/panels.less +24 -24
- package/src/android-bootstrap/less/mixins/progress-bar.less +10 -10
- package/src/android-bootstrap/less/mixins/reset-filter.less +8 -8
- package/src/android-bootstrap/less/mixins/reset-text.less +18 -18
- package/src/android-bootstrap/less/mixins/resize.less +6 -6
- package/src/android-bootstrap/less/mixins/responsive-visibility.less +15 -15
- package/src/android-bootstrap/less/mixins/size.less +10 -10
- package/src/android-bootstrap/less/mixins/tab-focus.less +9 -9
- package/src/android-bootstrap/less/mixins/table-row.less +44 -44
- package/src/android-bootstrap/less/mixins/text-emphasis.less +9 -9
- package/src/android-bootstrap/less/mixins/text-overflow.less +8 -8
- package/src/android-bootstrap/less/mixins/vendor-prefixes.less +227 -227
- package/src/android-bootstrap/less/mixins.less +40 -40
- package/src/android-bootstrap/less/modals.less +151 -151
- package/src/android-bootstrap/less/navbar.less +660 -660
- package/src/android-bootstrap/less/navs.less +290 -290
- package/src/android-bootstrap/less/normalize.less +424 -424
- package/src/android-bootstrap/less/pager.less +76 -76
- package/src/android-bootstrap/less/pagination.less +89 -89
- package/src/android-bootstrap/less/panels.less +274 -274
- package/src/android-bootstrap/less/popovers.less +131 -131
- package/src/android-bootstrap/less/print.less +101 -101
- package/src/android-bootstrap/less/progress-bars.less +87 -87
- package/src/android-bootstrap/less/responsive-embed.less +35 -35
- package/src/android-bootstrap/less/responsive-utilities.less +194 -194
- package/src/android-bootstrap/less/scaffolding.less +161 -161
- package/src/android-bootstrap/less/tables.less +262 -262
- package/src/android-bootstrap/less/theme.less +291 -291
- package/src/android-bootstrap/less/thumbnails.less +36 -36
- package/src/android-bootstrap/less/tooltip.less +102 -102
- package/src/android-bootstrap/less/type.less +303 -303
- package/src/android-bootstrap/less/utilities.less +55 -55
- package/src/android-bootstrap/less/variables.less +896 -896
- package/src/android-bootstrap/less/wells.less +29 -29
- package/src/androidTest.js +20 -20
- package/src/bootstrap/less/.csscomb.json +304 -304
- package/src/bootstrap/less/.csslintrc +19 -19
- package/src/bootstrap/less/alerts.less +73 -73
- package/src/bootstrap/less/badges.less +66 -66
- package/src/bootstrap/less/breadcrumbs.less +26 -26
- package/src/bootstrap/less/button-groups.less +247 -247
- package/src/bootstrap/less/buttons.less +172 -172
- package/src/bootstrap/less/carousel.less +269 -269
- package/src/bootstrap/less/close.less +34 -34
- package/src/bootstrap/less/code.less +69 -69
- package/src/bootstrap/less/component-animations.less +33 -33
- package/src/bootstrap/less/dropdowns.less +216 -216
- package/src/bootstrap/less/forms.less +626 -626
- package/src/bootstrap/less/grid.less +84 -84
- package/src/bootstrap/less/input-groups.less +167 -167
- package/src/bootstrap/less/jumbotron.less +52 -52
- package/src/bootstrap/less/labels.less +64 -64
- package/src/bootstrap/less/list-group.less +141 -141
- package/src/bootstrap/less/media.less +66 -66
- package/src/bootstrap/less/mixins/alerts.less +14 -14
- package/src/bootstrap/less/mixins/background-variant.less +9 -9
- package/src/bootstrap/less/mixins/border-radius.less +18 -18
- package/src/bootstrap/less/mixins/buttons.less +69 -69
- package/src/bootstrap/less/mixins/center-block.less +7 -7
- package/src/bootstrap/less/mixins/clearfix.less +22 -22
- package/src/bootstrap/less/mixins/forms.less +90 -90
- package/src/bootstrap/less/mixins/gradients.less +59 -59
- package/src/bootstrap/less/mixins/grid-framework.less +92 -92
- package/src/bootstrap/less/mixins/grid.less +122 -122
- package/src/bootstrap/less/mixins/hide-text.less +21 -21
- package/src/bootstrap/less/mixins/image.less +33 -33
- package/src/bootstrap/less/mixins/labels.less +12 -12
- package/src/bootstrap/less/mixins/list-group.less +30 -30
- package/src/bootstrap/less/mixins/nav-divider.less +10 -10
- package/src/bootstrap/less/mixins/nav-vertical-align.less +9 -9
- package/src/bootstrap/less/mixins/opacity.less +8 -8
- package/src/bootstrap/less/mixins/pagination.less +24 -24
- package/src/bootstrap/less/mixins/panels.less +24 -24
- package/src/bootstrap/less/mixins/progress-bar.less +10 -10
- package/src/bootstrap/less/mixins/reset-filter.less +8 -8
- package/src/bootstrap/less/mixins/reset-text.less +18 -18
- package/src/bootstrap/less/mixins/resize.less +6 -6
- package/src/bootstrap/less/mixins/responsive-visibility.less +15 -15
- package/src/bootstrap/less/mixins/size.less +10 -10
- package/src/bootstrap/less/mixins/tab-focus.less +9 -9
- package/src/bootstrap/less/mixins/table-row.less +44 -44
- package/src/bootstrap/less/mixins/text-emphasis.less +9 -9
- package/src/bootstrap/less/mixins/text-overflow.less +8 -8
- package/src/bootstrap/less/mixins/vendor-prefixes.less +227 -227
- package/src/bootstrap/less/mixins.less +40 -40
- package/src/bootstrap/less/modals.less +151 -151
- package/src/bootstrap/less/navbar.less +660 -660
- package/src/bootstrap/less/normalize.less +424 -424
- package/src/bootstrap/less/pager.less +76 -76
- package/src/bootstrap/less/pagination.less +89 -89
- package/src/bootstrap/less/panels.less +275 -275
- package/src/bootstrap/less/popovers.less +131 -131
- package/src/bootstrap/less/print.less +101 -101
- package/src/bootstrap/less/progress-bars.less +87 -87
- package/src/bootstrap/less/responsive-embed.less +35 -35
- package/src/bootstrap/less/responsive-utilities.less +194 -194
- package/src/bootstrap/less/scaffolding.less +161 -161
- package/src/bootstrap/less/theme.less +291 -291
- package/src/bootstrap/less/thumbnails.less +36 -36
- package/src/bootstrap/less/tooltip.less +102 -102
- package/src/bootstrap/less/type.less +303 -303
- package/src/bootstrap/less/utilities.less +55 -55
- package/src/bootstrap/less/wells.less +29 -29
- package/src/components/FileUpload.vue +696 -696
- package/src/components/Hello.vue +39 -39
- package/src/components/LeftTree.vue +27 -27
- package/src/components/NewDefectList/DefectListNew.vue +617 -617
- package/src/components/NewDefectList/DefectPaperNew.vue +3 -3
- package/src/components/Util/SafecheckUpload.vue +4 -0
- package/src/components/android/AddressList.vue +61 -61
- package/src/components/android/AttendanceTally.vue +116 -116
- package/src/components/android/Blank.vue +10 -10
- package/src/components/android/CheckPlanDown.vue +1 -1
- package/src/components/android/CheckUnplanPage.vue +56 -56
- package/src/components/android/Checker.vue +12 -12
- package/src/components/android/CheckerAnnual.vue +81 -81
- package/src/components/android/CheckerAvarta.vue +82 -82
- package/src/components/android/CivilCurrentCreate.vue +56 -41
- package/src/components/android/EquipmentInspection.vue +348 -348
- package/src/components/android/FootprintMap.vue +120 -120
- package/src/components/android/HiddentroubleInvestigation.vue +192 -192
- package/src/components/android/MasterMain.vue +77 -77
- package/src/components/android/Menu.vue +132 -132
- package/src/components/android/NavBottom.vue +157 -157
- package/src/components/android/NoCivilCurrentCreate.vue +10 -0
- package/src/components/android/PaperAlarm.vue +85 -85
- package/src/components/android/PaperDeviceNoncivil.vue +214 -214
- package/src/components/android/PaperFeedback.vue +1514 -1514
- package/src/components/android/PhoneUpUserinfo.vue +25 -6
- package/src/components/android/PhoneotherInfo.vue +0 -14
- package/src/components/android/PhoneotherInfov3.vue +118 -0
- package/src/components/android/PlumberAnnual.vue +83 -83
- package/src/components/android/PlumberAnnualDetail.vue +65 -65
- package/src/components/android/PlumberMonthly.vue +84 -84
- package/src/components/android/PostMap.vue +83 -83
- package/src/components/android/QueryCheckHistory.vue +122 -122
- package/src/components/android/QueryCheckHistoryItem.vue +62 -62
- package/src/components/android/RepairMain.vue +60 -60
- package/src/components/android/Repairman.vue +12 -12
- package/src/components/android/SafecheckDevices.vue +2 -2
- package/src/components/android/SafecheckOrderV.vue +2278 -2805
- package/src/components/android/StationMaster.vue +12 -12
- package/src/components/defects/DefectModal.vue +101 -101
- package/src/components/defects/DevicesAndItem.vue +39 -39
- package/src/components/issueplan/IssuePlanMain.vue +23 -23
- package/src/components/notice/NoticeForm.vue +100 -100
- package/src/components/notice/NoticeIssue.vue +20 -20
- package/src/components/paper/PicViewer.vue +18 -18
- package/src/components/pc/AddPlanItemYyChange.vue +743 -0
- package/src/components/pc/NewCheckpaper.vue +57 -2
- package/src/components/pc/SecurityCheckLedger.vue +133 -0
- package/src/components/pc/SecurityCheckList.vue +160 -0
- package/src/components/pc/SecurityCheckManage.vue +106 -0
- package/src/components/phonestate/MonthlyTraffic.vue +66 -66
- package/src/components/phonestate/MonthlyTrafficRouter.vue +15 -15
- package/src/components/phonestate/PostMap.vue +82 -82
- package/src/components/planmanage/PlanManage.vue +47 -2
- package/src/components/querycheckpaper/PaperItem.vue +59 -59
- package/src/components/report/CheckPlanAreaList.vue +25 -5
- package/src/components/rongcheng/AddPlanItem.vue +1 -1
- package/src/components/rongcheng/AspiratedAreaPlan.vue +1 -0
- package/src/components/rongcheng/AspiratedPaperFeedbackm.vue +4 -0
- package/src/components/rongcheng/AspiratedUserInfo.vue +12 -4
- package/src/components/rongcheng/CheckSearchUser.vue +1 -1
- package/src/components/rongcheng/SafecheckOrderV.vue +1 -1
- package/src/components/rongcheng/SafecheckUserInfo.vue +12 -12
- package/src/components/userfile/MeterFile.vue +145 -145
- package/src/components/userfile/MeterModify.vue +46 -46
- package/src/components/userfileaudit/MeterAuditFile.vue +129 -129
- package/src/filiale/bayan/android/AddPlanItem.vue +22 -2
- package/src/filiale/bayan/android/CheckPlanDown.vue +249 -249
- package/src/filiale/bayan/android/CurrentCreate.vue +10 -0
- package/src/filiale/bayan/android/PhoneUpUserinfo.vue +908 -905
- package/src/filiale/bayan/android/SafecheckOrderV.vue +76 -20
- package/src/filiale/bayan/android/SafecheckUserInfo.vue +4 -0
- package/src/filiale/bayan/pc/DefectPaperNew.vue +22 -1
- package/src/filiale/bayan/pc/PlanManage.vue +962 -962
- package/src/filiale/bayan/pc/SelectCheckPlan.vue +6 -1
- package/src/filiale/dexin/pc/DefectListNew.vue +643 -0
- package/src/filiale/dexin/pc/DefectMainNew.vue +63 -0
- package/src/filiale/dexin/pc/DefectPaperNew.vue +1066 -0
- package/src/filiale/dexin/pc.js +1 -0
- package/src/filiale/huaran/android/CheckPlanDown.vue +212 -0
- package/src/filiale/huaran/android.js +1 -0
- package/src/filiale/huaran/pc/PaperList.vue +22 -1
- package/src/filiale/huaran/pc/PlanManage.vue +66 -7
- package/src/filiale/huaran/pc/checkUserList.vue +55 -22
- package/src/filiale/huaran/pc.js +1 -0
- package/src/filiale/jiaxian/android/SafecheckOrderV.vue +2807 -2807
- package/src/filiale/qianneng/android/SafecheckOrderV.vue +2785 -2785
- package/src/filiale/qianneng/android/SwitchValve.vue +1 -0
- package/src/filiale/rizhao/pc/NewCheckpaper.vue +9 -4
- package/src/filiale/shanxian/android/AddPlanItem.vue +447 -447
- package/src/filiale/shanxian/android/SafecheckOrderV.vue +2979 -2979
- package/src/filiale/shanxian/pc/SelectCheckPlan.vue +21 -0
- package/src/filiale/shanxian/pc/checkUserList.vue +700 -700
- package/src/filiale/siyang/android/PaperFeedback.vue +1514 -0
- package/src/filiale/siyang/android.js +16 -15
- package/src/filiale/siyang/pc/CheckSearchUser.vue +1035 -1035
- package/src/filiale/siyang/pc/checkUserList.vue +765 -790
- package/src/filiale/tianke/pc/DefectListNew.vue +10 -3
- package/src/filiale/tongchuan/android/SafecheckOrderV.vue +3 -3
- package/src/filiale/tongchuan/pc/CheckSearchUser.vue +5 -13
- package/src/filiale/tongchuan/pc/PaperDefectMain.vue +1060 -1060
- package/src/filiale/weinan/android/PaperFeedback.vue +34 -8
- package/src/filiale/weinan/android/SafecheckOrderV.vue +2 -1
- package/src/filiale/weinan/pc/CheckBookSearchUserList.vue +735 -735
- package/src/filiale/weinan/pc/CheckDetail.vue +278 -278
- package/src/filiale/weinan/pc/NewCheckpaper.vue +20 -0
- package/src/filiale/weinan/pc/checkUserList.vue +712 -712
- package/src/filiale/xilan/android/CurrentCreate.vue +1053 -1067
- package/src/filiale/xilan/android.js +0 -1
- package/src/filiale/xilan/pc/PaperList.vue +795 -0
- package/src/filiale/xilan/pc.js +1 -0
- package/src/filiale/yangchunboneng/pc/CheckPlanAreaList.vue +1 -1
- package/src/filiale/zhongsheng/android/SafecheckDevices.vue +4 -4
- package/src/filiale/zhongsheng/pc/CheckPlanAreaList.vue +33 -1
- package/src/plugins/LoadData.js +10 -10
- package/src/plugins/LoadParams.js +24 -24
- package/src/safecheck-android.js +1 -0
- package/src/safecheck.js +12 -0
- package/src/stores/wxconfig.js +10 -10
- package/src/utils/getNowDate.js +33 -33
- package/test/e2e/custom-assertions/elementCount.js +26 -26
- package/test/e2e/nightwatch.conf.js +40 -40
- package/test/e2e/runner.js +30 -30
- package/test/e2e/specs/test.js +13 -13
- package/test/unit/.eslintrc +5 -5
- package/test/unit/TestUtil.js +62 -62
- package/test/unit/context.html +20 -20
- package/test/unit/index.js +13 -13
- package/src/filiale/xilan/android/AddPlanItem.vue +0 -461
@@ -1,15 +1,15 @@
|
|
1
|
-
<template>
|
2
|
-
<div>
|
3
|
-
<route :comp="{name: 'void-page'}" name="traffic-router"></route>
|
4
|
-
</div>
|
5
|
-
</template>
|
6
|
-
|
7
|
-
<script>
|
8
|
-
export default {
|
9
|
-
title: '月流量统计',
|
10
|
-
props: ['f'],
|
11
|
-
ready () {
|
12
|
-
this.$goto('monthly-traffic-list', {f: this.f}, 'self')
|
13
|
-
}
|
14
|
-
}
|
15
|
-
</script>
|
1
|
+
<template>
|
2
|
+
<div>
|
3
|
+
<route :comp="{name: 'void-page'}" name="traffic-router"></route>
|
4
|
+
</div>
|
5
|
+
</template>
|
6
|
+
|
7
|
+
<script>
|
8
|
+
export default {
|
9
|
+
title: '月流量统计',
|
10
|
+
props: ['f'],
|
11
|
+
ready () {
|
12
|
+
this.$goto('monthly-traffic-list', {f: this.f}, 'self')
|
13
|
+
}
|
14
|
+
}
|
15
|
+
</script>
|
@@ -1,82 +1,82 @@
|
|
1
|
-
<template>
|
2
|
-
<div class="auto">
|
3
|
-
<button type="button" class="btn btn-default" @click="this.$back('ass')"><<</button>
|
4
|
-
<div id="allmap2" :style="mapStyle"></div>
|
5
|
-
</div>
|
6
|
-
</template>
|
7
|
-
|
8
|
-
<script>
|
9
|
-
// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
|
10
|
-
|
11
|
-
import Vue from 'vue'
|
12
|
-
|
13
|
-
export default {
|
14
|
-
title: '岗位图',
|
15
|
-
props: ['lonlats'],
|
16
|
-
data () {
|
17
|
-
return {
|
18
|
-
mapStyle: {
|
19
|
-
width: (this.$parent.$el.clientWidth -30) + 'px',
|
20
|
-
height: (this.$parent.$el.clientHeight - 80) + 'px'
|
21
|
-
},
|
22
|
-
markers : []
|
23
|
-
}
|
24
|
-
},
|
25
|
-
ready () {
|
26
|
-
this.lonlats.filter((item) => {
|
27
|
-
return item.f_longitude != 0 && item.f_latitude != 0
|
28
|
-
}).forEach((item) => {
|
29
|
-
this.markers.push({
|
30
|
-
longitude: item.f_longitude,
|
31
|
-
latitude: item.f_latitude,
|
32
|
-
hint: item.f_user_name + '[' + item.f_datetime + ']'
|
33
|
-
})
|
34
|
-
})
|
35
|
-
if(Vue.mapLoaded) {
|
36
|
-
this.render()
|
37
|
-
} else {
|
38
|
-
window.__mapCallback__ = this.mapCallback
|
39
|
-
let element = document.createElement('script')
|
40
|
-
element.setAttribute("type","text/javascript")
|
41
|
-
element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
|
42
|
-
document.body.appendChild(element)
|
43
|
-
}
|
44
|
-
},
|
45
|
-
methods: {
|
46
|
-
mapCallback () {
|
47
|
-
Vue.mapLoaded = true
|
48
|
-
this.render()
|
49
|
-
},
|
50
|
-
patch () {
|
51
|
-
let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
|
52
|
-
if(a.length != 0) {
|
53
|
-
a[0].style.height = 'auto'
|
54
|
-
} else {
|
55
|
-
window.setTimeout(this.patch, 500)
|
56
|
-
}
|
57
|
-
},
|
58
|
-
render () {
|
59
|
-
window.map = new BMap.Map("allmap2")
|
60
|
-
window.map.clearOverlays();
|
61
|
-
if(this.markers.length == 0)
|
62
|
-
window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
|
63
|
-
else
|
64
|
-
window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
|
65
|
-
window.map.addControl(new BMap.NavigationControl())
|
66
|
-
this.markers.forEach(function(pos) {
|
67
|
-
var point = new BMap.Point(pos.longitude,pos.latitude)
|
68
|
-
var marker = new BMap.Marker(point) // 创建标注
|
69
|
-
var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
|
70
|
-
marker.setLabel(label)
|
71
|
-
label.setStyle({ border : '0px', padding: '0px'})
|
72
|
-
window.map.addOverlay(marker) // 将标注添加到地图中
|
73
|
-
// var infoWindow = new BMap.InfoWindow(pos.hint) // 创建信息窗口对象
|
74
|
-
// marker.addEventListener("click", function(){
|
75
|
-
// window.map.openInfoWindow(infoWindow,point) //开启信息窗口
|
76
|
-
// })
|
77
|
-
})
|
78
|
-
this.patch()
|
79
|
-
}
|
80
|
-
}
|
81
|
-
}
|
82
|
-
</script>
|
1
|
+
<template>
|
2
|
+
<div class="auto">
|
3
|
+
<button type="button" class="btn btn-default" @click="this.$back('ass')"><<</button>
|
4
|
+
<div id="allmap2" :style="mapStyle"></div>
|
5
|
+
</div>
|
6
|
+
</template>
|
7
|
+
|
8
|
+
<script>
|
9
|
+
// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
|
10
|
+
|
11
|
+
import Vue from 'vue'
|
12
|
+
|
13
|
+
export default {
|
14
|
+
title: '岗位图',
|
15
|
+
props: ['lonlats'],
|
16
|
+
data () {
|
17
|
+
return {
|
18
|
+
mapStyle: {
|
19
|
+
width: (this.$parent.$el.clientWidth -30) + 'px',
|
20
|
+
height: (this.$parent.$el.clientHeight - 80) + 'px'
|
21
|
+
},
|
22
|
+
markers : []
|
23
|
+
}
|
24
|
+
},
|
25
|
+
ready () {
|
26
|
+
this.lonlats.filter((item) => {
|
27
|
+
return item.f_longitude != 0 && item.f_latitude != 0
|
28
|
+
}).forEach((item) => {
|
29
|
+
this.markers.push({
|
30
|
+
longitude: item.f_longitude,
|
31
|
+
latitude: item.f_latitude,
|
32
|
+
hint: item.f_user_name + '[' + item.f_datetime + ']'
|
33
|
+
})
|
34
|
+
})
|
35
|
+
if(Vue.mapLoaded) {
|
36
|
+
this.render()
|
37
|
+
} else {
|
38
|
+
window.__mapCallback__ = this.mapCallback
|
39
|
+
let element = document.createElement('script')
|
40
|
+
element.setAttribute("type","text/javascript")
|
41
|
+
element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
|
42
|
+
document.body.appendChild(element)
|
43
|
+
}
|
44
|
+
},
|
45
|
+
methods: {
|
46
|
+
mapCallback () {
|
47
|
+
Vue.mapLoaded = true
|
48
|
+
this.render()
|
49
|
+
},
|
50
|
+
patch () {
|
51
|
+
let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
|
52
|
+
if(a.length != 0) {
|
53
|
+
a[0].style.height = 'auto'
|
54
|
+
} else {
|
55
|
+
window.setTimeout(this.patch, 500)
|
56
|
+
}
|
57
|
+
},
|
58
|
+
render () {
|
59
|
+
window.map = new BMap.Map("allmap2")
|
60
|
+
window.map.clearOverlays();
|
61
|
+
if(this.markers.length == 0)
|
62
|
+
window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
|
63
|
+
else
|
64
|
+
window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
|
65
|
+
window.map.addControl(new BMap.NavigationControl())
|
66
|
+
this.markers.forEach(function(pos) {
|
67
|
+
var point = new BMap.Point(pos.longitude,pos.latitude)
|
68
|
+
var marker = new BMap.Marker(point) // 创建标注
|
69
|
+
var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
|
70
|
+
marker.setLabel(label)
|
71
|
+
label.setStyle({ border : '0px', padding: '0px'})
|
72
|
+
window.map.addOverlay(marker) // 将标注添加到地图中
|
73
|
+
// var infoWindow = new BMap.InfoWindow(pos.hint) // 创建信息窗口对象
|
74
|
+
// marker.addEventListener("click", function(){
|
75
|
+
// window.map.openInfoWindow(infoWindow,point) //开启信息窗口
|
76
|
+
// })
|
77
|
+
})
|
78
|
+
this.patch()
|
79
|
+
}
|
80
|
+
}
|
81
|
+
}
|
82
|
+
</script>
|
@@ -251,6 +251,18 @@
|
|
251
251
|
>
|
252
252
|
</v-select>
|
253
253
|
</div>
|
254
|
+
<div class="form-group col-sm-4" v-show="createPlan.isShare=='是' && ismulchecker">
|
255
|
+
<label class="font_normal_body">安 检 员:</label>
|
256
|
+
<v-select
|
257
|
+
class="select select_list"
|
258
|
+
:value.sync="createPlan.checkers"
|
259
|
+
v-model="createPlan.checkers"
|
260
|
+
:options='checker'
|
261
|
+
placeholder='请选择'
|
262
|
+
:multiple="true"
|
263
|
+
>
|
264
|
+
</v-select>
|
265
|
+
</div>
|
254
266
|
<div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
|
255
267
|
<label class="font_normal_body">安 检 员:</label>
|
256
268
|
<v-select
|
@@ -350,6 +362,18 @@
|
|
350
362
|
>
|
351
363
|
</v-select>
|
352
364
|
</div>
|
365
|
+
<div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='是' && ismulchecker">
|
366
|
+
<label class="font_normal_body">安 检 员:</label>
|
367
|
+
<v-select
|
368
|
+
class="select select_list"
|
369
|
+
:value.sync="upCheckPlan.checkers"
|
370
|
+
v-model="upCheckPlan.checkers"
|
371
|
+
:options='checker'
|
372
|
+
placeholder='请选择'
|
373
|
+
:multiple="true"
|
374
|
+
>
|
375
|
+
</v-select>
|
376
|
+
</div>
|
353
377
|
<div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='否'">
|
354
378
|
<label class="font_normal_body">安 检 员:</label>
|
355
379
|
<v-select
|
@@ -396,6 +420,7 @@
|
|
396
420
|
title: '计划管理',
|
397
421
|
data() {
|
398
422
|
return {
|
423
|
+
ismulchecker:this.$appdata.getSingleValue('计划安检员多选')?true:false,
|
399
424
|
a:'1',
|
400
425
|
opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
|
401
426
|
currentorder:'按时间降序',
|
@@ -410,7 +435,9 @@
|
|
410
435
|
f_checker_id:'',
|
411
436
|
isShare:'',
|
412
437
|
f_checker:'',
|
413
|
-
|
438
|
+
f_checkerstr:'',
|
439
|
+
checker:{},
|
440
|
+
checkers:[]
|
414
441
|
},
|
415
442
|
isSend:false,
|
416
443
|
createPlan:{
|
@@ -421,7 +448,9 @@
|
|
421
448
|
f_issued:'否',
|
422
449
|
f_checker_id:null,
|
423
450
|
checker:{},
|
451
|
+
checkers:[],
|
424
452
|
f_checker:null,
|
453
|
+
f_checkerstr:null,
|
425
454
|
f_safecheck_type:'',
|
426
455
|
},
|
427
456
|
planCondition:{},
|
@@ -523,6 +552,12 @@
|
|
523
552
|
return
|
524
553
|
}
|
525
554
|
if(this.createPlan.isShare=="是"){
|
555
|
+
if(this.ismulchecker && this.createPlan.checkers.length > 0){
|
556
|
+
this.createPlan.checkers.forEach((value) => {
|
557
|
+
this.createPlan.f_checkerstr += `${value.name},`
|
558
|
+
})
|
559
|
+
this.createPlan.f_checkerstr = this.createPlan.f_checkerstr.slice(0, -1)
|
560
|
+
}
|
526
561
|
this.createPlan.f_checker_id=null
|
527
562
|
this.createPlan.f_checker=null
|
528
563
|
}else{
|
@@ -545,7 +580,9 @@
|
|
545
580
|
f_issued:'否',
|
546
581
|
f_checker_id:null,
|
547
582
|
checker:{},
|
583
|
+
checkers:[],
|
548
584
|
f_checker:null,
|
585
|
+
f_checkerstr:null,
|
549
586
|
f_safecheck_type:'',
|
550
587
|
f_create_operator:''
|
551
588
|
}
|
@@ -608,7 +645,7 @@
|
|
608
645
|
//按条件查询所有安检计划
|
609
646
|
async loadCheckPlan() {
|
610
647
|
this.isSend=true
|
611
|
-
this.checkplan.check.
|
648
|
+
this.checkplan.check.checkescheckes=[]
|
612
649
|
let fieldValue=''
|
613
650
|
switch(this.currentorder){
|
614
651
|
case "按时间降序":
|
@@ -677,6 +714,12 @@
|
|
677
714
|
console.log(this.upCheckPlan)
|
678
715
|
|
679
716
|
if(this.upCheckPlan.isShare=="是"){
|
717
|
+
if(this.ismulchecker && this.upCheckPlan.checkers.length > 0){
|
718
|
+
this.upCheckPlan.checkers.forEach((value) => {
|
719
|
+
this.upCheckPlan.f_checkerstr += `${value.name},`
|
720
|
+
})
|
721
|
+
this.upCheckPlan.f_checkerstr = this.upCheckPlan.f_checkerstr.slice(0, -1)
|
722
|
+
}
|
680
723
|
this.upCheckPlan.f_checker_id=null
|
681
724
|
this.upCheckPlan.f_checker=null
|
682
725
|
}else{
|
@@ -686,6 +729,8 @@
|
|
686
729
|
this.isSend=true
|
687
730
|
let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
|
688
731
|
data:{
|
732
|
+
checkers:this.createPlan.checkers,
|
733
|
+
f_checkerstr:this.createPlan.f_checkerstr,
|
689
734
|
f_checker:this.upCheckPlan.f_checker,
|
690
735
|
f_safecheck_type:this.upCheckPlan.f_safecheck_type,
|
691
736
|
f_checker_id:this.upCheckPlan.f_checker_id,
|
@@ -1,59 +1,59 @@
|
|
1
|
-
<template>
|
2
|
-
<div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
|
3
|
-
<div class="auto">
|
4
|
-
<partial-view v-ref:pv>
|
5
|
-
<div class="row" style="padding-bottom: 10px">
|
6
|
-
<label class = "col-sm-4 control-label">用户姓名:</label>
|
7
|
-
<span class = "col-sm-8">{{rowdata.f_user_name}}</span>
|
8
|
-
</div>
|
9
|
-
<div class="row" style="padding-bottom: 10px">
|
10
|
-
<label class = "col-sm-4 control-label">用户地址:</label>
|
11
|
-
<span class = "col-sm-8">{{rowdata.f_address}}</span>
|
12
|
-
</div>
|
13
|
-
<div class="row" style="padding-bottom: 10px">
|
14
|
-
<label class = "col-sm-3 control-label">安检人:</label>
|
15
|
-
<span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
|
16
|
-
<label class = "col-sm-3 control-label">安检状态:</label>
|
17
|
-
<span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
|
18
|
-
</div>
|
19
|
-
<div class="row" style="padding-bottom: 10px">
|
20
|
-
<label class = "col-sm-3 control-label">入户时间:</label>
|
21
|
-
<span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
|
22
|
-
</div>
|
23
|
-
<div class="row" style="padding-bottom: 10px">
|
24
|
-
<label class = "col-sm-3 control-label">离开时间:</label>
|
25
|
-
<span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
|
26
|
-
</div>
|
27
|
-
<div class="row" style="padding-bottom: 10px">
|
28
|
-
<label class = "col-sm-3 control-label">用户评价:</label>
|
29
|
-
<span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
|
30
|
-
</div>
|
31
|
-
</partial-view>
|
32
|
-
</div>
|
33
|
-
<check-paper-items :row="rowdata"></check-paper-items>
|
34
|
-
</div>
|
35
|
-
</template>
|
36
|
-
|
37
|
-
<script>
|
38
|
-
import Vue from 'vue'
|
39
|
-
import co from 'co'
|
40
|
-
|
41
|
-
export default {
|
42
|
-
title: '安检项信息',
|
43
|
-
name: 'CheckPaperItem',
|
44
|
-
props: ['row'],
|
45
|
-
data () {
|
46
|
-
return {
|
47
|
-
rowdata: this.row
|
48
|
-
}
|
49
|
-
},
|
50
|
-
ready () {
|
51
|
-
this.rowdata = this.row
|
52
|
-
},
|
53
|
-
watch: {
|
54
|
-
'row' (val) {
|
55
|
-
this.rowdata = val
|
56
|
-
}
|
57
|
-
}
|
58
|
-
}
|
59
|
-
</script>
|
1
|
+
<template>
|
2
|
+
<div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
|
3
|
+
<div class="auto">
|
4
|
+
<partial-view v-ref:pv>
|
5
|
+
<div class="row" style="padding-bottom: 10px">
|
6
|
+
<label class = "col-sm-4 control-label">用户姓名:</label>
|
7
|
+
<span class = "col-sm-8">{{rowdata.f_user_name}}</span>
|
8
|
+
</div>
|
9
|
+
<div class="row" style="padding-bottom: 10px">
|
10
|
+
<label class = "col-sm-4 control-label">用户地址:</label>
|
11
|
+
<span class = "col-sm-8">{{rowdata.f_address}}</span>
|
12
|
+
</div>
|
13
|
+
<div class="row" style="padding-bottom: 10px">
|
14
|
+
<label class = "col-sm-3 control-label">安检人:</label>
|
15
|
+
<span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
|
16
|
+
<label class = "col-sm-3 control-label">安检状态:</label>
|
17
|
+
<span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
|
18
|
+
</div>
|
19
|
+
<div class="row" style="padding-bottom: 10px">
|
20
|
+
<label class = "col-sm-3 control-label">入户时间:</label>
|
21
|
+
<span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
|
22
|
+
</div>
|
23
|
+
<div class="row" style="padding-bottom: 10px">
|
24
|
+
<label class = "col-sm-3 control-label">离开时间:</label>
|
25
|
+
<span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
|
26
|
+
</div>
|
27
|
+
<div class="row" style="padding-bottom: 10px">
|
28
|
+
<label class = "col-sm-3 control-label">用户评价:</label>
|
29
|
+
<span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
|
30
|
+
</div>
|
31
|
+
</partial-view>
|
32
|
+
</div>
|
33
|
+
<check-paper-items :row="rowdata"></check-paper-items>
|
34
|
+
</div>
|
35
|
+
</template>
|
36
|
+
|
37
|
+
<script>
|
38
|
+
import Vue from 'vue'
|
39
|
+
import co from 'co'
|
40
|
+
|
41
|
+
export default {
|
42
|
+
title: '安检项信息',
|
43
|
+
name: 'CheckPaperItem',
|
44
|
+
props: ['row'],
|
45
|
+
data () {
|
46
|
+
return {
|
47
|
+
rowdata: this.row
|
48
|
+
}
|
49
|
+
},
|
50
|
+
ready () {
|
51
|
+
this.rowdata = this.row
|
52
|
+
},
|
53
|
+
watch: {
|
54
|
+
'row' (val) {
|
55
|
+
this.rowdata = val
|
56
|
+
}
|
57
|
+
}
|
58
|
+
}
|
59
|
+
</script>
|
@@ -172,12 +172,21 @@
|
|
172
172
|
<td style="text-align:center">{{row.f_buyu}}</td>
|
173
173
|
<td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
|
174
174
|
<td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
|
175
|
-
<!--<td style="text-align: center;">-->
|
176
|
-
<!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
|
177
|
-
<!--</td>-->
|
178
175
|
</tr>
|
179
176
|
</template>
|
180
|
-
<template partial=
|
177
|
+
<template partial="foot">
|
178
|
+
<tr>
|
179
|
+
<td style="text-align:center"><strong>合计:</strong></td>
|
180
|
+
<td style="text-align:center" :colspan="$parent.$parent.$parent.nameForSql.length"></td>
|
181
|
+
<td style="text-align:center"><strong>{{model.sums.f_plan_total}}</strong></td>
|
182
|
+
<td style="text-align:center"><strong>{{model.sums.f_weijian}}</strong></td>
|
183
|
+
<td style="text-align:center"><nobr><strong>{{model.sums.f_yijian}}</strong></nobr></td>
|
184
|
+
<td style="text-align:center"><nobr><strong>{{model.sums.f_ruhu}}</strong></nobr></td>
|
185
|
+
<td style="text-align:center"><nobr><strong>{{model.sums.f_buyu}}</strong></nobr></td>
|
186
|
+
<td style="text-align:center"><nobr><strong>{{model.sums.f_jujian}}</strong></nobr></td>
|
187
|
+
<td style="text-align:center"><strong>{{model.sums.f_plan_total>0?(model.sums.f_yijian/model.sums.f_plan_total*100).toFixed(2)+'%':0}}</strong></td>
|
188
|
+
</tr >
|
189
|
+
</template>
|
181
190
|
</data-grid>
|
182
191
|
</criteria-paged>
|
183
192
|
</div>
|
@@ -194,7 +203,7 @@
|
|
194
203
|
export default {
|
195
204
|
data () {
|
196
205
|
return {
|
197
|
-
model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
|
206
|
+
model: new PagedList('rs/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
|
198
207
|
// 公司下拉
|
199
208
|
curorgid: [this.$login.f.orgid],
|
200
209
|
row: {},
|
@@ -437,7 +446,18 @@
|
|
437
446
|
}
|
438
447
|
//tag
|
439
448
|
this.model.rows=JSON.parse(JSON.stringify(temp))
|
449
|
+
},
|
450
|
+
'model.rows.length'() {
|
451
|
+
// 如果查询无结果,将合计置为0
|
452
|
+
if(this.model.rows.length < 1){
|
453
|
+
this.model.sums.f_plan_total = 0
|
454
|
+
this.model.sums.f_weijian = 0
|
455
|
+
this.model.sums.f_yijian = 0
|
456
|
+
this.model.sums.f_ruhu = 0
|
457
|
+
this.model.sums.f_buyu = 0
|
458
|
+
this.model.sums.f_jujian = 0
|
440
459
|
}
|
460
|
+
}
|
441
461
|
},
|
442
462
|
computed:{
|
443
463
|
exportParameter(){
|
@@ -168,7 +168,7 @@
|
|
168
168
|
</div>
|
169
169
|
<div class="col-xs-12">
|
170
170
|
<p class="panel-title col-xs-5 text-left font"><b>隐患情况:</b></p>
|
171
|
-
<p class="panel-title col-xs-7 text-left input-font">{{ row.
|
171
|
+
<p class="panel-title col-xs-7 text-left input-font">{{ row.f_defect_text }}</p>
|
172
172
|
</div>
|
173
173
|
</div>
|
174
174
|
</div>
|
@@ -334,6 +334,7 @@
|
|
334
334
|
</div>
|
335
335
|
<div slot="modal-footer" class="modal-footer">
|
336
336
|
<button type="button" class="btn btn-default" @click="uploadPic">上传</button>
|
337
|
+
<button type="button" class="btn btn-default" @click="imgUpModalShow = false">取消</button>
|
337
338
|
</div>
|
338
339
|
</modal>
|
339
340
|
<!--<back-page :need-back='true' @flag="$back()"></back-page>-->
|
@@ -456,6 +456,10 @@
|
|
456
456
|
let temp = getFile.data[i].f_downloadpath
|
457
457
|
if (temp) {
|
458
458
|
let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
|
459
|
+
if (temp.startsWith('E:')){
|
460
|
+
URL = `rs/image/file/${getFile.data[i].f_filename}`
|
461
|
+
}
|
462
|
+
console.log(URL)
|
459
463
|
getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
|
460
464
|
}
|
461
465
|
}
|
@@ -32,7 +32,7 @@
|
|
32
32
|
<p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_address }}</p>
|
33
33
|
</div>
|
34
34
|
<div class="col-xs-12" style="margin-left: 20px">
|
35
|
-
<p class="panel-title col-xs-7 text-left input-font"><a @click="
|
35
|
+
<p class="panel-title col-xs-7 text-left input-font"><a @click="upuserinfo(userinfo.f_userinfoid)">设备信息维护</a></p>
|
36
36
|
</div>
|
37
37
|
<!--<div class="col-xs-12">
|
38
38
|
<p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
|
@@ -157,13 +157,21 @@
|
|
157
157
|
})
|
158
158
|
this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
|
159
159
|
},
|
160
|
-
searchDevices(f_userinfo_id) {
|
160
|
+
// searchDevices(f_userinfo_id) {
|
161
|
+
// this.$dispatch('gotoson', {
|
162
|
+
// _this: this.$parent.$parent,
|
163
|
+
// title: '设备查看',
|
164
|
+
// safe: false
|
165
|
+
// })
|
166
|
+
// this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
|
167
|
+
// },
|
168
|
+
upuserinfo (f_userinfo_id) {
|
161
169
|
this.$dispatch('gotoson', {
|
162
170
|
_this: this.$parent.$parent,
|
163
|
-
title: '
|
171
|
+
title: '档案信息变更',
|
164
172
|
safe: false
|
165
173
|
})
|
166
|
-
this.$parent.$parent.$goto('
|
174
|
+
this.$parent.$parent.$goto('PhoneUpUserinfo', {f_userinfo_id: f_userinfo_id, f_source: '安检'})
|
167
175
|
},
|
168
176
|
cameraCallBack(prop, fileName) {
|
169
177
|
HostApp.__this__.$set(prop, fileName + '?' + Math.random())
|
@@ -644,7 +644,7 @@ export default {
|
|
644
644
|
//args.condition += " and ( f_last_check_date > '"+ args.model.f_check_end + " 23:59:00' or f_last_check_date < '"+ args.model.f_check_start + " 00:00:00' or f_last_check_date is null)"
|
645
645
|
} else if(this.SafeCheckXZ == '未入户') {
|
646
646
|
args.condition += " and r < 1"
|
647
|
-
args.condition += " and f_last_check_state != '入户'"
|
647
|
+
// args.condition += " and f_last_check_state != '入户'"
|
648
648
|
con1 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
|
649
649
|
con2 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
|
650
650
|
if(args.model.f_check_state=='到访不遇'){
|
@@ -1786,7 +1786,7 @@ export default {
|
|
1786
1786
|
this.$set('data.f_user_name', this.item.f_user_name)
|
1787
1787
|
this.$set('data.f_user_phone', this.item.f_user_phone)
|
1788
1788
|
this.$set('data.f_used_name', this.item.f_plan_meters[0].f_used_name)
|
1789
|
-
this.$set('data.f_rent_phone',this.item.
|
1789
|
+
this.$set('data.f_rent_phone',this.item.f_rent_phone)
|
1790
1790
|
this.$set('data.f_remark', '')
|
1791
1791
|
this.$set('data.f_user_phone2',this.item.f_plan_meters[0].f_user_phone2)
|
1792
1792
|
this.$set('data.f_userinfoid', this.item.f_userinfoid)
|
@@ -55,10 +55,10 @@
|
|
55
55
|
:options="f_usetypes"
|
56
56
|
clear-button></v-select>
|
57
57
|
</div>
|
58
|
-
<div class="col-xs-12" style="margin-left: 20px"
|
59
|
-
|
60
|
-
<a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a
|
61
|
-
</div
|
58
|
+
<!-- <div class="col-xs-12" style="margin-left: 20px">-->
|
59
|
+
<!-- <!– <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>–>-->
|
60
|
+
<!-- <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>-->
|
61
|
+
<!-- </div>-->
|
62
62
|
</div>
|
63
63
|
<div class="panel-body">
|
64
64
|
<div v-show="false" class="row repair-info-content auto">
|
@@ -753,14 +753,14 @@
|
|
753
753
|
})
|
754
754
|
this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
|
755
755
|
},
|
756
|
-
searchDevices(f_userinfo_id) {
|
757
|
-
|
758
|
-
|
759
|
-
|
760
|
-
|
761
|
-
|
762
|
-
|
763
|
-
},
|
756
|
+
// searchDevices(f_userinfo_id) {
|
757
|
+
// this.$dispatch('gotoson', {
|
758
|
+
// _this: this.$parent.$parent,
|
759
|
+
// title: '设备查看',
|
760
|
+
// safe: false
|
761
|
+
// })
|
762
|
+
// this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
|
763
|
+
// },
|
764
764
|
cameraCallBack(prop, fileName) {
|
765
765
|
HostApp.__this__.$set(prop, fileName + '?' + Math.random())
|
766
766
|
//tag
|