Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-it-html into deploy

lilei 4 years ago
parent
commit
dc14080934

+ 2 - 1
src/views/appSetting/addEditionSetting.vue

@@ -168,7 +168,8 @@ export default {
         downloadUrl: '',
         forceUpgrade: '0',
         upgradeContent: '',
-        attachment: ''
+        attachment: '',
+
       },
       applyName: 'IT后台',
       applyCode: 'atit',

+ 3 - 4
src/views/evaluation/evaluationPlan/SetEvaModal.vue

@@ -22,6 +22,7 @@
               <a-table
                 ref="table"
                 size="default"
+                :scroll="{y:500}"
                 :pagination="false"
                 :rowKey="(record) => record.id"
                 :columns="columns"
@@ -78,6 +79,7 @@
               <s-table
                 ref="tableItem"
                 size="default"
+                :scroll="{y:500}"
                 :showPagination="false"
                 :row-selection="rowSelection"
                 :rowKey="(record) => record.id"
@@ -368,10 +370,7 @@ export default {
 		color: black;
 		padding-bottom: 30px;
 	}
-	.card-content {
-		max-height: 650px;
-		overflow-y: scroll;
-	}
+
 	.actionBtn {
 		font-size: 12px;
 		margin: 0 5px;