From cc7bbbd9b6a859235c9985cc09836effc1157fe8 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期五, 07 六月 2024 10:51:38 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/lifeCare/view/chapter005.vue | 99 +++++++++++++++++++------------------------------
1 files changed, 39 insertions(+), 60 deletions(-)
diff --git a/src/books/lifeCare/view/chapter005.vue b/src/books/lifeCare/view/chapter005.vue
index 1988aab..5361ced 100644
--- a/src/books/lifeCare/view/chapter005.vue
+++ b/src/books/lifeCare/view/chapter005.vue
@@ -627,10 +627,7 @@
<tr>
<th
:style="{
- width:
- index == 1 || index == chapter005.groupData.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter005.publicHeader"
:key="index"
@@ -1156,11 +1153,7 @@
<tr>
<th
:style="{
- width:
- index == 1 ||
- index == chapter005.scoreData1.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter005.publicHeader"
:key="index"
@@ -1392,11 +1385,11 @@
<p>椁愬墠鏁欒偛鐨勬敞鎰忎簨椤规槸浠�涔堬紵</p>
<div class="bk-tx">
<textarea
- v-model="chapter005.textAreaItem.text28"
+ v-model="chapter005.textAreaItem.text228"
style="border: 0"
placeholder="璇疯緭鍏ュ唴瀹�"
rows="5"
- @blur="onBlurChange('text28')"
+ @blur="onBlurChange('text228')"
></textarea>
</div>
<h3 id="c017">
@@ -1666,11 +1659,7 @@
<tr>
<th
:style="{
- width:
- index == 1 ||
- index == chapter005.scoreData2.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter005.publicHeader"
:key="index"
@@ -1838,11 +1827,7 @@
<tr>
<th
:style="{
- width:
- index == 1 ||
- index == chapter005.scoreData3.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter005.publicHeader"
:key="index"
@@ -2171,11 +2156,7 @@
<tr>
<th
:style="{
- width:
- index == 1 ||
- index == chapter005.scoreData4.length - 1
- ? '100px'
- : '',
+ width: index == 3 ? '300px' : '50px',
}"
v-for="(header, index) in chapter005.publicHeader"
:key="index"
@@ -2604,7 +2585,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text1"
@blur="changeThVal($event, 'text1')"
/>
@@ -2613,7 +2594,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text2"
@blur="changeThVal($event, 'text2')"
/>
@@ -2622,7 +2603,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text3"
@blur="changeThVal($event, 'text3')"
/>
@@ -2631,7 +2612,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text4"
@blur="changeThVal($event, 'text4')"
/>
@@ -2642,7 +2623,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text5"
@blur="changeThVal($event, 'text5')"
/>
@@ -2651,7 +2632,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text6"
@blur="changeThVal($event, 'text6')"
/>
@@ -2660,7 +2641,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text7"
@blur="changeThVal($event, 'text7')"
/>
@@ -2669,7 +2650,7 @@
<td>
<textarea
rows="2"
- style="min-width: 80px;max-width:80px;font-size: 14px"
+ style="min-width: 80px; max-width: 80px; font-size: 14px"
v-model="chapter005.textTh.text8"
@blur="changeThVal($event, 'text8')"
/>
@@ -2724,7 +2705,7 @@
</tbody>
</table>
</div>
- <p><br/></p>
+ <p><br /></p>
<h3 id="c020">
<span class="bk-h3"
><span class="bj1-h3">鍏�</span>銆�銆�椁愬悗淇濊偛銆�</span
@@ -3102,7 +3083,7 @@
</div>
</template>
<script>
-import getResourcePath from "@/assets/methods/resources.js";
+import { getResourcePath } from "@/assets/methods/resources.js";
import examinations from "@/components/examinations/index.vue";
import { getFileMd5, getPublicImage } from "../js/tool.js";
import drawflow from "@/components/drawflow";
@@ -3116,6 +3097,10 @@
},
questionData: {
type: Object,
+ },
+ isSearch: {
+ type: Boolean,
+ default: false,
},
},
data() {
@@ -3555,30 +3540,24 @@
drawflow,
},
async created() {
- const localData = JSON.parse(localStorage.getItem("chapter005"));
- if (localData) {
- this.chapter005 = { ...Object.assign(this.chapter005, localData) };
+ if (!this.isSearch) {
+ const localData = JSON.parse(localStorage.getItem("chapter005"));
+ if (localData) {
+ this.chapter005 = { ...Object.assign(this.chapter005, localData) };
+ }
+ this.chapter005.videOneUrl = await getResourcePath(
+ "439b0bde62a5098875c77e2492676577"
+ );
+ this.chapter005.videoTwoUrl = await getResourcePath(
+ "1a878261410b01ee8e4e0602a1fe935f"
+ );
+ this.chapter005.videoFourUrl = await getResourcePath(
+ "6cf2619beb704b3d79de04f0775c8ba3"
+ );
+ this.chapter005.videoFiveUrl = await getResourcePath(
+ "8400384441ad9236d5eab24f500ec2c7"
+ );
}
- this.chapter005.videOneUrl = await getResourcePath(
- "439b0bde62a5098875c77e2492676577"
- );
- this.chapter005.videoTwoUrl = await getResourcePath(
- "1a878261410b01ee8e4e0602a1fe935f"
- );
- this.chapter005.videoFourUrl = await getResourcePath(
- "6cf2619beb704b3d79de04f0775c8ba3"
- );
- this.chapter005.videoFiveUrl = await getResourcePath(
- "8400384441ad9236d5eab24f500ec2c7"
- );
- // this.chapter005.videOneUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=439b0bde62a5098875c77e2492676577";
- // this.chapter005.videoTwoUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=1a878261410b01ee8e4e0602a1fe935f";
- // this.chapter005.videoFourUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=6cf2619beb704b3d79de04f0775c8ba3";
- // this.chapter005.videoFiveUrl =
- // "https://jsek.bnuic.com/file/api/ApiDownload?md5=8400384441ad9236d5eab24f500ec2c7";
},
methods: {
activityOne() {
@@ -3749,7 +3728,7 @@
if (type == "3") {
that.chapter005.pictrueListThree.push(getPublicImage(e));
}
- that.$emit('Upload_initViewer',"")
+ that.$emit("Upload_initViewer", "");
localStorage.setItem("chapter005", JSON.stringify(that.chapter005));
}, 1000);
})
--
Gitblit v1.9.1