Merge branch 'develop'

src/components/drawers/EvList.vue

@@ -1,20 +1,11 @@
 <template>
-  <a-drawer
+	<a-drawer :visible="EvalListVisible" class="drawerStyle addonlineDrawer" width="80%" title="选择测评" placement="right"
-    :visible="EvalListVisible"
+		@after-visible-change="afterVisibleChange">
-    class="drawerStyle addonlineDrawer"
-    width="80%"
-    title="选择测评"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
 		<div class="drawerMain">
 			<div class="header">
 				<div class="headerTitle">选择测评</div>
-        <img
+				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          style="width: 29px; height: 29px; cursor: pointer"
+					@click="closeDrawer" />
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
 			</div>
 			<div class="contentMain">
 				<div class="main_items">
@@ -22,11 +13,8 @@
 						<div class="mii_ipt">
 							<div class="ipt_name"></div>
 							<div class="fi_input">
-                <a-input
+								<a-input v-model:value="inputV1" style="width: 424px; height: 40px; border-radius: 8px"
-                  v-model:value="inputV1"
+									placeholder="请输入项目名称" />
-                  style="width: 424px; height: 40px; border-radius: 8px"
-                  placeholder="请输入项目名称"
-                />
 							</div>
 						</div>
 					</div>
@@ -42,31 +30,17 @@
 					</div>
 				</div>
 				<div class="main_table">
-          <a-table
+					<a-table style="border: 1px solid #f2f6fe" :columns="columns" :data-source="tableData"
-            style="border: 1px solid #f2f6fe"
+						:loading="tableDataTotal === -1 ? true : false" :pagination="false" :row-selection="{
-            :columns="columns"
-            :data-source="tableData"
-            :loading="tableDataTotal === -1 ? true : false"
-            :pagination="false"
-            :row-selection="{
 	type: 'radio',
 	selectedRowKeys: selectedRowKeys,
 	onChange: onSelectChange,
-            }"
+}" />
-          />
 					<div class="tableBox" style="margin-top: 85px">
 						<div class="pa">
-              <a-pagination
+							<a-pagination v-if="tableDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
-                v-if="tableDataTotal > 10"
+								hideOnSinglePage="true" :pageSize="pageSize" :current="currentPage" :total="tableDataTotal"
-                :showSizeChanger="false"
+								class="pagination" @change="changePagination" />
-                showQuickJumper="true"
-                hideOnSinglePage="true"
-                :pageSize="pageSize"
-                :current="currentPage"
-                :total="tableDataTotal"
-                class="pagination"
-                @change="changePagination"
-              />
 						</div>
 					</div>
 				</div>
@@ -196,9 +170,9 @@ export default {
 						quiz_code: value.quiz_code,
 						quiz_kid: value.quiz_kid,
 						title: value.title,
-            theme_desc: value.theme_desc,
+						theme_desc: value.notes,
 						quiz_price: value.quiz_price,
-            quiz_range: value.quiz_range,
+						quiz_range: value.limit_number,
 						quiz_type: value.quiz_type,
 					};
 					array.push(obj);
@@ -216,9 +190,9 @@ export default {
 						quiz_code: value.quiz_code,
 						quiz_kid: value.quiz_kid,
 						title: value.title,
-            theme_desc: value.theme_desc,
+						theme_desc: value.notes,
 						quiz_price: value.quiz_price,
-            quiz_range: value.quiz_range,
+						quiz_range: value.limit_number,
 						quiz_type: value.quiz_type,
 					};
 					array.push(obj);
@@ -236,7 +210,7 @@ export default {
 				.choiceEvaluation(objael)
 				.then((res) => {
 					state.tableDataTotal = 9;
-          // console.log("测评列表", res.data.data);
+					console.log("测评列表", res.data.data);
 					getTableDataList(res.data.data);
 				})
 				.catch(() => { });
@@ -275,6 +249,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
 	background-color: #fafafa !important;
 }
+
 .addonlineDrawer {
 	.drawerMain {
 		.header {
@@ -284,6 +259,7 @@ export default {
 			justify-content: space-between;
 			align-items: center;
 			flex-shrink: 0;
+
 			.headerTitle {
 				font-size: 18px;
 				font-weight: 600;
@@ -292,29 +268,36 @@ export default {
 				margin-left: 24px;
 			}
 		}
+
 		.contentMain {
 			padding-right: 12px;
+
 			.main_items {
 				display: flex;
 
 				margin-bottom: 12px;
 				flex-wrap: wrap;
+
 				.mi_ipts {
 					display: flex;
 					margin-bottom: 20px;
+
 					.mii_ipt {
 						display: flex;
 						align-items: center;
 						margin-right: 24px;
+
 						.ipt_name {
 							white-space: nowrap;
 						}
 					}
 				}
+
 				.mi_btns {
 					display: flex;
 
 					cursor: pointer;
+
 					.btn {
 						padding: 0px 26px 0px 26px;
 						height: 38px;
@@ -325,9 +308,11 @@ export default {
 						justify-content: center;
 						margin-left: 14px;
 						flex-shrink: 0;
+
 						.search {
 							background-size: 100%;
 						}
+
 						.btnText {
 							font-size: 14px;
 							font-weight: 400;
@@ -335,48 +320,61 @@ export default {
 							margin-left: 5px;
 						}
 					}
+
 					.btn1 {
 						background: rgb(64, 158, 255);
+
 						.search {
 							width: 15px;
 							height: 17px;
 							background-image: url("@/assets/images/coursewareManage/search0.png");
 						}
+
 						.btnText {
 							color: rgb(255, 255, 255);
 						}
 					}
+
 					.btn2 {
 						background: rgb(255, 255, 255);
+
 						.search {
 							width: 15px;
 							height: 17px;
 							background-image: url("@/assets/images/coursewareManage/reset1.png");
 						}
+
 						.btnText {
 							color: rgb(64, 158, 255);
 						}
 					}
+
 					.btn1:hover {
 						background: rgb(255, 255, 255);
+
 						.search {
 							background-image: url("@/assets/images/courseManage/search1.png");
 						}
+
 						.btnText {
 							color: #4ea6ff;
 						}
 					}
+
 					.btn2:hover {
 						background: rgba(64, 158, 255, 1);
+
 						.search {
 							background-image: url("@/assets/images/courseManage/reset0.png");
 						}
+
 						.btnText {
 							color: #ffffff;
 						}
 					}
 				}
 			}
+
 			.main_notice {
 				display: flex;
 				justify-content: space-between;
@@ -384,9 +382,11 @@ export default {
 				margin-bottom: 32px;
 				height: 40px;
 				background-color: #e9f6fe;
+
 				.mntc_left {
 					display: flex;
 					align-items: center;
+
 					.notice_icon {
 						width: 14px;
 						height: 14px;
@@ -396,37 +396,43 @@ export default {
 						background-size: 100% 100%;
 					}
 				}
+
 				.mntc_right {
 					cursor: pointer;
 				}
 			}
+
 			.main_table {
 				position: relative;
 				padding-bottom: 80px;
+
 				.classify {
 					margin-left: 10px !important;
 					padding-left: 9px !important;
 				}
+
 				.ant-checkbox-wrapper {
 					align-items: center;
 					margin-top: -2px;
 				}
+
 				.ant-table-selection-column {
 					padding: 0px !important;
 					padding-left: 5px !important;
 				}
+
 				.ant-table-thead>tr>th {
 					background-color: rgba(239, 244, 252, 1);
 				}
+
 				th.h {
 					background-color: #eff4fc !important;
 				}
 
-        .ant-table-tbody
+				.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
 					background: #f6f9fd;
 				}
+
 				.pa {
 					left: 0;
 					width: 100%;
@@ -447,6 +453,7 @@ export default {
 			align-items: center;
 			justify-content: center;
 			box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
 			.btn1 {
 				width: 100px;
 				height: 40px;
@@ -456,6 +463,7 @@ export default {
 				background-color: #fff;
 				cursor: pointer;
 			}
+
 			.btn2 {
 				cursor: pointer;
 				width: 100px;