daping quan

@@ -60,7 +60,7 @@ const nowDate = ref(`${year}-${formatMonth(month)}`)
 let selectBase = ref()
 let selectBase = ref()
 let baseList = ref()
 let baseList = ref()
 let isLeader = ref(false)
 let isLeader = ref(false)
-// url.value = 'http://192.168.1.152:8899/login/sid=f30d94a0-70cc-4d7b-b28c-b85622422a35#/'
+// url.value = 'http://192.168.1.152:8899/login/sid=a659e865-486c-434f-8707-add6bfa2276d#/'
 url.value = window.location.href
 url.value = window.location.href
 result.value = url.value?.split('=')[1]?.split('#')[0];
 result.value = url.value?.split('=')[1]?.split('#')[0];
 
 

@@ -4,7 +4,7 @@
       <div>
       <div>
         <div class="title">收入对比</div>
         <div class="title">收入对比</div>
         <div class="po_right">
         <div class="po_right">
-          <div class="itemBox">
+          <div class="itemBox" v-if="myType">
             <el-select
             <el-select
                 v-model="type2"
                 v-model="type2"
                 class="select"
                 class="select"
@@ -59,13 +59,14 @@
               <el-option :label="`${Year2}年`" value="2"/>
               <el-option :label="`${Year2}年`" value="2"/>
             </el-select>
             </el-select>
           </div>
           </div>
-          <div class="itemBox">
+          <div class="itemBox" v-if="myType">
             <el-select
             <el-select
               v-model="type3"
               v-model="type3"
               class="select"
               class="select"
               placeholder="全部基地"
               placeholder="全部基地"
               size="small"
               size="small"
-              @change="handelSelect3">
+              @change="handelSelect3"
+            >
               <el-option label="全部" value="0"/>
               <el-option label="全部" value="0"/>
               <el-option v-for="val in list" :key="val.BASEJC" :label="val.BASEJC" :value="val.BASEJC"/>
               <el-option v-for="val in list" :key="val.BASEJC" :label="val.BASEJC" :value="val.BASEJC"/>
             </el-select>
             </el-select>
@@ -86,6 +87,10 @@ import {getYS006} from '@/api/server.js'
 import {dayjs} from 'element-plus'
 import {dayjs} from 'element-plus'
 
 
 const props = defineProps({
 const props = defineProps({
+  type: {
+    type: Boolean,
+    default: false
+  },
   url: {
   url: {
     type: String,
     type: String,
     default: undefined
     default: undefined
@@ -109,6 +114,7 @@ const url = computed(() => props.url)
 const obj = computed(() => props.obj)
 const obj = computed(() => props.obj)
 const hDate = computed(() => props.historyDate)
 const hDate = computed(() => props.historyDate)
 const sBase = computed(() => props.sBase)
 const sBase = computed(() => props.sBase)
+const myType = computed(() => props.type)
 watch(() => props.historyDate,(newVal) => {
 watch(() => props.historyDate,(newVal) => {
   if (isMounted.value) {
   if (isMounted.value) {
     Year1.value = parseInt(newVal.substring(0,4)) - 1
     Year1.value = parseInt(newVal.substring(0,4)) - 1
@@ -327,7 +333,7 @@ function handelSelect3() {
   h4.value = [...new Array(12).fill(0)] // 初始化 12 个月，默认值 0
   h4.value = [...new Array(12).fill(0)] // 初始化 12 个月，默认值 0
   h5.value = [...new Array(12).fill(0)] // 初始化 12 个月，默认值 0
   h5.value = [...new Array(12).fill(0)] // 初始化 12 个月，默认值 0
   h6.value = [...new Array(12).fill({value: 0, info: ''})] // 初始化 12 个月，默认值 0
   h6.value = [...new Array(12).fill({value: 0, info: ''})] // 初始化 12 个月，默认值 0
-  
+
   if (type3.value == '0') {
   if (type3.value == '0') {
     //   h1.value.push(val.YSDSK)//应待收款
     //   h1.value.push(val.YSDSK)//应待收款
     //   h2.value.push(val.SFDDQ)//收费单待签
     //   h2.value.push(val.SFDDQ)//收费单待签
@@ -342,11 +348,11 @@ function handelSelect3() {
         obj.info += monthData.YSWELLINFO;
         obj.info += monthData.YSWELLINFO;
         h3.value[i] = {...obj}
         h3.value[i] = {...obj}
         
         
-        h4.value[i] += v2.JNYSDSK / 10000 || 0
-        h5.value[i] += v2.JNSFDDQ / 10000 || 0
+        h4.value[i] += monthData.JNYSDSK / 10000 || 0
+        h5.value[i] += monthData.JNSFDDQ / 10000 || 0
         let obj2 = {...h6.value[i]}
         let obj2 = {...h6.value[i]}
-        obj2.value += v2.JNHTDQ / 10000 || 0;
-        obj2.info += v2.JNYSWELLINFO;
+        obj2.value += monthData.JNHTDQ / 10000 || 0;
+        obj2.info += monthData.JNYSWELLINFO;
         h6.value[i] = {...obj2}
         h6.value[i] = {...obj2}
       }
       }
     }
     }
@@ -361,6 +367,7 @@ function handelSelect3() {
     h6.value = []
     h6.value = []
     let obj = list.value.find(item => item.BASEJC === type3.value)
     let obj = list.value.find(item => item.BASEJC === type3.value)
     for (const val of obj.list) {
     for (const val of obj.list) {
+      const i = val.MONTH - 1; // 转为 0~11 的索引
       h1.value.push(val.YSDSK / 10000 || 0)//应待收款
       h1.value.push(val.YSDSK / 10000 || 0)//应待收款
       h2.value.push(val.SFDDQ / 10000 || 0)//收费单待签
       h2.value.push(val.SFDDQ / 10000 || 0)//收费单待签
       h3.value.push({
       h3.value.push({
@@ -371,10 +378,9 @@ function handelSelect3() {
       h4.value.push(val.JNYSDSK / 10000 || 0)//应待收款
       h4.value.push(val.JNYSDSK / 10000 || 0)//应待收款
       h5.value.push(val.JNSFDDQ / 10000 || 0)//收费单待签
       h5.value.push(val.JNSFDDQ / 10000 || 0)//收费单待签
       let obj2 = {...h6.value[i]}
       let obj2 = {...h6.value[i]}
-      obj2.value += v2.JNHTDQ / 10000 || 0;
-      obj2.info += v2.JNYSWELLINFO;
+      obj2.value += val.JNHTDQ / 10000 || 0;
+      obj2.info += val.JNYSWELLINFO;
       h6.value[i] = {...obj2}
       h6.value[i] = {...obj2}
-      
     }
     }
   }
   }
   setC(
   setC(
@@ -1191,7 +1197,7 @@ onUnmounted(() => {
     z-index: 1;
     z-index: 1;
     width: 60%;
     width: 60%;
     display: flex;
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-end;
     
     
     :deep(.el-radio-button) {
     :deep(.el-radio-button) {
       --el-radio-button-checked-bg-color: linear-gradient(0deg, #2C67B7, #40A5F4);
       --el-radio-button-checked-bg-color: linear-gradient(0deg, #2C67B7, #40A5F4);
@@ -1218,6 +1224,7 @@ onUnmounted(() => {
     box-shadow: 0 0 24px 0 rgba(130, 220, 255, 0.5), 0 0 16px 0 rgba(130, 220, 255, 0.27);
     box-shadow: 0 0 24px 0 rgba(130, 220, 255, 0.5), 0 0 16px 0 rgba(130, 220, 255, 0.27);
     border-radius: 5px;
     border-radius: 5px;
     border: 1px solid #12BFFF;
     border: 1px solid #12BFFF;
+    margin-left: 10px;
     
     
     .select {
     .select {
       background-color: transparent;
       background-color: transparent;