Merge branch 'xxh-dev' of http://8.140.26.4:10003/caijian/risk-monitor into xxh-dev

src/views/innovationSubject/index.vue

@@ -352,12 +352,12 @@
 									/>
 								</el-select>
 							</div>
-<<<<<<< HEAD
+<<<<<<<<< Temporary merge branch 1
+						</div>
+=========
 							
 						</div>				
-=======
-						</div>
->>>>>>> 4f47da48f8ee58e01b335745bbdfd7049def9496
+>>>>>>>>> Temporary merge branch 2
 					</div>
 					<div class="center-footer-layout">
 						<div class="content-header">
@@ -366,7 +366,9 @@
 							</div>
 							<div class="title">{{ "研究领域布局情况" }}</div>
 						</div>
-<<<<<<< HEAD
+<<<<<<<<< Temporary merge branch 1
+						<div class="center-footer-layout-content"></div>
+=========
 						<div class="center-footer-layout-content">
 							<div class="center-footer-layout-content-item">
 								<EChart :option="pieOption" autoresize :style="{ height: '370px',width:'750px' }" />
@@ -386,9 +388,7 @@
 								</div>
 							</div>
 						</div>
-=======
-						<div class="center-footer-layout-content"></div>
->>>>>>> 4f47da48f8ee58e01b335745bbdfd7049def9496
+>>>>>>>>> Temporary merge branch 2
 					</div>
 				</div>
 			</div>
@@ -413,13 +413,13 @@
 					</div>
 				</div>
 				<div class="home-main-footer-main">
-<<<<<<< HEAD
-					<div class="footer-main-item" v-for="item in universityList" :key="item.name" @click="handleClickToDetail">
-						<img :src="item.pic" style="height: 32px; width: 32px;" />
-=======
+<<<<<<<<< Temporary merge branch 1
 					<div class="footer-main-item" v-for="item in universityList" :key="item.name">
 						<img :src="item.pic" style="height: 32px; width: 32px" />
->>>>>>> 4f47da48f8ee58e01b335745bbdfd7049def9496
+=========
+					<div class="footer-main-item" v-for="item in universityList" :key="item.name" @click="handleClickToDetail">
+						<img :src="item.pic" style="height: 32px; width: 32px;" />
+>>>>>>>>> Temporary merge branch 2
 						<div class="item-text">{{ item.name }}</div>
 						<div class="item-text2">{{ item.adder }}</div>
 						<div class="item-text2">{{ item.area }}</div>
@@ -908,11 +908,11 @@ onMounted(async () => {
 	let chart1 = getPieChart(chart1Data.value, colorList);
 	setChart(chart1, "chart1");
 
-<<<<<<< HEAD
-=======
+<<<<<<<<< Temporary merge branch 1
 	let chart2 = getPieChart(chart2Data.value, colorList);
 	setChart(chart2, "chart2");
->>>>>>> 4f47da48f8ee58e01b335745bbdfd7049def9496
+=========
+>>>>>>>>> Temporary merge branch 2
 });
 </script>
 
@@ -1935,13 +1935,13 @@ onMounted(async () => {
 				.center-footer-layout-content {
 					display: flex;
 					flex-direction: row;
-<<<<<<< HEAD
+<<<<<<<<< Temporary merge branch 1
+					.center-footer-layout-content-item {
+=========
 					.center-footer-layout-content-item{
 						height: 480px;
 						width: 800px;
-=======
-					.center-footer-layout-content-item {
->>>>>>> 4f47da48f8ee58e01b335745bbdfd7049def9496
+>>>>>>>>> Temporary merge branch 2
 						display: flex;
 						flex-direction: column;
 						margin-left: 24px;
@@ -2050,12 +2050,12 @@ onMounted(async () => {
 					padding: 16px;
 					display: flex;
 					flex-direction: column;
-<<<<<<< HEAD
+<<<<<<<<< Temporary merge branch 1
+					.item-text {
+=========
 					cursor: pointer;
 					.item-text{
-=======
-					.item-text {
->>>>>>> 4f47da48f8ee58e01b335745bbdfd7049def9496
+>>>>>>>>> Temporary merge branch 2
 						color: rgba(59, 65, 75, 1);
 						font-family: Microsoft YaHei;
 						font-size: 18px;