1

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)

src/components/screen/largeScreen.vue

@@ -52,13 +52,14 @@
                                           <img style="display:inline;width:44px" src="../../assets/one.svg" alt v-if="index1 * pageSize + index + 1 == 1" />
                                           <img style="display:inline;width:44px" src="../../assets/two.svg" alt v-if="index1 * pageSize + index + 1 == 2" />
                                           <img style="display:inline;width:44px" src="../../assets/three.svg" alt v-if="index1 * pageSize + index + 1 == 3" />
-                                          <span v-if="index1 * pageSize + index + 1 > 3" style="text-align: center">{{ index1 * pageSize + index + 1 }}</span>
+                                          <span v-if="index1 * pageSize + index + 1 > 3" class="lNum" style="text-align: center">{{ index1 * pageSize + index + 1 }}</span>
                                           <!-- {{index1 * pageSize + index + 1}} -->
                                         </div>
                                         <div class="ttd tc2 name" :class="showaliasName_curr == item.aliasName ?'numeAni' : ''" style="">
                                          
                                          <span style="display:inline-block;height:100%;line-height:70px;vertical-align:middle">
-                                           <i class="iconfont icon-morentouxiang f56" style="color:#ff4400"></i>
+                                          <img v-if="item.imgSrc" :src="item.imgSrc" alt="">
+                                           <i v-else class="iconfont icon-morentouxiang f56" style="color:#ff4400"></i>
                                          </span>
                                             {{item.aliasName}}
                                         </div>

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
 

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";
 }
 // 初始化页面样式