USER-20230908AJ\Administrator 1 rok pred
rodič
commit
d9ac4aaddc

+ 1 - 1
common/chart/circle_chart.vue

@@ -111,7 +111,7 @@ export default {
         let res = {
           series: [
             {
-              // color: this.bgColor,
+              color: this.bgColor,
               data: data
             }
           ]

+ 5 - 7
pages/statistics/module/stat_industry.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="row industry-box m-l30">
 				<view class="row-c p-tb10 industry-item" v-if="index<=5" v-for="(item,index) in industryList.titles" :key="index">
-					<view class="wh-14 m-r10" :class="'industry-icon+'+index"></view>
+					<view class="wh-14 m-r10" :class="'industry-icon-'+index"></view>
 					<text class="size-24 text-color-576">{{item}}</text>
 				</view>
 			</view>
@@ -65,13 +65,11 @@
 			onChange(e) {
 				this.current = e
 			},
-      methods: {
-        setData(data){
-          console.log(data)
+      setData(data){
+        console.log(data)
 
-          this.$refs.circleChart.setServerData(data)
-        }
-      },
+        this.$refs.circleChart.setServerData(data)
+      }
 		}
 	}
 </script>

+ 19 - 11
pages/statistics/module/stat_situation.vue

@@ -34,15 +34,19 @@
 			</view>
 			<en-blank v-if="businessList.length<=0"></en-blank>
 		</view>
-		<view class="finance_item sys-from-background-color m-b16 r-20 p-30 row-justify-sb center"
-			v-for="(item,index) in 5" :key="index" v-else>
-			<text class="size-28 text-color-12">郭野</text>
-			<text class="size-28 text-color-E21 sys-weight-600 m-r10">200万</text>
-			<view class="size-24">
-				<text class="text-color-000">2024/12/23</text>
-				<text class="text-color-666">用款</text>
-			</view>
-		</view>
+    <view v-else>
+      <view class="finance_item sys-from-background-color m-b16 r-20 p-30 row-justify-sb center"
+            v-for="(item,index) in useList" :key="index" >
+        <text class="size-28 text-color-12">{{item.name}}</text>
+        <text class="size-28 text-color-E21 sys-weight-600 m-r10">{{item.total_money}}万</text>
+        <view class="size-24">
+          <text class="text-color-000">{{item.use_date}}</text>
+          <text class="text-color-666">用款</text>
+        </view>
+      </view>
+      <en-blank v-if="useList.length<=0"></en-blank>
+    </view>
+
 	</view>
 </template>
 
@@ -129,8 +133,12 @@
 			getUseList() {
 				this.dateTypeObj.page = 1
 				getUseList(this.dateTypeObj).then((res) => {
-					this.useNum = res.data.totalNum
-					this.useNum = res.data.items
+          if(res.code===1){
+            this.useNum = res.data.totalNum
+            this.useList = res.data.items
+          }
+
+
 				})
 			},