Browse Source

update calence map

develop
mbp 2 months ago
parent
commit
752ba0b30d
  1. 37
      ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/DialogCalendar.vue
  2. 6
      ruoyi-ui/vue.config.js

37
ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/DialogCalendar.vue

@ -1,11 +1,11 @@
<template> <template>
<Dialog v-model="visibleModel" title="上传日历" width="700px"> <Dialog v-model="visibleModel" title="上传日历" top="70px" width="700px">
<el-calendar v-model="mon"> <el-calendar v-model="mon" class="cal">
<template <template
slot="dateCell" slot="dateCell"
slot-scope="{date, data}"> slot-scope="{date, data}">
<p :class="selDays.indexOf(data.day)!==-1 ? 'is-selected' : ''"> <p>
{{ data.day.split('-').slice(1).join('-') }} {{ data.isSelected ? '✔️' : ''}} {{ data.day.split('-').slice(1).join('-') }}<br /><div style="font-size:25px;margin-top:10px;margin-left:20px;">{{ selDays.indexOf(data.day)!==-1 ? '✅' : ''}}</div>
</p> </p>
</template> </template>
</el-calendar> </el-calendar>
@ -35,8 +35,18 @@ export default {
}, },
watch: { watch: {
mon: { mon: {
handler(newValue, oldValue) { handler (val, oldVal) {
if (
val &&
moment(val).toDate() < moment(oldVal).startOf("month").toDate()
) {
this.getData(); this.getData();
} else if (
val &&
moment(val).toDate() > moment(oldVal).endOf("month").toDate()
) {
this.getData();
}
}, },
deep: true, deep: true,
} }
@ -70,9 +80,18 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.video-stream { .cal {
width: 100%; background: #00000000;
height: 100%;
} }
::v-deep {
.el-calendar__title,.el-calendar-day,.el-calendar-table thead th{
color: white !important;
}
.el-calendar__button-group > .el-button-group > .el-button{
background: #00000000 !important;
color: white !important;
}
.is-selected,.el-calendar-table .el-calendar-day:hover {
background: #00000000 !important;
}}
</style> </style>

6
ruoyi-ui/vue.config.js

@ -38,14 +38,14 @@ module.exports = {
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://127.0.0.1:8087`, // target: `http://127.0.0.1:8087`,
// target:`http://localhost:3001`, // target:`http://localhost:3001`,
target:`http://10.0.111.11:8097`,
// target:`http://10.0.111.11:8097`, // target:`http://10.0.111.11:8097`,
// target: `http://10.168.66.196:8087`, //刘文阁 // target:`http://10.0.111.11:8097`,
target: `http://10.168.66.196:8087`, //刘文阁
// target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.68.42:8087`, //王思祥
// target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.72.174:8087`, //赵祥龙
// target: `http://10.168.65.156:8097`, //孟凡峰 // target: `http://10.168.65.156:8097`, //孟凡峰
// target: `http://10.168.79.46:8089`, //王家宝 // target: `http://10.168.79.46:8089`, //王家宝
target: `http://10.168.77.128:8087`, //王兴琳 // target: `http://10.168.77.128:8087`, //王兴琳
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "", ["^" + process.env.VUE_APP_BASE_API]: "",

Loading…
Cancel
Save