Merge branch 'qin_v1'

src/views/dashboard/components/sanlianping.vue

@@ -445,17 +445,21 @@ const dxOrgGaibian = (id: any) => {
                 </div>
                 <el-row class="kpi-box" :gutter="10">
                     <el-col :span="8">
-                        <el-date-picker v-model="dingXingYear" type="year" placeholder="请选择时间" style="width:100%" />
+                        <el-date-picker v-model="dingLiangDaChengYear" type="year" placeholder="请选择时间"
+                            style="width:100%" />
                     </el-col>
                     <el-col :span="8">
-                        <el-select v-model="dingXingOrg" placeholder="" style="width:100%" @change="dxOrgGaibian">
+                        <el-select v-model="dingLiangDaChengOrg" placeholder="" style="width:100%"
-                            <el-option v-for="item in mainOrgList" :key="item.id" :label="item.name" :value="item.id">
+                            @change="dlMuBiaoOrg">
+                            <el-option v-for="item in mainOrgList" :key="item.id" :label="item.name"
+                                :value="item.id">
                             </el-option>
                         </el-select>
                     </el-col>
                     <el-col :span="8">
-                        <el-select v-model="dingXingTarget" placeholder="" style="width:100%" @change="dxTargetGaibian">
+                        <el-select v-model="dingLiangDaChengTarget" placeholder="" style="width:100%"
-                            <el-option v-for="item in targetXingListAry" :key="item.id" :label="item.name"
+                            @change="dlMuBiaoZhiBiao">
+                            <el-option v-for="item in targetListAry" :key="item.id" :label="item.name"
                                 :value="item.id">
                             </el-option>
                         </el-select>
@@ -473,26 +477,23 @@ const dxOrgGaibian = (id: any) => {
                 </div>
 				<el-row class="kpi-box" :gutter="10">
                     <el-col :span="8">
-                        <el-date-picker v-model="dingLiangDaChengYear" type="year" placeholder="请选择时间"
+                        <el-date-picker v-model="dingXingYear" type="year" placeholder="请选择时间" style="width:100%" />
-                            style="width:100%" />
                     </el-col>
                     <el-col :span="8">
-                        <el-select v-model="dingLiangDaChengOrg" placeholder="" style="width:100%"
+                        <el-select v-model="dingXingOrg" placeholder="" style="width:100%" @change="dxOrgGaibian">
-                            @change="dlMuBiaoOrg">
+                            <el-option v-for="item in mainOrgList" :key="item.id" :label="item.name" :value="item.id">
-                            <el-option v-for="item in mainOrgList" :key="item.id" :label="item.name"
-                                :value="item.id">
                             </el-option>
                         </el-select>
                     </el-col>
                     <el-col :span="8">
-                        <el-select v-model="dingLiangDaChengTarget" placeholder="" style="width:100%"
+                        <el-select v-model="dingXingTarget" placeholder="" style="width:100%" @change="dxTargetGaibian">
-                            @change="dlMuBiaoZhiBiao">
+                            <el-option v-for="item in targetXingListAry" :key="item.id" :label="item.name"
-                            <el-option v-for="item in targetListAry" :key="item.id" :label="item.name"
                                 :value="item.id">
                             </el-option>
                         </el-select>
                     </el-col>
                 </el-row>
+                
                 <div ref="dxTargetChart" v-loading="dxTargetLoad" element-loading-text="Loading..."
                     class="allOrgAxisCares"></div>
                 <!-- <div ref="dlTargetThChartMubiao" v-loading="dlhbLoadingMb" element-loading-text="Loading..."
@@ -504,7 +505,7 @@ const dxOrgGaibian = (id: any) => {
             <!--定量指标同比环比-->
             <el-card shadow="always" :body-style="{ padding: '10px' }" style="border-radius: 12px;margin-top: 10px;position: relative;">
                 <div class="orgAllMothsTitle">
-                    <el-text class="titleInfo">定量指标同比环比</el-text>
+                    <el-text class="titleInfo">定量指标同比环比分析</el-text>
                 </div>
                 <el-row class="kpi-box" :gutter="10">
                     <el-col :span="8">