update

pages.json

@@ -94,6 +94,18 @@
                 }
             ]
         },
+        {
+            "root": "pages/newamine",
+            "pages": [
+                {
+                    "path": "index",
+                    "style": {
+                        "navigationBarTitleText": "",
+                        "navigationStyle": "custom"
+                    }
+                }
+            ]
+        },
         { // 商业BI
             "root": "pages/commercialBI",
             "pages": [

pages/additionalFeatures/positionPunching.vue

@@ -25,7 +25,7 @@
 				</div>
 			</div>
 			<div class="btn-box" >
-			
+
 				<div class="btn" :class="{'bg-gray':!signin.isAble}" @click="takePhoto">
 					<div class="fs-14">{{!workLocale.isAmclock ? '下班打卡': '上班打卡'}}</div>
 					<div class="fs-52">{{signin.time}}</div>
@@ -39,7 +39,7 @@
 		</div>
 		<uniPopup type="middle" :show="showPop">
 			<div class="pop-body">
-				<image src="/static/images/puching/succes.png" mode="aspectFill"></image>
+				<image src="https://eshangtech.com/ShopICO/ahyd-BID/puching/succes.png" mode="aspectFill"></image>
 				<div class="tip-time">{{clockDate}}</div>
 				<div class="tip-text">打卡成功!</div>
 				<div class="pop-btn" @click="showPop=!showPop">知道了</div>
@@ -54,7 +54,7 @@
 
 	export default{
 		data(){
-			const nowday = this.$util.cutDate(new Date()) 
+			const nowday = this.$util.cutDate(new Date())
 			return {
 				loading: true,
 				clockDate:'',
@@ -105,7 +105,7 @@
 			// 			const latitude = res.latitude
 			// 			const longitude = res.longitude
 			// 			let { ClockLng,ClockLat } = _this.workLocale
-						
+
 			// 			_this.$util.calculateDistance(
 			// 				{latitude:latitude, longitude:longitude},
 			// 				{latitude: ClockLat, longitude: ClockLng})
@@ -128,10 +128,10 @@
 			  this.signin.time = this.$util.cutDate(time,'hh:mm:ss')
 			},
 			getDay (){
-				  
+
-				var a = new Array("日", "一", "二", "三", "四", "五", "六");  
+				var a = new Array("日", "一", "二", "三", "四", "五", "六");
-				var week = new Date().getDay();  
+				var week = new Date().getDay();
-				this.signin.day = "星期"+ a[week];  
+				this.signin.day = "星期"+ a[week];
 			},
 			// getWorkLocale(){ //获取 考勤地址、坐标，打卡范围，上、下班时间
 			// 	let _this= this
@@ -149,18 +149,18 @@
 			// 					longitude: ClockLng,
 			// 					title: msg.ClockAddress,
 			// 				}]
-				
+
 			// 				_this.circles[0].latitude = ClockLat
 			// 				_this.circles[0].longitude = ClockLng
 			// 				_this.circles[0].radius = msg.ClockRange
-							
+
 			// 				let am = new Date(nowDay+' '+msg.AMEndtime+':00')
 			// 				msg.isAmclock = am.getTime()-(new Date()).getTime() >0 ? true: false
 			// 				_this.workLocale = msg
 			// 				_this.loading = false
 			// 				// _this.getLocation()
 			// 			}
-						
+
 			// 		}else {
 			// 			uni.showModal({
 			// 				title:'温馨提示',
@@ -170,7 +170,7 @@
 			// 		}
 			// 	})
 			// },
-			
+
 			getMsg(){ // 更新用户当前打卡时间
 				let _this= this
 				let nowDay = this.nowDay
@@ -182,16 +182,16 @@
 						if( res.Data.List.length>0){
 							let msg =  res.Data.List[0]
 							_this.pageMsg = msg
-							
+
 						}
-						
+
 					}
 				})
 			},
 			faceClock(){ // 提交打卡
 				let _this= this
 				let location = this.signin
-				
+
 				if(!this.signin.isAble) return
 				_this.signinTime = this.signin.time
 				uni.showLoading({
@@ -204,13 +204,13 @@
 					photo: this.userPhoto || ''
 				}).then(res =>{
 					_this.loading = false
-					
+
 					uni.hideLoading()
 					if(res.Result_Code==100) {
 						_this.clockDate = res.Data.ClockDate
 						_this.getMsg()
 						_this.showPop = true
-						
+
 					}else{
 						uni.showModal({
 							content:'打卡失败：'+res.Result_Desc
@@ -227,31 +227,31 @@
 				let _this = this
 				if(!this.signin.isAble) return //  是否可以打卡
 				if(this.loading ) return  // 是否正在上传
-				
+
 				uni.navigateTo({
 					url:'/pages/additionalFeatures/takePhoto'
 				})
 			},
 			photoTobase64(photoPath){ // 把图片转为base64
-				
+
 				let _this= this
 				uni.getFileSystemManager().readFile({
 					filePath: photoPath, //选择图片返回的相对路径
 					encoding: 'base64', //编码格式
-					success: res => { // 
+					success: res => { //
 						let base64 = res.data.replace(/\+/ig,'%2B') //不加上这串字符，在页面无法显示的哦
-						
+
-						_this.userPhoto = base64 
+						_this.userPhoto = base64
 						_this.faceClock()
 					}
 				})
-				
+
 			}
 		},
 		onLoad() {
 			let _this = this
 			// this.getWorkLocale()
-			
+
 			_this.setTime = setInterval(function(){_this.getTime()},1000)
 			_this.getMsg()
 			uni.$on('addUserPhoto',function(data){ // 监听打卡拍照的数据,接收拍照的照片地址
@@ -263,13 +263,13 @@
 		onPullDownRefresh() {
 			let _this = this
 			_this.getLocation()
-		
+
 			setTimeout(function() {
 				uni.stopPullDownRefresh()
-				
+
 			}, 1000)
 		},
-		
+
 		onUnload() {
 			// console.log(1)
 			uni.$off('addUserPhoto')
@@ -308,7 +308,7 @@
 	}
 	.date-text {
 		color: #A3A3A3;
-		
+
 		font-size: 22rpx;
 		/* line-height: 50rpx; */
 		/* margin-left: 8rpx; */
@@ -330,7 +330,7 @@
 	}
 	.punching-date-box:nth-child(2)::before {
 		content: '';
-		position: absolute; 
+		position: absolute;
 		height: 190rpx;
 		width: 2rpx;
 		display: block;
@@ -385,7 +385,7 @@
 		box-sizing: border-box;
 	}
 	.bg-gray.btn {
-		background:linear-gradient(#cdd4d8 0%, #ADB2BF 100%);  
+		background:linear-gradient(#cdd4d8 0%, #ADB2BF 100%);
 	}
 	.able-text {
 		color: #8B8D8E;
@@ -413,7 +413,7 @@
 		margin: 0 50%;
 	}
 	.tip-text {
-		
+
 		font-size: 46rpx;
 		text-align: center;
 		color: #7B95A9;

pages/index/index.vue

@@ -16,8 +16,8 @@
 <!--              <text class="day" >{{ thisDay }}</text>-->
               <view class="uni-input" :style="{color: 1<=selectMonth && selectMonth<=3?'#B33115':4<=selectMonth && selectMonth<=6?'#025B93':7<=selectMonth && selectMonth<=9?'#2249A2':'#783F0F'}"  style="background: transparent;padding: 0;height:100%">{{ single }}</view>
               <image class="icon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDownArrow.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stDownArrow.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stDownArrow.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stDownArrow.svg'"></image>
-            </view>
+            </view> 
-          </picker>
+          </picker> 
         </view>
       </div>
 
@@ -1422,8 +1422,9 @@ export default {
         // 切换考核的数据
         this.handleGetExamine()
         // 切换日常巡检数据
-
         this.handleGetDailyPatrol()
+        // 获取全省平均车流量
+        this.handleGetAllCarTraffic()
       }
     },
     getCarInfo(date){
@@ -1614,14 +1615,13 @@ export default {
           // 同比去年的年度累计
           let yearYoY = (((result.MonthRevenueModel.YearRevenueAmount - result.MonthRevenueModel.YearRevenueYOY) / result.MonthRevenueModel.YearRevenueYOY)*100).toFixed(2)
           console.log('yearYoY',yearYoY)
-          this.showTableData.yearYoY = Number(yearYoY)
+          this.showTableData.yearYoY = Number(yearYoY)>0 ? '+' + Number(yearYoY) : Number(yearYoY)
         }
         if (this.showTableData.RevenueQOQ){
           // 对客的环比
           let customerQoQ = (((result.MonthRevenueModel.CashPay - result.MonthRevenueModel.RevenueQOQ) / result.MonthRevenueModel.RevenueQOQ)*100).toFixed(2)
           console.log('customerQoQ',customerQoQ)
-          this.showTableData.customerQoQ = Number(customerQoQ)>0?'+'+customerQoQ+'%':Number(customerQoQ)<0?'-'+customerQoQ+'%':''
+          this.showTableData.customerQoQ = Number(customerQoQ)>0?'+'+customerQoQ+'%':Number(customerQoQ)<0?customerQoQ+'%':''
-
         }
 
         this.yesObj = result.RevenuePushModel

pages/newamine/component/yearCharts.vue

@@ -0,0 +1,81 @@
+<template>
+  <view style="width: 56rpx;height: 56rpx">
+    <canvas style="width: 56rpx;height: 56rpx" canvas-id="month" id="month"/>
+  </view>
+</template>
+
+<script>
+import uCharts from '@/components/u-charts.js';
+
+var uChartsInstance = {};
+export default {
+  name: "YearCharts",
+  data() {
+    return {}
+  },
+  props: {
+    success: {
+      type: Number,
+      default: 0
+    }
+  },
+  watch: {
+    success: {
+      handler(value) {
+        console.log('value111', value)
+        let success = Number(value) > 100 ? 100 : Number(value)
+        let error = Number(100 - value) < 0 ? 0 : Number(100 - value)
+        let res = {
+          series: [{
+            data: [{name: '已完成', value: success}, {name: '未完成', value: error}]
+          }]
+        }
+        console.log('res',res)
+        this.drawCharts('month', res)
+      }
+    }
+  },
+  methods: {
+    drawCharts(id, data) {
+      const ctx = uni.createCanvasContext(id, this);
+      let _this = this
+      uChartsInstance[id] = new uCharts({
+        type: "ring",
+        context: ctx,
+        width: 28,
+        height: 28,
+        series: data.series,
+        animation: true,
+        rotate: false,
+        rotateLock: false,
+        background: "#FFFFFF",
+        color: ["#FC7909", "#FEE2CA"],
+        padding: [0,0,0,0],
+        dataLabel: false,
+        enableScroll: false,
+        legend: {
+          show: false,
+          position: "right",
+          lineHeight: 25
+        },
+        extra: {
+          ring: {
+            ringWidth: 4,
+            activeOpacity: 0.5,
+            activeRadius: 10,
+            offsetAngle: -90,
+            labelWidth: 0,
+            border: false,
+            borderWidth: 3,
+            customRadius: 14,
+            borderColor: "#FFFFFF"
+          }
+        }
+      });
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

pages/revenue/component/otherCharts.vue

@@ -0,0 +1,90 @@
+<template>
+    <view style="width: 128rpx;height: 128rpx">
+        <canvas style="width: 128rpx;height: 128rpx" canvas-id="month" id="month"/>
+    </view>
+</template>
+
+<script>
+import uCharts from '@/components/u-charts.js';
+
+var uChartsInstance = {};
+export default {
+    name: "OtherCharts",
+    data() {
+        return {}
+    },
+    props: {
+        success: {
+            type: Number,
+            default: 0
+        },
+        colorList:{
+            type: Array,
+            default:[]
+        }
+    },
+    watch: {
+        success: {
+            handler(value) {
+                console.log('value111', value)
+                let success = Number(value) > 100 ? 100 : Number(value)
+                let error = Number(100 - value) < 0 ? 0 : Number(100 - value)
+                let res = {
+                    series: [{
+                        data: [{name: '已完成', value: success}, {name: '未完成', value: error}]
+                    }]
+                }
+                console.log('res',res)
+                this.drawCharts('month', res)
+            }
+        }
+    },
+    methods: {
+        drawCharts(id, data) {
+            const ctx = uni.createCanvasContext(id, this);
+            let _this = this
+            uChartsInstance[id] = new uCharts({
+                type: "ring",
+                context: ctx,
+                width: 64,
+                height: 64,
+                series: data.series,
+                animation: true,
+                rotate: false,
+                rotateLock: false,
+                background: "#FFFFFF",
+                color: _this.colorList,
+                padding: [0,0,0,0],
+                dataLabel: false,
+                enableScroll: false,
+                legend: {
+                    show: false,
+                    position: "right",
+                    lineHeight: 25
+                },
+                title: {
+                    name: "完成率",
+                    fontSize: 14,
+                    color: "#A69E9F"
+                },
+                extra: {
+                    ring: {
+                        ringWidth: 8,
+                        activeOpacity: 0.5,
+                        activeRadius: 10,
+                        offsetAngle: -90,
+                        labelWidth: 0,
+                        border: false,
+                        borderWidth: 3,
+                        customRadius: 32,
+                        borderColor: "#FFFFFF"
+                    }
+                }
+            });
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

static/images/newExamine/fixedIcon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>考核图标/地点@2x</title>
+    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="考核巡检0811" transform="translate(-291.000000, -1351.000000)" fill="#A69E9F" fill-rule="nonzero">
+            <g id="考核图标/地点" transform="translate(279.000000, 1335.000000)">
+                <g id="考核图标/地点" transform="translate(12.000217, 16.000000)">
+                    <path d="M8,0 C11.6818983,0 14.6666667,2.98476833 14.6666667,6.66666667 C14.6666667,9.12126555 12.4444444,12.2323767 8,16 C3.55555556,12.2323767 1.33333333,9.12126555 1.33333333,6.66666667 C1.33333333,2.98476833 4.31810167,0 8,0 Z M8,4 C6.52724067,4 5.33333333,5.19390733 5.33333333,6.66666667 C5.33333333,8.139426 6.52724067,9.33333333 8,9.33333333 C9.47275933,9.33333333 10.6666667,8.139426 10.6666667,6.66666667 C10.6666667,5.19390733 9.47275933,4 8,4 Z" id="形状结合"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

static/images/newExamine/rightIcon.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>收支预测/查看更多@2x</title>
+    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="考核巡检0811" transform="translate(-199.000000, -1353.000000)" fill="#CDBCAB">
+            <g id="收支预测/查看更多" transform="translate(199.000000, 1353.000000)">
+                <g id="编组" transform="translate(0.000217, 0.000000)">
+                    <g id="计划图标/更多-白色" transform="translate(3.000000, 1.000000)">
+                        <path d="M1.58058262,0.580582618 L5.46966991,4.46966991 L5.46966991,4.46966991 C5.76256313,4.76256313 5.76256313,5.23743687 5.46966991,5.53033009 L1.58058262,9.41941738 C1.2876894,9.7123106 0.812815665,9.7123106 0.519922446,9.41941738 C0.227029227,9.12652416 0.227029227,8.65165043 0.519922446,8.35875721 L3.87825253,4.9999127 L0.519922446,1.64124279 C0.227029227,1.34834957 0.227029227,0.873475836 0.519922446,0.580582618 C0.812815665,0.287689399 1.2876894,0.287689399 1.58058262,0.580582618 Z" id="形状结合"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

static/images/newExamine/sort.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>筛选@2x</title>
+    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="考核巡检0811" transform="translate(-127.000000, -1353.000000)">
+            <g id="编组" transform="translate(127.000000, 1353.000000)">
+                <rect id="矩形" x="0" y="0" width="12" height="12"></rect>
+                <g transform="translate(1.000000, 0.000000)">
+                    <path d="M5.56568542,0.565685425 L8.63431458,3.63431458 C8.94673401,3.94673401 8.94673401,4.45326599 8.63431458,4.76568542 C8.48428547,4.91571453 8.28080234,5 8.06862915,5 L1.93137085,5 C1.48954305,5 1.13137085,4.6418278 1.13137085,4.2 C1.13137085,3.98782681 1.21565632,3.78434368 1.36568542,3.63431458 L4.43431458,0.565685425 C4.74673401,0.253265992 5.25326599,0.253265992 5.56568542,0.565685425 Z" id="三角形" fill="#EC6C00"></path>
+                    <path d="M5.56568542,7.56568542 L8.63431458,10.6343146 C8.94673401,10.946734 8.94673401,11.453266 8.63431458,11.7656854 C8.48428547,11.9157145 8.28080234,12 8.06862915,12 L1.93137085,12 C1.48954305,12 1.13137085,11.6418278 1.13137085,11.2 C1.13137085,10.9878268 1.21565632,10.7843437 1.36568542,10.6343146 L4.43431458,7.56568542 C4.74673401,7.25326599 5.25326599,7.25326599 5.56568542,7.56568542 Z" id="三角形备份" fill="#DDDAD7" transform="translate(5.000000, 9.500000) scale(1, -1) translate(-5.000000, -9.500000) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

static/images/newExamine/tabIcon.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="29px" height="9px" viewBox="0 0 29 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>路径@2x</title>
+    <defs>
+        <linearGradient x1="-1.11022302e-14%" y1="50%" x2="100%" y2="50%" id="linearGradient-1">
+            <stop stop-color="#FF7300" offset="0%"></stop>
+            <stop stop-color="#FC4E00" stop-opacity="0" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="考核巡检0811" transform="translate(-155.000000, -1355.000000)" fill="url(#linearGradient-1)" fill-rule="nonzero">
+            <g id="路径" transform="translate(155.000000, 1355.000000)">
+                <path d="M0.408517176,0.788974914 C1.07740705,-0.0900359625 2.33222853,-0.260372694 3.21123941,0.408517176 C6.24646252,2.7181928 10.0226201,4.00010716 14.0156068,4.00010716 C17.9961974,4.00010716 21.7614246,2.72617962 24.7922146,0.429596419 C25.6725842,-0.237504199 26.9270566,-0.0646155693 27.5941572,0.815753981 C28.2612579,1.69612353 28.0883692,2.95059596 27.2079997,3.61769658 C23.4842655,6.43935869 18.8713088,8.00010716 14.0156068,8.00010716 C9.14472075,8.00010716 4.51828614,6.42954429 0.788974914,3.59169715 C-0.0900359625,2.92280728 -0.260372694,1.66798579 0.408517176,0.788974914 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>

static/images/newExamine/timeIcon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>考核图标/地点备份_2@2x</title>
+    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="考核巡检0811" transform="translate(-259.000000, -1351.000000)" fill="#A69E9F" fill-rule="nonzero">
+            <g id="考核图标/地点备份-2" transform="translate(251.000000, 1343.000000)">
+                <g id="形状结合" transform="translate(8.000217, 8.000000)">
+                    <path d="M8,0 C12.418278,0 16,3.581722 16,8 C16,12.418278 12.418278,16 8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 Z M8,1.25 C4.27207794,1.25 1.25,4.27207794 1.25,8 C1.25,11.7279221 4.27207794,14.75 8,14.75 C11.7279221,14.75 14.75,11.7279221 14.75,8 C14.75,4.27207794 11.7279221,1.25 8,1.25 Z M7.5,4 L8.75,4 L8.75,7.5 L12,7.5 L12,8.75 L7.5,8.75 L7.5,4 Z"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

static/images/newExamine/userIcon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>考核图标/地点备份@2x</title>
+    <g id="页面-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="考核巡检0811" transform="translate(-227.000000, -1351.000000)" fill="#A69E9F" fill-rule="nonzero">
+            <g id="考核图标/地点备份" transform="translate(219.000000, 1335.000000)">
+                <g id="形状结合" transform="translate(8.000217, 16.000000)">
+                    <path d="M8,0 C12.418278,0 16,3.581722 16,8 C16,12.418278 12.418278,16 8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 Z M8,11.25 C6.28403874,11.25 4.74363766,12.0016625 3.6900947,13.1936897 C4.85915962,14.1661233 6.36139396,14.75 8,14.75 C9.63860604,14.75 11.1408404,14.1661233 12.3100025,13.1950706 C11.256618,12.0017873 9.71610365,11.25 8,11.25 Z M8,1.25 C4.27207794,1.25 1.25,4.27207794 1.25,8 C1.25,9.63860604 1.83387666,11.1408404 2.80492943,12.3100025 C4.08560898,10.8909096 5.93876295,10 8,10 C10.0613311,10 11.9145601,10.8909908 13.1955736,12.3088591 C14.1661233,11.1408404 14.75,9.63860604 14.75,8 C14.75,4.27207794 11.7279221,1.25 8,1.25 Z M8,3 C9.65685425,3 11,4.34314575 11,6 C11,7.65685425 9.65685425,9 8,9 C6.34314575,9 5,7.65685425 5,6 C5,4.34314575 6.34314575,3 8,3 Z M8,4.25 C7.03350169,4.25 6.25,5.03350169 6.25,6 C6.25,6.96649831 7.03350169,7.75 8,7.75 C8.96649831,7.75 9.75,6.96649831 9.75,6 C9.75,5.03350169 8.96649831,4.25 8,4.25 Z"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>