From 9697dfd0004335bab3bf5626425eab3130a55ec6 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu <819527061@qq.com>
Date: 星期三, 17 六月 2026 17:53:16 +0800
Subject: [PATCH] 根据时间段查询发运和煤种
---
pages/home/home.vue | 526 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 510 insertions(+), 16 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index b89a968..d6d7bb4 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -86,12 +86,19 @@
</view>
</view>
<!-- 鐓ょ鍙戣繍鎯呭喌 -->
- <view class="shoukuan-group" v-if="coalTongjiTemp && coalTongjiTemp.length > 0">
+ <view class="shoukuan-group" v-if="coalLoaded || coalLoading">
<view class="currentDay-box">
<combined-title title="鐓ょ鍙戣繍鎯呭喌">
</combined-title>
+ <view class="date-pick-box" @click="openCoalCalendar">
+ <text class="date-pick-text">{{coalRangeText}}</text>
+ <image class="date-pick-icon" src="@/static/home/dateIcon.png"></image>
+ </view>
</view>
- <view class="shoukuan-box">
+ <view class="block-loading" v-if="coalLoading">
+ <u-loading-icon mode="circle" color="#1987FF" size="40"></u-loading-icon>
+ </view>
+ <view class="shoukuan-box" v-if="coalLoaded && !coalLoading">
<view class="coalFayun-total">
<view class="total-block">
<view class="num">{{d2Sum || 0}}</view>
@@ -145,7 +152,7 @@
<view class="num">{{item.lyDSum || 0}}</view>
</view>
<view class="caol-block">
- <view class="name">鏃ュ悎璁�(鍏�)</view>
+ <view class="name">鏃ュ悎璁�(鍚�)</view>
<view class="num">{{item.d1 || 0}}</view>
</view>
</view>
@@ -159,13 +166,20 @@
</view>
</view>
<!-- 鍒嗗鎴风叅绉嶅彂杩愭儏鍐� -->
- <view class="shoukuan-group" v-if="kehuTongjiTemp && kehuTongjiTemp.length > 0">
+ <view class="shoukuan-group" v-if="kehuLoaded || kehuLoading">
<view class="currentDay-box">
<combined-title title="鍒嗗鎴风叅绉嶅彂杩愭儏鍐�">
</combined-title>
+ <view class="date-pick-box" @click="openKehuCalendar">
+ <text class="date-pick-text">{{kehuRangeText}}</text>
+ <image class="date-pick-icon" src="@/static/home/dateIcon.png"></image>
+ </view>
</view>
- <view class="shoukuan-box">
+ <view class="block-loading" v-if="kehuLoading">
+ <u-loading-icon mode="circle" color="#1987FF" size="40"></u-loading-icon>
+ </view>
+ <view class="shoukuan-box" v-if="kehuLoaded && !kehuLoading">
<div class="shoukuan-box-inside">
<view class="shoukuan-main" v-for="(item,index) in kehuTongji" :key="index">
<view class="shoukuan-line">
@@ -182,7 +196,7 @@
</view>
<view class="shoukuan-line">
<view class="name">璐﹀锛�</view>
- <view class="text1">{{item.ledgerName}}</view>
+ <view class="text1">{{item.ledgerName || ''}}</view>
</view>
<!-- <view class="coalTongji-box">
<view class="shoukuan-line kehu-block">
@@ -529,6 +543,14 @@
<!-- 鑿滃崟鏍� -->
<!-- <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu> -->
<u-gap height="15" bgColor="#eeeeee"></u-gap>
+
+
+
+ <view class="editorPass" @click="handlePwd">
+ <image class="icon" src="@/static/home/editorIcon.png"></image>
+ <view class="">淇敼瀵嗙爜</view>
+ </view>
+ <view class="huiseBox"></view>
<view class="utils">
<view class="utils-container">
<view class="utils-container-body" @click="redirectLogin">
@@ -542,6 +564,102 @@
</view>
</view>
<u-gap height="60" bgColor="#eeeeee"></u-gap>
+
+ <!-- 鐓ょ鍙戣繍鎯呭喌 鏃堕棿娈甸�夋嫨 -->
+ <u-calendar
+ :key="'coal-' + coalCalendarKey"
+ rowHeight="100"
+ :show="coalCalendarShow"
+ mode="range"
+ :defaultDate="coalDefaultDate"
+ :minDate="minDateTimestamp"
+ :maxDate="maxDateTimestamp"
+ :monthNum="calendarMonthNum"
+ allowSameDay
+ title="閫夋嫨鏃堕棿娈�"
+ startText="寮�濮�"
+ endText="缁撴潫"
+ @confirm="coalCalendarConfirm"
+ @close="coalCalendarShow = false"
+ ></u-calendar>
+
+ <!-- 鍒嗗鎴风叅绉嶅彂杩愭儏鍐� 鏃堕棿娈甸�夋嫨 -->
+ <u-calendar
+ :key="'kehu-' + kehuCalendarKey"
+ rowHeight="100"
+ :show="kehuCalendarShow"
+ mode="range"
+ :defaultDate="kehuDefaultDate"
+ :minDate="minDateTimestamp"
+ :maxDate="maxDateTimestamp"
+ :monthNum="calendarMonthNum"
+ allowSameDay
+ title="閫夋嫨鏃堕棿娈�"
+ startText="寮�濮�"
+ endText="缁撴潫"
+ @confirm="kehuCalendarConfirm"
+ @close="kehuCalendarShow = false"
+ ></u-calendar>
+
+ <view class="passWord-main-box">
+ <u-popup :show="passShow"
+ :closeable="true"
+ :closeOnClickOverlay="true"
+ @close="handleClosePassShow"
+ mode="center"
+ width="90%"
+ class="passBox">
+ <view class="popup-box">
+ <u-form :model="formData" ref="uForm" borderBottom :rules="rules" :label-width="150">
+ <u-form-item prop="password" label="鍘熷瘑鐮�" borderBottom>
+ <u-input
+ class="flex-1"
+ type="password"
+ v-model="formData.password"
+ :border="false"
+ placeholder="璇疯緭鍏ュ師鏉ョ殑瀵嗙爜"
+ />
+ </u-form-item>
+ <u-form-item prop="newpassword1" label="鏂板瘑鐮�" borderBottom>
+ <u-input
+ class="flex-1"
+ type="password"
+ v-model="formData.newpassword1"
+ placeholder="瀵嗙爜搴旂敱8-16浣嶆暟瀛椼�佸瓧姣嶃�佺鍙风粍鎴愩�傝涓嶈浣跨敤瀹规槗琚寽鍒扮殑瀵嗙爜"
+ :border="false"
+ />
+ </u-form-item>
+ <view class="intensity">
+ <view class="psdText">瀵嗙爜寮哄害</view>
+ <view
+ class="line"
+ :class="[level.includes('low') ? 'low' : '']"></view>
+ <view
+ class="line"
+ :class="[level.includes('middle') ? 'middle' : '']"></view>
+ <view
+ class="line"
+ :class="[level.includes('high') ? 'high' : '']"></view>
+ <div class="warningtext">
+ 瀵嗙爜搴旂敱8-16浣嶆暟瀛椼�佸瓧姣嶃�佺鍙风粍鎴愩�傝涓嶈浣跨敤瀹规槗琚寽鍒扮殑瀵嗙爜
+ </div>
+ </view>
+ <u-form-item prop="newpassword2" label="纭瀵嗙爜" borderBottom>
+ <u-input
+ class="flex-1"
+ type="password"
+ v-model="formData.newpassword2"
+ placeholder="鍐嶆杈撳叆鏂板瘑鐮�"
+ :border="false"
+ />
+ </u-form-item>
+ </u-form>
+ <view class="sumbmit-box">
+ <u-button type="primary" shape="circle" @click="handlePassConfirm" :loading="sumbLoading"> 纭畾 </u-button>
+ </view>
+ </view>
+ </u-popup>
+ </view>
</view>
</template>
@@ -573,10 +691,156 @@
},
shenqingMenu() {
return this.$store.state.shenqingMenu;
- }
+ },
+ // 褰撳ぉ鏃ユ湡(YYYY-MM-DD)
+ todayStr() {
+ return this.todayDate();
+ },
+ // 榛樿鏃堕棿浣跨敤鐢ㄤ竴澶╃殑鏃ユ湡(YYYY-MM-DD 23:59:59)
+ endTodaydayStr() { //榛樿鏃堕棿浣跨敤鐢ㄤ竴澶╃殑鏃ユ湡
+ // const date = new Date(new Date().getTime() - 24 * 60 * 60 * 1000);
+ const date = new Date(new Date().getTime());
+ const y = date.getFullYear();
+ let m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ let d = date.getDate();
+ d = d < 10 ? '0' + d : d;
+ let time = `${y}-${m}-${d} 23:59:59`
+ return time;
+ },
+ // 榛樿璧峰鏃堕棿(褰撳ぉ 00:00:00)銆傛敞鎰� todayStr 鏄� computed(鍙栧�肩敤 this.todayStr,涓嶈兘鍔犳嫭鍙峰綋鍑芥暟璋�)
+ startTodayStr() {
+ return `${this.todayStr}`;
+ },
+ // 鍙�夋渶鏃╂棩鏈�:褰撳墠鏃ユ湡寰�鍓嶆帹 1 骞�(鍘诲勾鍚屾湀),鍏佽缈诲埌涓婁竴骞寸殑鍘嗗彶鏈堜唤
+ minDateTimestamp() {
+ const d = new Date();
+ d.setFullYear(d.getFullYear() - 1);
+ return d.getTime();
+ },
+ // 鍙�夋渶鏅氭棩鏈�:褰撳墠鏃ユ湡寰�鍚庢帹 1 骞�(鏄庡勾鍚屾湀)(u-calendar 瑕佹眰 maxDate 蹇呴』澶т簬褰撳墠鏃堕棿)
+ maxDateTimestamp() {
+ const d = new Date();
+ d.setFullYear(d.getFullYear() + 1);
+ return d.getTime();
+ },
+ // u-calendar 鏈堜唤婊戝姩鍒楄〃鏈�澶氬睍绀虹殑鏈堟暟銆傛覆鏌撻噺涓庡彲缈昏寖鍥存鐩稿叧(鏈堟暟脳绾�42鏍�):
+ // 璁� 60 鏃剁偣鍑�/鍏抽棴鐨� setData 浼氬崱(绾� 2500 鏍�),鏁呯缉鍒� 25(绾� 1000 鏍�),浠婂ぉ澶ц嚧灞呬腑銆�
+ // 闇�涓� minDate~maxDate 璺ㄥ害涓�鑷�(鍓嶅悗鍚� 1 骞� + 褰撴湀 = 25),鍚﹀垯閮ㄥ垎鏈堜唤缈讳笉鍒�
+ calendarMonthNum() {
+ // 鍓嶅悗鍚� 1 骞�,鍚綋鏈堝叡 25 涓湀;璋冩暣鑼冨洿鏃跺悓姝ユ敼涓婇潰 minDate/maxDate 鐨勫勾鏁�
+ return 25;
+ },
+ // 鐓ょ鍙戣繍鎯呭喌:鏃ユ湡(YYYY-MM-DD)鍖洪棿銆傛棩鍘嗘寜澶╂瘮杈�/楂樹寒銆佹枃鏈洖鏄鹃兘鐢ㄧ函鏃ユ湡,
+ // 鏁呬粠甯︽椂鍒嗙鐨勫瓨鍌ㄥ�奸噷鎴彇鍓� 10 浣�(YYYY-MM-DD);涓虹┖鏃堕粯璁や粖澶�
+ coalDateRange() {
+ const start = (this.coalStartTime || this.todayStr).slice(0, 10);
+ const end = (this.coalEndTime || this.todayStr).slice(0, 10);
+ return [start, end];
+ },
+ // 鐓ょ鍙戣繍鎯呭喌:鍥炴樉鏃堕棿娈垫枃鏈�(浠呮棩鏈�)
+ coalRangeText() {
+ const [start, end] = this.coalDateRange;
+ return start === end ? start : `${start} ~ ${end}`;
+ },
+ // 鐓ょ鍙戣繍鎯呭喌:鏃ュ巻榛樿閫変腑鏃ユ湡(range 妯″紡杩斿洖鏁扮粍,浠呮棩鏈�)
+ coalDefaultDate() {
+ return this.coalDateRange;
+ },
+ // 鍒嗗鎴风叅绉嶅彂杩愭儏鍐�:鏃ユ湡(YYYY-MM-DD)鍖洪棿(鍚� coalDateRange,鍘绘帀鏃跺垎绉�)
+ kehuDateRange() {
+ const start = (this.kehuStartTime || this.todayStr).slice(0, 10);
+ const end = (this.kehuEndTime || this.todayStr).slice(0, 10);
+ return [start, end];
+ },
+ // 鍒嗗鎴风叅绉嶅彂杩愭儏鍐�:鍥炴樉鏃堕棿娈垫枃鏈�(浠呮棩鏈�)
+ kehuRangeText() {
+ const [start, end] = this.kehuDateRange;
+ return start === end ? start : `${start} ~ ${end}`;
+ },
+ // 鍒嗗鎴风叅绉嶅彂杩愭儏鍐�:鏃ュ巻榛樿閫変腑鏃ユ湡(range 妯″紡杩斿洖鏁扮粍,浠呮棩鏈�)
+ kehuDefaultDate() {
+ return this.kehuDateRange;
+ }
},
data() {
+ const validatePass = (rule, value, callback) => {
+ if (this.formData.newpassword1 !== "") {
+ if (value !== this.formData.newpassword1) {
+ callback(new Error("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!"));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ };
+ const checkPassword = (rule, value, callback) => {
+ // let roles = this.$store.getters.roles;//褰撳墠鐢ㄦ埛瑙掕壊id
+ // let passL = 8;
+ // if (roles.concat(1)){
+ // passL = 10
+ // }
+ let passL = 8;
+ this.level = []
+ if(!value) {
+ return callback('瀵嗙爜涓嶈兘涓虹┖')
+ }
+ if(value.length < passL) {
+ return callback(`瀵嗙爜涓嶈兘灏戜簬${passL}浣峘)
+ }
+ if(value.length > 16) {
+ return callback('瀵嗙爜涓嶈兘澶т簬16浣�')
+ }
+ //鏍￠獙鏄暟瀛�
+ const regex1 = /^\d+$/
+ // 鏍￠獙瀛楁瘝
+ const regex2 = /^[A-Za-z]+$/
+ // 鏍￠獙绗﹀彿
+ const regex3 =
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乚+$/
+ if(regex1.test(value)) {
+ this.level.push('low')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(regex2.test(value)) {
+ this.level.push('low')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(regex3.test(value)) {
+ this.level.push('low')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(/^[A-Za-z\d]+$/.test(value)) {
+ this.level.push('low')
+ this.level.push('middle')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乗d]+$/.test(
+ value
+ )
+ ) {
+ this.level.push('low')
+ this.level.push('middle')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�丄-Za-z]+$/.test(
+ value
+ )
+ ) {
+ this.level.push('low')
+ this.level.push('middle')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ } else if (
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�丄-Za-z\d]+$/.test(
+ value
+ )
+ ) {
+ this.level.push('low')
+ this.level.push('middle')
+ this.level.push('high')
+ }
+ return callback()
+ };
return {
+ level:[],
// ucharts鍥捐〃
chartData: {},
opts: {
@@ -652,7 +916,6 @@
procInstId: '',
// 閫夋嫨鍣�
statusSeletShow: false,
- statusList: [['涓浗', '缇庡浗', '鏃ユ湰']],
// data
shenqingData: [],
daibanData: [],
@@ -689,17 +952,56 @@
kehuTongji:[], //鐓ょ缁熻
kehuTongjiTemp:[], //鐓ょ缁熻
kehuTongjiShowIsMore: false,
+ // 鐓ょ鍙戣繍鎯呭喌 鏃堕棿娈甸�夋嫨
+ coalLoaded: false, //鏄惁宸叉煡璇㈣繃(鎺у埗鍖哄潡鏄鹃殣)
+ coalLoading: false, //鍖哄潡鍐呰浆鍦�(鍔犺浇涓�)
+ coalCalendarShow: false,
+ coalCalendarKey: 0, //姣忔鎵撳紑鑷,寮哄埗 u-calendar 閲嶆柊鎸傝浇,瑙勯伩寰俊 scroll-view 閲嶅鎵撳紑涓嶉噸婊氥�侀粯璁ゅ仠鍦� minDate 鏈堢殑 bug
+ coalStartTime: '', //寮�濮嬫棩鏈�(YYYY-MM-DD 00:00:00),榛樿褰撳ぉ
+ coalEndTime: '', //缁撴潫鏃ユ湡(YYYY-MM-DD 23:59:59),榛樿褰撳ぉ
+ // 鍒嗗鎴风叅绉嶅彂杩愭儏鍐� 鏃堕棿娈甸�夋嫨
+ kehuLoaded: false, //鏄惁宸叉煡璇㈣繃(鎺у埗鍖哄潡鏄鹃殣)
+ kehuLoading: false, //鍖哄潡鍐呰浆鍦�(鍔犺浇涓�)
+ kehuCalendarShow: false,
+ kehuCalendarKey: 0, //姣忔鎵撳紑鑷,寮哄埗 u-calendar 閲嶆柊鎸傝浇(鍚� coalCalendarKey)
+ kehuStartTime: '', //寮�濮嬫棩鏈�(YYYY-MM-DD 00:00:00),榛樿褰撳ぉ
+ kehuEndTime: '', //缁撴潫鏃ユ湡(YYYY-MM-DD 23:59:59),榛樿褰撳ぉ
roles:[],
d2Sum:0, //鎬昏閲戦
d1Sum:0, //鎬昏
lyDSumSum:0, //璺繍
dsumSum:0, //姹借繍
+ passShow: false, //瀵嗙爜寮规
+ sumbLoading: false,
+ formData: {
+ password:'',
+ newpassword1:'',
+ newpassword2:'',
+ },
+ rules: {
+ password: [{
+ type: 'string',
+ required: true,
+ message: '璇峰～鍐欏瘑鐮�',
+ trigger: ['blur', 'change']
+ }],
+ newpassword1: [{
+ required: true,
+ validator: checkPassword,
+ trigger: 'change'
+ }],
+ newpassword2: [{
+ required: true,
+ validator: validatePass,
+ trigger: "blur"
+ }]
+ }
};
},
// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
- // onReady() {
-
- // },
+ onReady() {
+ this.$refs.uForm.setRules(this.rules)
+ },
// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
onNavigationBarButtonTap(e) {
console.log('閫�鍑哄鑸爮鎸夐挳浜嬩欢', e);
@@ -776,6 +1078,52 @@
},
},
methods: {
+ handlePassConfirm() { //淇敼瀵嗙爜
+ //鍒楄〃鏌ヨ
+ this.$refs.uForm.validate().then(res => {
+ this.sumbLoading = true
+ uni.showLoading({
+ title: '姝ｅ湪鍔犺浇...'
+ });
+ this.formData.deptId = uni.getStorageSync('userInfo')?.deptId
+ this.formData.username = uni.getStorageSync('userInfo')?.username
+ this.$reqPut('editInfo',this.formData).then(res => {
+ if (res.code == 0) {
+ this.passShow = false
+ this.sumbLoading = false
+ this.$u.toast('淇敼瀵嗙爜鎴愬姛!');
+ setTimeout(() => {
+ uni.reLaunch({
+ url:"/pages/login/login"
+ })
+ }, 1000)
+ uni.hideLoading();
+ }else {
+ this.$u.toast(res.msg || '淇敼瀵嗙爜澶辫触');
+ this.sumbLoading = false
+ uni.hideLoading();
+ }
+ })
+ })
+
+ },
+ handleClosePassShow() {
+ this.passShow = false
+ },
+ handlePwd() {
+ this.passShow = true
+ },
+ // 鎵撳紑鐓ょ鍙戣繍鎯呭喌 鏃堕棿娈垫棩鍘�:鑷 key 寮哄埗 u-calendar 閲嶆柊鎸傝浇,
+ // 瑙勯伩寰俊绔噸澶嶆墦寮�鏃� scroll-view 鍥� scroll-top 鏈彉鑰屼笉閲嶆粴銆侀粯璁ゅ仠鍦� minDate 鏈堢殑 bug
+ openCoalCalendar() {
+ this.coalCalendarKey++
+ this.coalCalendarShow = true
+ },
+ // 鎵撳紑鍒嗗鎴风叅绉嶅彂杩愭儏鍐� 鏃堕棿娈垫棩鍘�(鍘熺悊鍚� openCoalCalendar)
+ openKehuCalendar() {
+ this.kehuCalendarKey++
+ this.kehuCalendarShow = true
+ },
handleShouKuanIsMore() { //褰撴棩鏀舵鎯呭喌
this.shoukuanIsMore = !this.shoukuanIsMore
},
@@ -813,7 +1161,7 @@
if (res.code == 0) {
this.shoukuanJiluTemp = res.data || []
if(this.shoukuanJiluTemp && this.shoukuanJiluTemp.length > 0) {
- this.shoukuanToatl = this.shoukuanJiluTemp[0]?.money || 0
+ this.shoukuanToatl = this.shoukuanJiluTemp[0]?.money2 || 0
if(this.shoukuanJiluTemp.length > 0) {
this.shoukuanJilu = this.shoukuanJiluTemp.slice(0,2)
this.shoukuanIsMore = false
@@ -823,8 +1171,15 @@
})
},
getStatistics1() { //鎸夌叅绉嶇粺璁�
- this.$reqGet('getStatistics1').then(res => {
+ console.log('鎸夌叅绉嶇粺璁�------寮�濮嬫椂闂�',this.coalStartTime,this.startTodayStr)
+ console.log('鎸夌叅绉嶇粺璁�------寮�濮嬫椂闂�',this.coalEndTime,this.endTodaydayStr)
+ this.coalLoading = true
+ this.$reqGet('getStatistics1', {
+ startTime: this.coalStartTime || this.startTodayStr,
+ endTime: this.coalEndTime || this.endTodaydayStr
+ }).then(res => {
if (res.code == 0) {
+ this.coalLoaded = true
this.coalTongjiTemp = res.data || []
if(this.coalTongjiTemp && this.coalTongjiTemp.length > 0){
this.d2Sum = this.coalTongjiTemp[0]?.d2Sum || 0
@@ -835,22 +1190,63 @@
this.coalTongji = this.coalTongjiTemp.slice(0,2)
this.coalShowIsMore = false
}
+ } else {
+ this.resetCoalStat()
}
}
+ }).finally(() => {
+ this.coalLoading = false
})
},
+ resetCoalStat() { //娓呯┖鐓ょ鍙戣繍鎯呭喌缁熻
+ this.coalTongji = []
+ this.coalTongjiTemp = []
+ this.d2Sum = 0
+ this.d1Sum = 0
+ this.lyDSumSum = 0
+ this.dsumSum = 0
+ },
+ // 鐓ょ鍙戣繍鎯呭喌 鏃堕棿娈电‘璁�(寮�濮嬭ˉ 00:00:00銆佺粨鏉熻ˉ 23:59:59)
+ coalCalendarConfirm(e) {
+ this.coalCalendarShow = false
+ const arr = Array.isArray(e) ? e : (e && e.result) || []
+ if (arr.length < 2) return
+ this.coalStartTime = `${arr[0]} 00:00:00`
+ this.coalEndTime = `${arr[arr.length - 1]} 23:59:59`
+ this.getStatistics1()
+ },
getStatistics2() { //鎸夊鎴峰彂杩愮粺璁�
- this.$reqGet('getStatistics2').then(res => {
+ console.log('鍙戣繍缁熻------寮�濮嬫椂闂�',this.kehuStartTime,this.startTodayStr)
+ console.log('鍙戣繍缁熻------寮�濮嬫椂闂�',this.kehuEndTime,this.endTodaydayStr)
+ this.kehuLoading = true
+ this.$reqGet('getStatistics2', {
+ startTime: this.kehuStartTime || this.startTodayStr,
+ endTime: this.kehuEndTime || this.endTodaydayStr
+ }).then(res => {
if (res.code == 0) {
+ this.kehuLoaded = true
this.kehuTongjiTemp = res.data || []
if(this.kehuTongjiTemp && this.kehuTongjiTemp.length > 0){
if(this.kehuTongjiTemp.length > 0) {
this.kehuTongji = this.kehuTongjiTemp.slice(0,2)
this.kehuTongjiShowIsMore = false
}
+ } else {
+ this.kehuTongji = []
}
}
+ }).finally(() => {
+ this.kehuLoading = false
})
+ },
+ // 鍒嗗鎴风叅绉嶅彂杩愭儏鍐� 鏃堕棿娈电‘璁�(寮�濮嬭ˉ 00:00:00銆佺粨鏉熻ˉ 23:59:59)
+ kehuCalendarConfirm(e) {
+ this.kehuCalendarShow = false
+ const arr = Array.isArray(e) ? e : (e && e.result) || []
+ if (arr.length < 2) return
+ this.kehuStartTime = `${arr[0]} 00:00:00`
+ this.kehuEndTime = `${arr[arr.length - 1]} 23:59:59`
+ this.getStatistics2()
},
//浠ｅ姙璇︽儏
daibanDetail(item) {
@@ -955,7 +1351,8 @@
m = m < 10 ? '0' + m : m;
let d = date.getDate();
d = d < 10 ? '0' + d : d;
- const time = y + '-' + m + '-' + d;
+ // const time = y + '-' + m + '-' + d;
+ const time = `${y}-${m}-${d} 00:00:00`;
console.log('todayDate---------', time);
return time;
},
@@ -1220,11 +1617,21 @@
};
</script>
-
<style lang="scss" scoped>
::v-deep{
.uni-table-td,.uni-table-th{
color: #000;
+ }
+ .passWord-main-box{
+ .u-popup__content{
+ width: 85%;
+ padding: 40rpx;
+ box-sizing: border-box;
+ border-radius: 10rpx;
+ }
+ .u-icon__icon{
+ font-size: 28rpx!important;
+ }
}
}
::v-deep.home {
@@ -1601,6 +2008,34 @@
align-items: baseline;
}
}
+ .date-pick-box{
+ position: absolute;
+ right: 20rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ display: flex;
+ align-items: center;
+ max-width: 55%;
+ .date-pick-text{
+ font-size: 26rpx;
+ color: #4b6cfa;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ .date-pick-icon{
+ width: 32rpx;
+ height: 32rpx;
+ margin-left: 8rpx;
+ }
+ }
+ }
+ .block-loading{
+ width: 100%;
+ padding: 60rpx 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.shoukuan-box{
width: 100%;
@@ -1745,4 +2180,63 @@
}
}
}
+.sumbmit-box{
+ margin-top: 40rpx;
+}
+.editorPass{
+ width: 100%;
+ justify-content: center;
+ display: flex;
+ margin: 20rpx 0;
+ align-items: center;
+ .icon{
+ width: 46rpx;
+ height: 46rpx;
+ margin-right: 10rpx;
+ }
+}
+.huiseBox{
+ width: 100%;
+ height: 12rpx;
+ background: #eeeeee;
+}
+.intensity {
+ width: 100%;
+ margin-top: 10rpx;
+ .psdText {
+ font-size: 14px;
+ margin-right: 10px;
+ }
+
+ .line {
+ display: inline-block;
+ width: 70rpx;
+ height: 8rpx;
+ background: #d8d8d8;
+ border-radius: 6rpx;
+ margin-right: 16rpx;
+
+ &.low {
+ background: #f4664a;
+ }
+
+ &.middle {
+ background: #ffb700;
+ }
+
+ &.high {
+ background: #2cbb79;
+ }
+ }
+
+ .level {
+ margin: 0 32rpx 0 16rpx;
+ }
+
+ .warningtext {
+ color: #5a5a5a;
+ font-size: 24rpx;
+ margin-top: 10rpx;
+ }
+}
</style>
--
Gitblit v1.9.1