Commit 845cad7c6790723350095e36223cf94fd57eeea4

Authored by liufangjia
2 parents d43ab806 b79b1091

Merge branch 'ezTeach-2.0.0.0.release' of http://120.78.57.84/baoman/Ezquiz_Plat…

…form into ezTeach-2.0.0.0.release
src/utils/index.js
@@ -885,7 +885,7 @@ export function formatGradeNameClass(data) { @@ -885,7 +885,7 @@ export function formatGradeNameClass(data) {
885 885
886 ///试卷定制化打印 886 ///试卷定制化打印
887 export async function paperPrint(paper) { 887 export async function paperPrint(paper) {
888 - let printWin = window.open("", "_blank", "width=800,height=600,resizable=no"); 888 + let printWin = window.open("", "_blank", "");
889 var browser = getBrowserEngine(printWin); 889 var browser = getBrowserEngine(printWin);
890 var subjectName = paper.subjectName; 890 var subjectName = paper.subjectName;
891 var paperTitle = paper.title; 891 var paperTitle = paper.title;
@@ -1224,7 +1224,7 @@ export function tablePrint(options) { @@ -1224,7 +1224,7 @@ export function tablePrint(options) {
1224 var diffNumber = options.diffNumber ?? 0; 1224 var diffNumber = options.diffNumber ?? 0;
1225 var diffStNumber = options.diffStNumber ?? 0; 1225 var diffStNumber = options.diffStNumber ?? 0;
1226 let divs = document.getElementById(id); 1226 let divs = document.getElementById(id);
1227 - let awin = window.open("中天易教", "_blank", "width=800,height=600,resizable=no"); 1227 + let awin = window.open("中天易教", "_blank", "");
1228 awin.document.getElementsByTagName( 1228 awin.document.getElementsByTagName(
1229 "head" 1229 "head"
1230 )[0].innerHTML = `<style> 1230 )[0].innerHTML = `<style>
src/views/basic/askTestQuestion/update.vue
@@ -128,14 +128,14 @@ @@ -128,14 +128,14 @@
128 <div class="qs-oprations" v-if="!isViewer"> 128 <div class="qs-oprations" v-if="!isViewer">
129 <div class="qs-set"> 129 <div class="qs-set">
130 <el-button class="icon-tickets" type="text" 130 <el-button class="icon-tickets" type="text"
131 - @click="openStem(subQuestion, 1, index, subIndex)">修改题干</el-button> 131 + @click="openStem(subQuestion, 1, index, subIndex)">题干</el-button>
132 </div> 132 </div>
133 <div class="qs-set"> 133 <div class="qs-set">
134 <el-button class="icon-tickets" type="text" 134 <el-button class="icon-tickets" type="text"
135 - @click="openStem(subQuestion, 2, index, subIndex)">修改解析</el-button> 135 + @click="openStem(subQuestion, 2, index, subIndex)">解析</el-button>
136 </div> 136 </div>
137 <div class="qs-set"> 137 <div class="qs-set">
138 - <el-button type="text" @click="openKnowledge(subQuestion, index, subIndex)">修改知识点</el-button> 138 + <el-button type="text" @click="openKnowledge(subQuestion, index, subIndex)">知识点</el-button>
139 </div> 139 </div>
140 <div class="qs-set"> 140 <div class="qs-set">
141 <el-popconfirm @confirm="_deleteDetermineQ(subIndex, index)" title="这是一小题确定删除吗?"> 141 <el-popconfirm @confirm="_deleteDetermineQ(subIndex, index)" title="这是一小题确定删除吗?">
@@ -200,14 +200,14 @@ @@ -200,14 +200,14 @@
200 <div class="qs-oprations"> 200 <div class="qs-oprations">
201 <div class="qs-set"> 201 <div class="qs-set">
202 <el-button class="icon-tickets" type="text" 202 <el-button class="icon-tickets" type="text"
203 - @click="openStem(question, 1, index, 0)">修改题干</el-button> 203 + @click="openStem(question, 1, index, 0)">题干</el-button>
204 </div> 204 </div>
205 <div class="qs-set"> 205 <div class="qs-set">
206 <el-button class="icon-tickets" type="text" 206 <el-button class="icon-tickets" type="text"
207 - @click="openStem(question, 2, index, 0)">修改解析</el-button> 207 + @click="openStem(question, 2, index, 0)">解析</el-button>
208 </div> 208 </div>
209 <div class="qs-set"> 209 <div class="qs-set">
210 - <el-button type="text" @click="openKnowledge(question, index, 0)">修改知识点</el-button> 210 + <el-button type="text" @click="openKnowledge(question, index, 0)">知识点</el-button>
211 </div> 211 </div>
212 <div class="qs-set"> 212 <div class="qs-set">
213 <el-popconfirm @confirm="_deleteDetermineQ(0, index)" title="这是一小题确定删除吗?"> 213 <el-popconfirm @confirm="_deleteDetermineQ(0, index)" title="这是一小题确定删除吗?">
@@ -1335,6 +1335,7 @@ export default { @@ -1335,6 +1335,7 @@ export default {
1335 margin-top: 10px; 1335 margin-top: 10px;
1336 height: 80px; 1336 height: 80px;
1337 border-radius: 5px; 1337 border-radius: 5px;
  1338 + padding: 5px 0px;
1338 } 1339 }
1339 1340
1340 .sub-questions { 1341 .sub-questions {
@@ -1362,7 +1363,7 @@ export default { @@ -1362,7 +1363,7 @@ export default {
1362 } 1363 }
1363 1364
1364 .qs-stem { 1365 .qs-stem {
1365 - width: 180px; 1366 + width: 400px;
1366 } 1367 }
1367 1368
1368 .qs-type { 1369 .qs-type {
@@ -1385,7 +1386,7 @@ export default { @@ -1385,7 +1386,7 @@ export default {
1385 } 1386 }
1386 1387
1387 .qs-oprations { 1388 .qs-oprations {
1388 - width: 320px; 1389 + width: 160px;
1389 } 1390 }
1390 1391
1391 .qs-options { 1392 .qs-options {