diff --git a/src/assets/fonts/DingTalk Sans.ttf b/src/assets/fonts/DingTalk Sans.ttf new file mode 100644 index 0000000..a5b78e6 Binary files /dev/null and b/src/assets/fonts/DingTalk Sans.ttf differ diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index 9d86399..ffc8b57 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -393,6 +393,7 @@ export default { if (this.proxyinfo.roleOfPmd) { this.isMaster = true } + console.log(this.proxyinfo); this.getProxyInfo(this.proxyinfo.id) this.getJob(this.firminfo) this.getPolicyByJobId(this.firminfo.id) diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue index f9d5c1b..02f2769 100644 --- a/src/components/screen/largeScreen.vue +++ b/src/components/screen/largeScreen.vue @@ -52,13 +52,14 @@ - {{ index1 * pageSize + index + 1 }} + {{ index1 * pageSize + index + 1 }}
- + + {{item.aliasName}}
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue index 98261ce..8b521cb 100644 --- a/src/components/userinfo/usercenter/components/dataStatistics.vue +++ b/src/components/userinfo/usercenter/components/dataStatistics.vue @@ -715,14 +715,27 @@ export default { end = moment().format('YYYY-MM-DD') } else if (tag == 3) { that.checked3 = true + // console.log(moment().week(moment().week() - 1).weekday(-1).format('YYYY-MM-DD')); + // console.log(moment().week(moment().week() - 1).weekday(5).format('YYYY-MM-DD')); + // start = moment() + // .week(moment().week() - 1) + // .startOf('week') + // .format('YYYY-MM-DD') + // end = moment() + // .week(moment().week() - 1) + // .endOf('week') + // .format('YYYY-MM-DD') start = moment() .week(moment().week() - 1) - .startOf('week') + .weekday(-1) .format('YYYY-MM-DD') end = moment() .week(moment().week() - 1) - .endOf('week') + .weekday(5) .format('YYYY-MM-DD') + console.log(start) + console.log(end) + return } else if (tag == 4) { that.checked4 = true diff --git a/src/style/index.less b/src/style/index.less index 917522a..2a78c0d 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -1,19 +1,19 @@ @import "http://at.alicdn.com/t/c/font_3135652_2ixc8rvuv5b.css"; @font-face { font-family: "DingTalk"; /* 这里的字体名称是自定义的 */ - src: url("https://matripecandy.oss-cn-beijing.aliyuncs.com/1shoudanImg/DingTalk%20Sans.ttf"); /* 服务器上ttf文件的路径,记得配置域名权限 */ + src: url("../assets/fonts/DingTalk\ Sans.ttf"); /* 服务器上ttf文件的路径,记得配置域名权限 */ font-weight: normal; font-style: normal; font-display: swap; } .lNum { - opacity: 0.6; + opacity: 1; font-size: 32px; font-weight: 400; text-align: right; - color: #ff4400; + color: #fff; line-height: 39px; - margin-right: 12px; + // margin-right: 12px; font-family: "DingTalk"; } // 初始化页面样式