daping quan
Showing
4 changed files
with
29 additions
and
21 deletions
| ... | @@ -13,7 +13,7 @@ | ... | @@ -13,7 +13,7 @@ |
| 13 | v-for="(val,i) in baseList" :key="i" :label="val" :value="val"/> | 13 | v-for="(val,i) in baseList" :key="i" :label="val" :value="val"/> |
| 14 | </el-select> | 14 | </el-select> |
| 15 | </div> | 15 | </div> |
| 16 | <div class="datePick_bg" style="position: absolute;top: 32px;right: 18px;height: 28px"> | 16 | <div class="datePick_bg" style="position: absolute;top: 4vh;right: 18px;height: 28px"> |
| 17 | <el-date-picker | 17 | <el-date-picker |
| 18 | v-model="nowDate" | 18 | v-model="nowDate" |
| 19 | type="month" | 19 | type="month" |
| ... | @@ -24,13 +24,13 @@ | ... | @@ -24,13 +24,13 @@ |
| 24 | ></el-date-picker> | 24 | ></el-date-picker> |
| 25 | </div> | 25 | </div> |
| 26 | <el-row class="w100"> | 26 | <el-row class="w100"> |
| 27 | <el-col v-if="!isLoad" :span="8"> | 27 | <el-col v-if="!isLoad&&obj.IFBASE" :span="8"> |
| 28 | <left-page :obj="obj" :type="type" :url="result" :historyDate="nowDate" :sBase="selectBase"/> | 28 | <left-page :obj="obj" :type="type" :url="result" :historyDate="nowDate" :sBase="selectBase"/> |
| 29 | </el-col> | 29 | </el-col> |
| 30 | <el-col v-if="!isLoad" :span="8"> | 30 | <el-col v-if="!isLoad&&obj.IFBASE" :span="8"> |
| 31 | <center-page :obj="obj" :isLeader="isLeader" :type="type" :url="result" :historyDate="nowDate" :sBase="selectBase"/> | 31 | <center-page :obj="obj" :isLeader="isLeader" :type="type" :url="result" :historyDate="nowDate" :sBase="selectBase"/> |
| 32 | </el-col> | 32 | </el-col> |
| 33 | <el-col v-if="!isLoad" :span="8"> | 33 | <el-col v-if="!isLoad&&obj.IFBASE" :span="8"> |
| 34 | <right-page :obj="obj" :type="type" :url="result" :historyDate="nowDate" :sBase="selectBase"/> | 34 | <right-page :obj="obj" :type="type" :url="result" :historyDate="nowDate" :sBase="selectBase"/> |
| 35 | </el-col> | 35 | </el-col> |
| 36 | </el-row> | 36 | </el-row> |
| ... | @@ -57,10 +57,10 @@ const year = now.getFullYear() // 获取年份(4位数) | ... | @@ -57,10 +57,10 @@ const year = now.getFullYear() // 获取年份(4位数) |
| 57 | const month = now.getMonth() + 1 // 获取月份(0-11,需要+1) | 57 | const month = now.getMonth() + 1 // 获取月份(0-11,需要+1) |
| 58 | const formatMonth = (month) => (month < 10 ? `0${month}` : month) | 58 | const formatMonth = (month) => (month < 10 ? `0${month}` : month) |
| 59 | const nowDate = ref(`${year}-${formatMonth(month)}`) | 59 | const nowDate = ref(`${year}-${formatMonth(month)}`) |
| 60 | let selectBase = ref("总部") | 60 | let selectBase = ref() |
| 61 | let baseList = ref() | 61 | let baseList = ref() |
| 62 | let isLeader = ref(false) | 62 | let isLeader = ref(false) |
| 63 | // url.value = 'http://192.168.1.152:8899/login/sid=36c62778-f35a-4285-a279-08aa2b8a1fa8#/' | 63 | // url.value = 'http://192.168.1.152:8899/login/sid=f30d94a0-70cc-4d7b-b28c-b85622422a35#/' |
| 64 | url.value = window.location.href | 64 | url.value = window.location.href |
| 65 | result.value = url.value?.split('=')[1]?.split('#')[0]; | 65 | result.value = url.value?.split('=')[1]?.split('#')[0]; |
| 66 | 66 | ||
| ... | @@ -73,7 +73,6 @@ onMounted(() => { | ... | @@ -73,7 +73,6 @@ onMounted(() => { |
| 73 | if (result.value) { | 73 | if (result.value) { |
| 74 | handelGetYS000() | 74 | handelGetYS000() |
| 75 | isLeader.value = validateEmail(result.value) | 75 | isLeader.value = validateEmail(result.value) |
| 76 | console.log(isLeader.value) | ||
| 77 | } else { | 76 | } else { |
| 78 | // result.value = 'a3afc265-1e60-4376-bcfb-6ca124db8704' | 77 | // result.value = 'a3afc265-1e60-4376-bcfb-6ca124db8704' |
| 79 | // handelGetYS000() | 78 | // handelGetYS000() |
| ... | @@ -94,7 +93,7 @@ async function handelGetYS000() { | ... | @@ -94,7 +93,7 @@ async function handelGetYS000() { |
| 94 | function setType(){ | 93 | function setType(){ |
| 95 | isLoad.value = true | 94 | isLoad.value = true |
| 96 | nextTick(() => { | 95 | nextTick(() => { |
| 97 | if (selectBase.value !== '总部') { | 96 | if (selectBase.value !== '全公司') { |
| 98 | type.value = false | 97 | type.value = false |
| 99 | } else { | 98 | } else { |
| 100 | type.value = true | 99 | type.value = true |
| ... | @@ -109,7 +108,7 @@ function setType(){ | ... | @@ -109,7 +108,7 @@ function setType(){ |
| 109 | <style lang="scss" scoped> | 108 | <style lang="scss" scoped> |
| 110 | .basePick_bg { | 109 | .basePick_bg { |
| 111 | position: absolute; | 110 | position: absolute; |
| 112 | top: 32px; | 111 | top: 4vh; |
| 113 | right: 180px; | 112 | right: 180px; |
| 114 | height: 28px; | 113 | height: 28px; |
| 115 | width: 155px; | 114 | width: 155px; | ... | ... |
| ... | @@ -212,12 +212,15 @@ const init = () => { | ... | @@ -212,12 +212,15 @@ const init = () => { |
| 212 | clear() | 212 | clear() |
| 213 | obj.value["SELECTDATE"] = hDate | 213 | obj.value["SELECTDATE"] = hDate |
| 214 | obj.value["BASE"] = sBase | 214 | obj.value["BASE"] = sBase |
| 215 | if (!intervalA) { | 215 | // if (!intervalA) { |
| 216 | handelGetYS001() | 216 | // handelGetYS001() |
| 217 | handelGetYS002() | 217 | // handelGetYS002() |
| 218 | handelGetYS003() | 218 | // handelGetYS003() |
| 219 | handelGetYS004() | 219 | // handelGetYS004() |
| 220 | handelGetYS005() | 220 | // handelGetYS005() |
| 221 | // } | ||
| 222 | if (intervalA) { | ||
| 223 | clearInterval(intervalA); | ||
| 221 | } | 224 | } |
| 222 | intervalA = setInterval(getdata(), 1000 * 60 * 60); | 225 | intervalA = setInterval(getdata(), 1000 * 60 * 60); |
| 223 | } | 226 | } | ... | ... |
| ... | @@ -408,8 +408,11 @@ function handelSelect4() { | ... | @@ -408,8 +408,11 @@ function handelSelect4() { |
| 408 | 408 | ||
| 409 | const init = () => { | 409 | const init = () => { |
| 410 | clear() | 410 | clear() |
| 411 | if (!intervalA) { | 411 | // if (!intervalA) { |
| 412 | handelGetYS006() | 412 | // handelGetYS006() |
| 413 | // } | ||
| 414 | if (intervalA) { | ||
| 415 | clearInterval(intervalA); | ||
| 413 | } | 416 | } |
| 414 | intervalA = setInterval(getdata(), 1000 * 60 * 60); | 417 | intervalA = setInterval(getdata(), 1000 * 60 * 60); |
| 415 | } | 418 | } | ... | ... |
| ... | @@ -329,10 +329,13 @@ const init = () => { | ... | @@ -329,10 +329,13 @@ const init = () => { |
| 329 | clear() | 329 | clear() |
| 330 | obj.value["SELECTDATE"] = hDate | 330 | obj.value["SELECTDATE"] = hDate |
| 331 | obj.value["BASE"] = sBase | 331 | obj.value["BASE"] = sBase |
| 332 | if (!intervalA) { | 332 | // if (!intervalA) { |
| 333 | handelGetYS007() | 333 | // handelGetYS007() |
| 334 | handelGetYS008() | 334 | // handelGetYS008() |
| 335 | handelGetYS009() | 335 | // handelGetYS009() |
| 336 | // } | ||
| 337 | if (intervalA) { | ||
| 338 | clearInterval(intervalA); | ||
| 336 | } | 339 | } |
| 337 | intervalA = setInterval(getdata(), 1000 * 60 * 60); | 340 | intervalA = setInterval(getdata(), 1000 * 60 * 60); |
| 338 | } | 341 | } | ... | ... |
-
Please register or sign in to post a comment