From 09e445694a7360893a17152252f2dc5c1b77b2cf Mon Sep 17 00:00:00 2001 From: zhongshujie <2862698242@qq.com> Date: 星期四, 12 十二月 2024 17:01:39 +0800 Subject: [PATCH] 量表提交保存 --- packageBookService/pages/psychologyAnswer/testdata/index.js | 248 +++++++++++---------------- packageBookService/pages/psychologyAnswer/psychologyAnswer.js | 148 ++++++++++++++-- packageBookService/pages/psychologyAnswer/psychologyAnswer.wxml | 1 packageBookService/pages/psychologyAnswer/questionList/index.js | 4 packageBookService/pages/psychologyAnswer/questionOptions/index.wxss | 9 packageBookService/pages/bookServices/detail/components/testResource/testResource.js | 25 -- packageBookService/pages/psychologyAnswer/questionOptions/index.js | 2 packageBookService/pages/bookServices/detail/index.js | 25 +- packageBookService/pages/psychologyAnswer/questionList/index.wxss | 5 packageBookService/pages/psychologyAnswer/questionOptions/index.wxml | 53 +++-- packageBookService/pages/psychologyAnswer/questionList/index.wxml | 6 11 files changed, 299 insertions(+), 227 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js index d1dfd58..201a8dc 100644 --- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.js +++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.js @@ -67,6 +67,7 @@ }, async goTest(e) { const value = e.detail.value.item; + console.log(value, "value"); const token = wx.getStorageSync("jsek-token"); if (!token) { return wx.getUserProfile({ @@ -103,7 +104,6 @@ size: 999, }, }; - console.log(value.childrenFolderCount, 1234578) if (value.childrenFolderCount == 0) { wx.hideLoading(); return wx.showToast({ @@ -120,29 +120,14 @@ type: item.type, }); }); - console.log(idPathList, 123413456578) } } wx.hideLoading(); - if (value.fromType == "json") { - const questuionList = this.properties.list - var psychologyList = [] - var listIndex = 0 - for (let index = 0; index < questuionList.length; index++) { - const item = questuionList[index]; - if (item.name == "蹇冪悊娴嬭瘎") { - psychologyList = [...item.children] - } - } - for (let cindex = 0; cindex < psychologyList.length; cindex++) { - const citem = psychologyList[cindex]; - if (value.name == citem.name) { - listIndex = cindex - } - } + if (value.refCode == "psychology") { + const listName = value.name wx.navigateTo({ - url: `/packageBookService/pages/psychologyAnswer/psychologyAnswer?listIndex=${ - listIndex + url: `/packageBookService/pages/psychologyAnswer/psychologyAnswer?listName=${ + listName }` }) } else { diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js index 0319a5f..123be36 100644 --- a/packageBookService/pages/bookServices/detail/index.js +++ b/packageBookService/pages/bookServices/detail/index.js @@ -1188,18 +1188,19 @@ loading: false, openTeachids: result, }); - const bookId = that.data.bookId - if (bookId == 6619) { - const jsonData = {} - jsonData.name = "蹇冪悊娴嬭瘎" - jsonData.children = [...pastData.postData.list] - var test = that.data.test; - test.push(jsonData); - that.setData({ - test: test, - }); - console.log(that.data.test, "鏁欏浜掑姩"); - } + //Json璧嬪�� + // const bookId = that.data.bookId + // if (bookId == 6619) { + // const jsonData = {} + // jsonData.name = "蹇冪悊娴嬭瘎" + // jsonData.children = [...pastData.postData.list] + // var test = that.data.test; + // test.push(jsonData); + // that.setData({ + // test: test, + // }); + // console.log(that.data.test, "鏁欏浜掑姩"); + // } } else { that.setData({ diff --git a/packageBookService/pages/psychologyAnswer/psychologyAnswer.js b/packageBookService/pages/psychologyAnswer/psychologyAnswer.js index 1c612c6..ccdacf5 100644 --- a/packageBookService/pages/psychologyAnswer/psychologyAnswer.js +++ b/packageBookService/pages/psychologyAnswer/psychologyAnswer.js @@ -1,8 +1,5 @@ // packageBookService/pages/psychologyAnswer/psychologyAnswer.js import { - getPublicImage -} from "../../../assets/js/middleGround/tool"; -import { loginInfo } from '../../../assets/js/login'; const app = getApp(); @@ -12,6 +9,7 @@ * 椤甸潰鐨勫垵濮嬫暟鎹� */ data: { + questuionName: "", //璇曞嵎鍚嶇О dataList: "", barHeight: "", navBarHeight: "", @@ -31,6 +29,7 @@ sliderValue: 0, // 瀛椾綋婊戝潡 showDialog: false, // 鏈彁浜ら��鍑烘嫤鎴脊绐� showId: '', + uuid: "", isShowDialog: false, // 娴嬭瘯鎶ュ憡寮圭獥鏄惁鏄剧ず }, @@ -38,21 +37,14 @@ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇 */ onLoad(options) { - const indexof = options.listIndex; + const questuionName = options.listName + this.setData({ + questuionName: questuionName + }) const systInfo = wx.getSystemInfoSync(); const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅 const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴� - this.setData({ - dataList: pastData, - questionDataList: pastData.postData.list[indexof].list, - questionDataTitle: pastData.postData.list[indexof].title, - questionDataOptions: pastData.postData.list[indexof].optionList, - scoreDataList: pastData.postData.list[indexof].scoreData - }); - wx.setNavigationBarTitle({ - title: pastData.postData.list[indexof].name, - }) const token = wx.getStorageSync(app.config.tokenKey) if (!token) { loginInfo(app, (data) => { @@ -493,16 +485,57 @@ isRight: item.isRight, }); } + app.MG.identity.setUserKey({ + setKeyRequests: [{ + domain: "answerData", + key: this.data.uuid, + value: JSON.stringify({ + answerData: saveData, + scoreData: this.data.scoreDataList + }), + }, ], + }); this.setData({ loading: false, showDialog: false, }); }, // 鍒濆鍖栧嚱鏁� - async init() { + async init(isReset) { this.setData({ loading: false, }); + const questuionName = this.data.questuionName + const questuionList = pastData.postData.list + var listIndex = 0 + for (let index = 0; index < questuionList.length; index++) { + const item = questuionList[index]; + if (item.name == questuionName) { + listIndex = index + } + } + const indexof = listIndex; + this.setData({ + dataList: pastData, + // questionDataList: pastData.postData.list[indexof].list, + questionDataTitle: pastData.postData.list[indexof].title, + questionDataOptions: pastData.postData.list[indexof].optionList, + // scoreDataList: pastData.postData.list[indexof].scoreData, + uuid: pastData.postData.list[indexof].name + }); + wx.setNavigationBarTitle({ + title: pastData.postData.list[indexof].name, + }) + const list = [...pastData.postData.list[indexof].list] + const scoreList = [...pastData.postData.list[indexof].scoreData] + if (isReset) { + list.forEach(item => item.userAnswer = "") + scoreList.forEach(item => { + item.dispatch = "", + item.score = 0 + }) + } + this.getAnswerInfo(list, scoreList) }, // 鑾峰彇棰樺簱棰樼洰 @@ -510,7 +543,6 @@ // 娓呯┖姝g‘棰樻暟璁板綍 this.setData({ noData: false, - cardList: [], correctNum: 0, }); }, @@ -520,6 +552,7 @@ const questionList = this.data.questionDataList; const optionList = this.data.questionDataOptions; const scoreData = this.data.scoreDataList; + debugger for (let index = 0; index < questionList.length; index++) { const item = questionList[index]; if (item.questionType == 'judge' && item.userAnswer) { @@ -555,7 +588,9 @@ const scoreItem = scoreData[cindex]; if (scoreItem.range == 'all') { questionList.forEach((item) => { - scoreItem.score += item.score + if (item.score) { + scoreItem.score += item.score + } }) } else { questionList.forEach((item, index) => { @@ -624,7 +659,82 @@ }) .then((res) => {}); }, - + async restart() { + this.setData({ + currentIndex: 0, + submitStatus: false, + }); + await app.MG.identity.setUserKey({ + setKeyRequests: [{ + domain: "answerData", + key: this.data.uuid, + value: JSON.stringify({ + answerData: [], + }), + }, ], + }); + this.init(true); + }, + openIsShowDialog() { + this.setData({ + isShowDialog: true, + }) + }, + // 鑾峰彇鏃х瓟棰樻暟鎹� + getAnswerInfo(arr, scoreListArr) { + let newArr = [...arr]; + let scoreArr = [...scoreListArr]; + app.MG.identity + .getUserKey({ + domain: "answerData", + keys: [this.data.uuid], + }) + .then((res) => { + try { + const data = JSON.parse(res[0].value) + if (data.answerData?.length > 0 && newArr.length) { + this.setData({ + isShowDialog: true, + submitStatus: true, + }) + newArr.forEach(item => { + const obj = data.answerData.find(citem => citem.id == item.id) + if (obj?.answer) { + item.userAnswer = obj.answer + } else { + item.userAnswer = "" + } + }) + } + if (data.scoreData?.length > 0 && scoreArr.length) { + scoreArr.forEach(item => { + const obj = data.scoreData.find(citem => citem.name == item.name) + if (obj?.score) { + item.score = obj.score + } else { + item.score = 0 + } + if (obj?.dispatch) { + item.dispatch = obj.dispatch + } else { + item.dispatch = "" + } + }) + } + this.setData({ + questionDataList: newArr, + scoreDataList: scoreArr, + }) + } catch (error) { + this.setData({ + questionDataList: newArr, + scoreDataList: scoreArr + }) + console.log(error); + } + console.log(this.data.scoreDataList, "scoreDataList"); + }); + }, @@ -670,7 +780,7 @@ app.MG.identity .setUserKey({ setKeyRequests: [{ - domain: "mockAnswerData", + domain: "answerData", key: this.data.uuid, value: JSON.stringify({ currentIndex: this.data.currentIndex, diff --git a/packageBookService/pages/psychologyAnswer/psychologyAnswer.wxml b/packageBookService/pages/psychologyAnswer/psychologyAnswer.wxml index 7b89032..c42bd38 100644 --- a/packageBookService/pages/psychologyAnswer/psychologyAnswer.wxml +++ b/packageBookService/pages/psychologyAnswer/psychologyAnswer.wxml @@ -39,6 +39,7 @@ scoreData="{{scoreDataList}}" bind:setCollect="setCollect" bind:submitPaper="submitPaper" + bind:openIsShowDialog="openIsShowDialog" bind:restart="restart" bind:goQuestion="goQuestion" bind:changeBGColor="changeBGColor" diff --git a/packageBookService/pages/psychologyAnswer/questionList/index.js b/packageBookService/pages/psychologyAnswer/questionList/index.js index 27ce21d..7df872e 100644 --- a/packageBookService/pages/psychologyAnswer/questionList/index.js +++ b/packageBookService/pages/psychologyAnswer/questionList/index.js @@ -64,7 +64,9 @@ showIndex: 0, isPlay: false }, - + ready() { + console.log(this.properties.questionList, "questionList"); + }, /** * 缁勪欢鐨勬柟娉曞垪琛� */ diff --git a/packageBookService/pages/psychologyAnswer/questionList/index.wxml b/packageBookService/pages/psychologyAnswer/questionList/index.wxml index 49f03a2..79043cd 100644 --- a/packageBookService/pages/psychologyAnswer/questionList/index.wxml +++ b/packageBookService/pages/psychologyAnswer/questionList/index.wxml @@ -5,7 +5,11 @@ > <!-- 绛旈鎻愮ずtitle --> <view class="question-title" wx:if="{{questionTitle}}"> - <text class="title-name">鎻愮ず锛歿{questionTitle}}</text> + <rich-text + class="substance" + nodes="{{questionTitle}}" + space="emsp" + ></rich-text> </view> <!-- 棰樼洰鍒楄〃 --> <swiper diff --git a/packageBookService/pages/psychologyAnswer/questionList/index.wxss b/packageBookService/pages/psychologyAnswer/questionList/index.wxss index d331ebd..838fe15 100644 --- a/packageBookService/pages/psychologyAnswer/questionList/index.wxss +++ b/packageBookService/pages/psychologyAnswer/questionList/index.wxss @@ -9,8 +9,9 @@ } .question-title { - font-size: 30rpx; - margin-bottom: 20rpx; + font-size: 32rpx; + margin-bottom: 40rpx; + text-indent: 2em; } .title-content { diff --git a/packageBookService/pages/psychologyAnswer/questionOptions/index.js b/packageBookService/pages/psychologyAnswer/questionOptions/index.js index cf29ad8..dba5ae1 100644 --- a/packageBookService/pages/psychologyAnswer/questionOptions/index.js +++ b/packageBookService/pages/psychologyAnswer/questionOptions/index.js @@ -196,7 +196,7 @@ this.setData({ noReady: 0, }); - if (this.properties.submitStatus) return wx.navigateBack(); + if (this.properties.submitStatus) return this.triggerEvent("openIsShowDialog"); this.properties.questionDataList.forEach((item) => { if (!this.isHaveAnswer(item.userAnswer)) { this.setData({ diff --git a/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml b/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml index 5706ba2..1dc54f0 100644 --- a/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml +++ b/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml @@ -23,13 +23,23 @@ /> 璁剧疆 </view> + <view + class="li-option" + bind:tap="resterBtn" + style="color: {{isNight ? '#fff' : '#000'}};" + > + <image + src="{{isNight ? '/static/images/bookService/examination/chongzuo-w.png' : '/static/images/bookService/examination/reset.png'}}" + /> + 閲嶅仛 + </view> <view class="bottom-submit"> <t-button theme="primary" size="large" style="{{btnStyle}}" bind:tap="submitBtn" - >{{!submitStatus ? '鎻愪氦' : '閫�鍑�'}}</t-button + >{{!submitStatus ? '鎻愪氦' : '鏌ョ湅缁撴灉'}}</t-button > </view> </view> @@ -151,34 +161,35 @@ class="test-report" visible="{{testReportState}}" confirm-btn="{{null}}" + close-btn title="娴嬭瘯鎶ュ憡" bind:close="closeTestReportDialog" > <view slot="content" class="test-report"> <view class="report-content-top"> - <view class="report-li"> - <view class="report-li-left">棰樼洰鎬绘暟锛�</view> - <view class="report-li-right">{{questionDataList.length}}閬�</view> - </view> - <view - wx:for="{{scoreData}}" - wx:for-item="ditem" - wx:for-index="dindex" - wx:key="dindex" - > + <scroll-view scroll-y style="height: 30vh; overflow-y: auto"> <view class="report-li"> - <view class="report-li-left">{{ditem.name}}:</view> - <view class="report-li-right" - ><text class="score-color">{{ditem.score}}</text> 鍒�</view - > + <view class="report-li-left">棰樼洰鎬绘暟锛�</view> + <view class="report-li-right">{{questionDataList.length}}閬�</view> </view> - <view class="report-li"> - <view class="report-li-left" style="white-space: nowrap">缁撴灉:</view> - <view class="report-li-right" - ><text class="score-color">{{ditem.dispatch}}</text></view - > + <view + wx:for="{{scoreData}}" + wx:for-item="ditem" + wx:for-index="dindex" + wx:key="dindex" + > + <view class="report-li"> + <view class="report-li-left">{{ditem.name}}:</view> + <view class="report-li-right"><text>{{ditem.score}}</text> 鍒�</view> + </view> + <view class="report-li" wx:if="{{ditem.dispatch}}"> + <view class="report-li-left" style="white-space: nowrap" + >缁撴灉:</view + > + <view class="report-li-right"><text>{{ditem.dispatch}}</text></view> + </view> </view> - </view> + </scroll-view> </view> </view> </t-dialog> diff --git a/packageBookService/pages/psychologyAnswer/questionOptions/index.wxss b/packageBookService/pages/psychologyAnswer/questionOptions/index.wxss index 669fc23..6f22d04 100644 --- a/packageBookService/pages/psychologyAnswer/questionOptions/index.wxss +++ b/packageBookService/pages/psychologyAnswer/questionOptions/index.wxss @@ -181,11 +181,12 @@ } .report-li-left { - width: 192rpx; + width: 155rpx; } .report-li-right { - margin-left: 120rpx; + flex: 1; + margin-left: 0rpx; } .report-content-bottom { @@ -205,9 +206,7 @@ color: #EE1818; } -.score-color { - color: #ff6c00; -} +.score-color {} .brightness { display: flex; diff --git a/packageBookService/pages/psychologyAnswer/testdata/index.js b/packageBookService/pages/psychologyAnswer/testdata/index.js index 4278718..9324f4a 100644 --- a/packageBookService/pages/psychologyAnswer/testdata/index.js +++ b/packageBookService/pages/psychologyAnswer/testdata/index.js @@ -1,6 +1,5 @@ var localData = { - "list": [ - { + "list": [{ "name": "娴嬫祴浣犵殑鐢熸椿鍝佽川", "title": "璇蜂粩缁嗛槄璇讳互涓嬮棶棰橈紝鍑綘鐨勭涓�鎰熻鍥炵瓟銆傝閫夋嫨涓庝綘鐩哥鐨勭瓟妗堬紝鍗充娇浣犳劅鍒颁笉澶‘瀹氾紝涔熻鍥炵瓟姣忎釜闂銆�", "fromType": "json", @@ -20,7 +19,7 @@ { "score": [ 15, - 31 + 30 ], "desc": "浣犵殑鐢熸椿鍝佽川鏄庢樉鍙楅檺銆傚涔犲績鐞嗗鐭ヨ瘑鍜岃繘琛岀Н鏋佺殑鑷垜璁粌浼氬湪甯姪浣犺浆鍙樹负蹇箰鐨勪汉鐨勮繃绋嬩腑璧峰法澶х殑鎺ㄥ姩浣滅敤銆�" }, @@ -65,19 +64,7 @@ "optionStyle": "Txt", "questionType": "judge", "stem": { - "stemTxt": "鎴戦�氬父閱掓潵閮戒細甯︾潃瀵规柊鐨勪竴澶╃敓娲荤殑鎭愭儳" - }, - "stemStyle": "Txt", - "userAnswer": "" - }, - { - "analysisCon": "鐣�", - "id": "0C85D527", - "optionIndex": 0, - "optionStyle": "Txt", - "questionType": "judge", - "stem": { - "stemTxt": "鎴戦�氬父閱掓潵閮戒細甯︾潃瀵规柊鐨勪竴澶╃敓娲荤殑鎭愭儳" + "stemTxt": "鎴戦�氬父閱掓潵閮戒細甯︾潃瀵规柊鐨勪竴澶╃敓娲荤殑鎭愭儳銆�" }, "stemStyle": "Txt", "userAnswer": "" @@ -89,7 +76,7 @@ "optionStyle": "Txt", "questionType": "judge", "stem": { - "stemTxt": "鎴戜技涔庢湁璁稿閬楁喚鈥冦��" + "stemTxt": "鎴戜技涔庢湁璁稿閬楁喚銆�" }, "stemStyle": "Txt", "userAnswer": "" @@ -101,7 +88,7 @@ "optionStyle": "Txt", "questionType": "judge", "stem": { - "stemTxt": "鎴戠粡甯稿珘濡掑埆浜衡�冦��" + "stemTxt": "鎴戠粡甯稿珘濡掑埆浜恒��" }, "stemStyle": "Txt", "userAnswer": "" @@ -185,7 +172,7 @@ "optionStyle": "Txt", "questionType": "judge", "stem": { - "stemTxt": "鎴戠粡甯镐互鈥滃鏋溾�︹�﹀氨濂戒簡鈥濇潵寮�濮嬭�冭檻闂" + "stemTxt": "鎴戠粡甯镐互鈥滃鏋溾�︹�﹀氨濂戒簡鈥濇潵寮�濮嬭�冭檻闂銆�" }, "stemStyle": "Txt", "userAnswer": "" @@ -674,14 +661,14 @@ 0, 30 ], - "desc": "鍋ュ悍鐘跺喌鑹ソ" + "desc": "鍋ュ悍鐘跺喌鑹ソ銆�" }, { "score": [ 31, - 200 + 500 ], - "desc": "鍙兘瀛樺湪涓庡績鐞嗗洜绱犳湁鍏崇殑鍋ュ悍闂" + "desc": "鍙兘瀛樺湪涓庡績鐞嗗洜绱犳湁鍏崇殑鍋ュ悍闂銆�" } ] }], @@ -728,28 +715,33 @@ } ], [{ - "txt": "1", + "txt": "0", "value": "A", + "score": 0 + }, + { + "txt": "1", + "value": "B", "score": 1 }, { "txt": "2", - "value": "B", + "value": "C", "score": 2 }, { "txt": "3", - "value": "C", + "value": "D", "score": 3 }, { "txt": "4", - "value": "D", + "value": "E", "score": 4 }, { "txt": "5", - "value": "E", + "value": "F", "score": 5 } ] @@ -1655,42 +1647,6 @@ "userAnswer": "" }, { - "id": "0C85D5B8", - "analysisCon": "鐣�", - "optionIndex": 0, - "optionStyle": "Txt", - "questionType": "singleChoice", - "stem": { - "stemTxt": " 棰戠箒鐨勬剰澶栧缁忓父锛燂紙涓婂懆鍑虹幇鐨勫ぉ鏁帮級" - }, - "stemStyle": "Txt", - "userAnswer": "" - }, - { - "id": "0C85D5B9", - "analysisCon": "鐣�", - "optionIndex": 1, - "optionStyle": "Txt", - "questionType": "singleChoice", - "stem": { - "stemTxt": " 棰戠箒鐨勬剰澶栧涓ラ噸锛燂紙1=杞诲井鐨勶紝5=寰堜弗閲嶇殑锛�" - }, - "stemStyle": "Txt", - "userAnswer": "" - }, - { - "id": "0C85D5BA", - "analysisCon": "鐣�", - "optionIndex": 1, - "optionStyle": "Txt", - "questionType": "singleChoice", - "stem": { - "stemTxt": " 棰戠箒鐨勬剰澶栨寔缁椂闂达紵锛�1=1灏忔椂锛�5=鍏ㄥぉ锛�" - }, - "stemStyle": "Txt", - "userAnswer": "" - }, - { "id": "0C85D5BB", "analysisCon": "鐣�", "optionStyle": "Txt", @@ -1705,7 +1661,7 @@ }, { "name": "涓�鑸嚜鎴戞晥鑳芥劅閲忚〃", - "title": "浠ヤ笅10涓彞瀛愰兘鏄叧浜庝綘骞虫椂瀵硅嚜宸辩殑涓�鑸湅娉曪紝璇蜂綘鏍规嵁鑷繁鐨勫疄闄呮儏鍐碉紝閫夋嫨鍚堥�傜殑閫夐」銆傗��1鈥濊〃绀哄畬鍏ㄤ笉姝g‘銆傗��2鈥濊〃绀烘湁鐐规纭紝鈥�3鈥濊〃绀哄鏁版纭紝鈥�4鈥濊〃绀哄畬鍏ㄦ纭�傜瓟妗堟病鏈夊閿欎箣鍒嗭紝瀵规瘡涓�涓彞瀛愭棤椤诲鑰冭檻銆�", + "title": "<p>涓�鑸嚜鎴戞晥鑳芥劅閲忚〃锛坓eneral self-efficacyscale锛孏SES锛夋渶鏃╃殑寰锋枃鐗堟槸鐢辨煆鏋楄嚜鐢卞ぇ瀛︾殑涓村簥鍜屽仴搴峰績鐞嗗瀹舵柦鐡︽辰锛圫chwarzer锛夋暀鎺堝強鍏跺悓浜嬩簬1981骞寸紪鍒跺畬鎴愮殑锛屽紑濮嬪叡鏈�20涓」鐩紝鍚庢潵鏀硅繘涓�10涓」鐩�傜洰鍓嶈閲忚〃鍦ㄥ浗闄呬笂琚箍娉涗娇鐢ㄣ�傝閲忚〃鐨勪腑鏂囩増鏈�鏃╃敱寮犲缓鏂板拰鏂界摝娉戒簬1995骞村湪涓浗棣欐腐涓�骞寸骇澶у鐢熶腑浣跨敤銆備腑鏂囩増鏈凡琚瘉鏄庡叿鏈夎壇濂界殑淇″害鍜屾晥搴︺��</p><p>浠ヤ笅10涓彞瀛愰兘鏄叧浜庝綘骞虫椂瀵硅嚜宸辩殑涓�鑸湅娉曪紝璇蜂綘鏍规嵁鑷繁鐨勫疄闄呮儏鍐碉紝閫夋嫨鍚堥�傜殑閫夐」銆傗��1鈥濊〃绀哄畬鍏ㄤ笉姝g‘銆傗��2鈥濊〃绀烘湁鐐规纭紝鈥�3鈥濊〃绀哄鏁版纭紝鈥�4鈥濊〃绀哄畬鍏ㄦ纭�傜瓟妗堟病鏈夊閿欎箣鍒嗭紝瀵规瘡涓�涓彞瀛愭棤椤诲鑰冭檻銆�</p>", "fromType": "json", "scoreRules": [], "scoreData": [{ @@ -1886,7 +1842,7 @@ { "score": [ 6, - 10 + 13 ], "desc": "璇存槑浣犲湪瀛︿範鍔ㄦ満涓婃湁涓�瀹氱殑闂鍜屽洶鎵帮紝鍙皟鏁淬��" }, @@ -1974,7 +1930,7 @@ }, { "analysisCon": "鐣�", - "id": "1C85D529", + "id": "1C85D544", "optionIndex": 0, "optionStyle": "Txt", "questionType": "judge", @@ -2169,21 +2125,21 @@ 0, 8 ], - "desc": "浣犲湪瀛︿範鍔ㄦ満涓婃湁灏戣闂锛屽繀瑕佹椂鍙皟鏁淬��" + "desc": "浣犲杽浜庝氦闄咃紝鎬ф牸寮�鏈楋紝涓诲姩鍏冲績鍒汉锛屽鏈嬪弸寰堝ソ锛屾効鎰忎笌浠栦滑鍦ㄤ竴璧凤紝褰兼鐩稿寰椾笉閿欍��" }, { "score": [ 9, 14 ], - "desc": "浣犲湪瀛︿範鍔ㄦ満涓婃湁灏戣闂锛屽繀瑕佹椂鍙皟鏁淬��" + "desc": "浣犱笌鏈嬪弸鐨勭浉澶勫瓨鍦ㄤ竴瀹氬洶鎵帮紝浜虹紭涓�鑸紝涓庢湅鍙嬬殑鍏崇郴鏃跺ソ鏃跺潖锛岀粡甯稿浜庤捣浼忓彉鍔ㄤ箣涓��" }, { "score": [ 15, 28 ], - "desc": "浣犲湪瀛︿範鍔ㄦ満涓婃湁灏戣闂锛屽繀瑕佹椂鍙皟鏁淬��" + "desc": "浣犱笌鏈嬪弸鐨勭浉澶勫瓨鍦ㄤ弗閲嶅洶鎵般�傚垎鏁拌秴杩�20鍒嗭紝琛ㄦ槑浣犵殑浜洪檯鍏崇郴鍥版壈绋嬪害寰堜弗閲嶏紝鑰屼笖鍦ㄥ績鐞嗕笂鍑虹幇杈冧负鏄庢樉鐨勯殰纰嶃�備綘鍙兘涓嶅杽浜よ皥锛屼篃鍙兘鏄釜鎬ф牸瀛ゅ兓鐨勪汉锛屼笉寮�鏈楋紝鎴栬�呮湁鏄庢樉鐨勮嚜楂樿嚜澶с�佽浜哄珜鐨勮涓恒��" } ] }], @@ -2540,7 +2496,7 @@ }, { "name": "濠氬Щ绋冲畾鎬ф祴璇�", - "title": "浣犻�夋嫨濂界粓韬即渚d簡鍚楋紵浣犳槸鎬庢牱鐪嬪緟濠氬Щ鐨勫憿锛熶笅闈㈢殑濠氬Щ绋冲畾鎬ф祴璇曞彲浠ュ府浣犳洿濂藉湴棰勬祴鏈潵濠氬Щ鐨勭ǔ瀹氭�с��", + "title": "<p>浣犻�夋嫨濂界粓韬即渚d簡鍚楋紵浣犳槸鎬庢牱鐪嬪緟濠氬Щ鐨勫憿锛熶笅闈㈢殑濠氬Щ绋冲畾鎬ф祴璇曞彲浠ュ府浣犳洿濂藉湴棰勬祴鏈潵濠氬Щ鐨勭ǔ瀹氭�с��</p><p>璇蜂粩缁嗛槄璇绘瘡閬撻锛岄�夋嫨绗﹀悎浣犵殑绛旀銆�</p>", "fromType": "json", "scoreRules": [{ "index": "", @@ -2586,7 +2542,7 @@ "list": [{ "analysisCon": "鐣�", "optionIndex": 1, - "id": "0C85D526", + "id": "0C85D520", "optionStyle": "Txt", "questionType": "judge", "stem": { @@ -2598,7 +2554,7 @@ { "analysisCon": "鐣�", "optionIndex": 1, - "id": "0C85D520", + "id": "0C85D521", "optionStyle": "Txt", "questionType": "judge", "stem": { @@ -2610,7 +2566,7 @@ { "analysisCon": "鐣�", "optionIndex": 1, - "id": "0C85D521", + "id": "0C85D522", "optionStyle": "Txt", "questionType": "judge", "stem": { @@ -2633,7 +2589,7 @@ }, { "analysisCon": "鐣�", - "id": "0C85D525", + "id": "0C85D524", "optionIndex": 0, "optionStyle": "Txt", "questionType": "judge", @@ -2646,7 +2602,7 @@ { "analysisCon": "鐣�", "optionIndex": 1, - "id": "0C85D524", + "id": "0C85D525", "optionStyle": "Txt", "questionType": "judge", "stem": { @@ -2658,7 +2614,7 @@ { "analysisCon": "鐣�", "optionIndex": 1, - "id": "0C85D527", + "id": "0C85D526", "optionStyle": "Txt", "questionType": "judge", "stem": { @@ -2669,7 +2625,7 @@ }, { "analysisCon": "鐣�", - "id": "0C85D528", + "id": "0C85D527", "optionIndex": 0, "optionStyle": "Txt", "questionType": "judge", @@ -2682,7 +2638,7 @@ { "analysisCon": "鐣�", "optionIndex": 1, - "id": "0C85D529", + "id": "0C85D528", "optionStyle": "Txt", "questionType": "judge", "stem": { @@ -2693,7 +2649,7 @@ }, { "analysisCon": "鐣�", - "id": "0C85D526", + "id": "0C85D529", "optionIndex": 0, "optionStyle": "Txt", "questionType": "judge", @@ -2745,14 +2701,12 @@ } ] }], - "list": [ - { + "list": [{ "analysisCon": "鐣�", "id": "3P1E1B001", "optionStyle": "Txt", "questionType": "singleChoice", - "option": [ - { + "option": [{ "txt": "鎵惧埌涓�涓儏鎶曟剰鍚堢殑浼翠荆", "value": "A", "score": 3 @@ -2786,16 +2740,16 @@ "questionType": "linkage", "questionTab": "A", "option": [{ - "txt": "鐢�", + "txt": "濂�", "value": "A" }, { - "txt": "濂�", + "txt": "鐢�", "value": "B" } ], "optionData": { - "A": [{ + "B": [{ "txt": "婕備寒鎬ф劅锛屾湁濂虫�ч瓍鍔�", "value": "A", "score": 2 @@ -2816,7 +2770,7 @@ "score": 1 } ], - "B": [{ + "A": [{ "txt": "鑻变繆娼囨磼锛屾湁鐢锋�ч瓍鍔�", "value": "A", "score": 2 @@ -3016,9 +2970,9 @@ "score": 2 }, { - "txt": "灏嗗叾鐖辨厱涔嬫儏娣″寲涓哄弸鎯�", + "txt": "鍙備笌绔炰簤锛屽姏浜夊ず鍙�", "value": "B", - "score": 3 + "score": 1 }, { "txt": "鎶借韩姝㈡锛屾垚浜轰箣缇�", @@ -3045,17 +2999,17 @@ "option": [{ "txt": "蹇呯劧鍙堝繀闇�鐨�", "value": "A", - "score": 2 + "score": 3 }, { "txt": "瀵规亱鐖辩殑鍚﹀畾", "value": "B", - "score": 3 + "score": 0 }, { "txt": "鏃犺亰鐨�", "value": "C", - "score": 3 + "score": 2 }, { "txt": "鏉熸墜鏃犵瓥鐨勭棝鑻︾粡鍘�", @@ -3150,21 +3104,21 @@ 0, 10 ], - "desc": "绮剧鍘嬪姏绋嬪害浣庯紝浣嗗彲鑳芥樉绀虹敓娲荤己涔忓埡婵�锛屾瘮杈冪畝鍗曟矇闂凤紝涓汉鍋氫簨鐨勫姩鍔涗笉楂�" + "desc": "绮剧鍘嬪姏绋嬪害浣庯紝浣嗗彲鑳芥樉绀虹敓娲荤己涔忓埡婵�锛屾瘮杈冪畝鍗曟矇闂凤紝涓汉鍋氫簨鐨勫姩鍔涗笉楂樸��" }, { "score": [ 11, 15 ], - "desc": "绮剧鍘嬪姏绋嬪害涓瓑锛岃櫧鐒舵煇浜涙椂鍊欐劅鍒板帇鍔涜緝澶э紝浠嶅彲搴斾粯" + "desc": "绮剧鍘嬪姏绋嬪害涓瓑锛岃櫧鐒舵煇浜涙椂鍊欐劅鍒板帇鍔涜緝澶э紝浠嶅彲搴斾粯銆�" }, { "score": [ 16, 34 ], - "desc": "绮剧鍘嬪姏鍋忛珮锛屽簲鍙嶇渷涓�涓嬪帇鍔涙潵婧愬拰瀵绘眰瑙e喅鍔炴硶" + "desc": "绮剧鍘嬪姏鍋忛珮锛屽簲鍙嶇渷涓�涓嬪帇鍔涙潵婧愬拰瀵绘眰瑙e喅鍔炴硶銆�" } ] }], @@ -3394,7 +3348,7 @@ }, { "name": "鎶戦儊鑷瘎閲忚〃锛圫DS锛�", - "title": "涓嬮潰鏈�20鏉℃枃瀛楋紝璇蜂粩缁嗛槄璇绘瘡涓�鏉★紝鎶婃剰鎬濆紕鏄庣櫧鍚庢牴鎹偍鏈�杩戜竴鏄熸湡鐨勬儏鍐甸�夋嫨閫傚綋鐨勯�夐」銆傗�淎鈥濊〃绀烘病鏈夋垨寰堝皯鏃堕棿鏈夛紝鈥淏鈥濊〃绀哄皬閮ㄥ垎鏃堕棿鏈夛紝鈥淐鈥濊〃绀虹浉褰撳鏃堕棿鏈夛紝鈥淒鈥濊〃绀虹粷澶ч儴鍒嗘椂闂撮兘鏈�", + "title": "涓嬮潰鏈�20鏉℃枃瀛楋紝璇蜂粩缁嗛槄璇绘瘡涓�鏉★紝鎶婃剰鎬濆紕鏄庣櫧鍚庢牴鎹偍鏈�杩戜竴鏄熸湡鐨勬儏鍐甸�夋嫨閫傚綋鐨勯�夐」銆傗�淎鈥濊〃绀烘病鏈夋垨寰堝皯鏃堕棿鏈夛紝鈥淏鈥濊〃绀哄皬閮ㄥ垎鏃堕棿鏈夛紝鈥淐鈥濊〃绀虹浉褰撳鏃堕棿鏈夛紝鈥淒鈥濊〃绀虹粷澶ч儴鍒嗘椂闂撮兘鏈夈��", "fromType": "json", "scoreRules": [], "scoreData": [{ @@ -3732,23 +3686,23 @@ "result": [{ "score": [ 11, - 18 + 24 ], - "desc": "浣庡害鑱屼笟鍖�" + "desc": "浣庡害鑱屼笟鍖栥��" }, { "score": [ - 19, - 29 + 25, + 51 ], - "desc": "涓害鑱屼笟鍖�" + "desc": "涓害鑱屼笟鍖栥��" }, { "score": [ - 30, - 45 + 52, + 65 ], - "desc": "楂樺害鑱屼笟鍖�" + "desc": "楂樺害鑱屼笟鍖栥��" } ] }], @@ -3769,7 +3723,7 @@ "optionStyle": "Txt", "questionType": "singleChoice", "stem": { - "stemTxt": "鎴戣寰楅椃闂蜂笉涔愶紝鎯呯华浣庢矇銆�" + "stemTxt": "鎯宠薄涓�涓嬶紝濡傛灉鐜板湪闇�瑕佷綘椹笂寮�濮嬪伐浣滐紝浣犺兘绔嬪嵆寮�濮嬪悧锛�" }, "stemStyle": "Txt", "userAnswer": "" @@ -3791,7 +3745,7 @@ "optionStyle": "Txt", "questionType": "singleChoice", "stem": { - "stemTxt": "瀵逛簬浣犺嚜宸辩洰鍓嶇殑宸ヤ綔锛屼綘鏄浣曠湅 寰呯殑锛�" + "stemTxt": "瀵逛簬浣犺嚜宸辩洰鍓嶇殑宸ヤ綔锛屼綘鏄浣曠湅寰呯殑锛�" }, "stemStyle": "Txt", "userAnswer": "" @@ -3799,13 +3753,17 @@ { "analysisCon": "鐣�", "id": "3L1E1B03", + "jumpData": { + "value": "B", + "list": ["3L1E1B04"] + }, "option": [{ "txt": "鏄�", "value": "A", "score": 5 }, { - "txt": " 鍚�", + "txt": "鍚�", "value": "B", "score": 1 } @@ -3872,12 +3830,12 @@ "option": [{ "txt": "鏄� ", "value": "A", - "score": 5 + "score": 1 }, { "txt": "鍚�", "value": "B", - "score": 1 + "score": 5 } ], "optionStyle": "Txt", @@ -3925,7 +3883,7 @@ }, { "txt": "鍋囪鍜屽鎴疯璇濈殑鏍峰瓙", - "value": "c", + "value": "C", "score": 1 } ], @@ -4040,7 +3998,7 @@ "optionStyle": "Txt", "questionType": "singleChoice", "stem": { - "stemTxt": "瀹㈡埛璧勬枡鍑轰簡閿欒锛屼絾涓嶆槸浣犻�犳垚鐨勩�傞瀵艰拷绌惰矗浠伙紝杩欐椂浣犱細:" + "stemTxt": "瀹㈡埛璧勬枡鍑轰簡閿欒锛屼絾涓嶆槸浣犻�犳垚鐨勩�傞瀵艰拷绌惰矗浠伙紝杩欐椂浣犱細锛�" }, "stemStyle": "Txt", "userAnswer": "" @@ -4130,7 +4088,7 @@ ] }, { - "name": "鏁扮悊鑳借兘鍔�", + "name": "鏁扮悊鑳藉姏", "dispatch": "", "isAverage": true, "range": [ @@ -4480,7 +4438,7 @@ ] }, { - "name": "缁勭粍缁囩鐞嗚兘鍔�", + "name": "缁勭粐绠$悊鑳藉姏", "dispatch": "", "isAverage": true, "range": [ @@ -5210,39 +5168,39 @@ }, { "name": "濞佸粔鏂垱閫犲姏鍊惧悜閲忚〃", - "title": "杩欐槸涓�浠藉府鍔╀綘浜嗚В鑷繁鍒涢�犲姏鐨勮〃鍗曘�傚鏋滀綘鍙戠幇涓嬪垪鏌愪簺鍙ュ瓙鎻忚堪鐨勬儏褰㈠緢閫傚悎浣狅紝灏遍�夋嫨鈥滃畬鍏ㄧ鍚堚�濓紝璁�3鍒嗭紱濡傛灉鏌愪簺鍙ュ瓙鍙槸鍦ㄩ儴鍒嗘椂鍊欓�傚悎浣狅紝鍒欓�夋嫨鈥滈儴鍒嗙鍚堚�濓紝璁�2鍒嗭紱濡傛灉鏌愪簺鍙ュ瓙瀵逛綘鏉ヨ鏍规湰鏄笉鍙兘鐨勶紝鍒欓�夋嫨鈥冣�滃畬鍏ㄤ笉绗︹�濓紝璁�1鍒嗐�傛敞鎰忎簨椤癸細鈥冩瘡涓�棰橀兘瑕佸仛锛屼笉瑕佽姳澶鏃堕棿鍘绘�濊�冿紱鎵�鏈夐鐩兘娌℃湁姝g‘绛旀锛屽嚟浣犺瀹屾瘡涓�鍙ョ殑绗竴鍗拌薄浣滅瓟锛涜櫧鐒舵病鏈夋椂闂撮檺鍒讹紝浣嗗敖鍙兘浠ヨ緝蹇殑閫熷害瀹屾垚锛岃秺蹇秺濂斤紱鍑嚜宸辩殑鐪熷疄鎰熷彈浣滅瓟銆�", + "title": "<p>杩欐槸涓�浠藉府鍔╀綘浜嗚В鑷繁鍒涢�犲姏鐨勮〃鍗曘�傚鏋滀綘鍙戠幇涓嬪垪鏌愪簺鍙ュ瓙鎻忚堪鐨勬儏褰㈠緢閫傚悎浣狅紝灏遍�夋嫨鈥滃畬鍏ㄧ鍚堚�濓紝璁�3鍒嗭紱濡傛灉鏌愪簺鍙ュ瓙鍙槸鍦ㄩ儴鍒嗘椂鍊欓�傚悎浣狅紝鍒欓�夋嫨鈥滈儴鍒嗙鍚堚�濓紝璁�2鍒嗭紱濡傛灉鏌愪簺鍙ュ瓙瀵逛綘鏉ヨ鏍规湰鏄笉鍙兘鐨勶紝鍒欓�夋嫨鈥滃畬鍏ㄤ笉绗︹�濓紝璁�1鍒嗐��</p><p>娉ㄦ剰浜嬮」锛氭瘡涓�棰橀兘瑕佸仛锛屼笉瑕佽姳澶鏃堕棿鍘绘�濊�冿紱鎵�鏈夐鐩兘娌℃湁姝g‘绛旀锛屽嚟浣犺瀹屾瘡涓�鍙ョ殑绗竴鍗拌薄浣滅瓟锛涜櫧鐒舵病鏈夋椂闂撮檺鍒讹紝浣嗗敖鍙兘浠ヨ緝蹇殑閫熷害瀹屾垚锛岃秺蹇秺濂斤紱鍑嚜宸辩殑鐪熷疄鎰熷彈浣滅瓟銆�</p>", "fromType": "json", "scoreRules": [], "scoreData": [{ - "name": "寰楀垎", + "name": "鎬� 鍒�", "dispatch": "", "range": "all", "score": 0, "result": [{ "score": [ 0, - 111 + 110 ], - "desc": "涓�鑸�" + "desc": "涓�鑸��" }, { "score": [ - 112, - 233 + 111, + 133 ], - "desc": "鑹ソ" + "desc": "鑹ソ銆�" }, { "score": [ - 244, + 134, 999 ], - "desc": "鍙堝垱閫犳綔鑳�" + "desc": "鏈夊垱閫犳�ф綔鑳姐��" } ] }, { - "name": "鍐掗櫓鎬�", + "name": "鍐掗櫓鎬у緱鍒�", "dispatch": "", "range": [ 0, @@ -5261,13 +5219,13 @@ "result": [{ "score": [ 0, - 30 + 29 ], - "desc": "鑹�" + "desc": "" }, { "score": [ - 31, + 30, 100 ], "desc": "浼�" @@ -5275,7 +5233,7 @@ ] }, { - "name": "濂藉鎬�", + "name": "濂藉鎬у緱鍒�", "dispatch": "", "range": [ 1, @@ -5297,13 +5255,13 @@ "result": [{ "score": [ 0, - 36 + 35 ], - "desc": "鑹�" + "desc": "" }, { "score": [ - 37, + 36, 100 ], "desc": "浼�" @@ -5311,7 +5269,7 @@ ] }, { - "name": "鎯宠薄鍔�", + "name": "鎯宠薄鍔涘緱鍒�", "dispatch": "", "range": [ 5, @@ -5332,13 +5290,13 @@ "result": [{ "score": [ 0, - 35 + 34 ], - "desc": "鑹�" + "desc": "" }, { "score": [ - 36, + 35, 100 ], "desc": "浼�" @@ -5346,7 +5304,7 @@ ] }, { - "name": "鎸戞垬鎬�", + "name": "鎸戞垬鎬у緱鍒�", "dispatch": "", "range": [ 2, @@ -5366,13 +5324,13 @@ "result": [{ "score": [ 0, - 32 + 31 ], - "desc": "鑹�" + "desc": "" }, { "score": [ - 33, + 32, 100 ], "desc": "浼�" @@ -5384,33 +5342,33 @@ [{ "txt": "瀹屽叏绗﹀悎", "value": "A", - "score": 4 + "score": 3 }, { "txt": "閮ㄥ垎绗﹀悎", "value": "B", - "score": 3 + "score": 2 }, { "txt": "瀹屽叏涓嶇", "value": "C", - "score": 2 + "score": 1 } ], [{ "txt": "瀹屽叏绗﹀悎", "value": "A", - "score": 2 + "score": 1 }, { "txt": "閮ㄥ垎绗﹀悎", "value": "B", - "score": 3 + "score": 2 }, { "txt": "瀹屽叏涓嶇", "value": "C", - "score": 4 + "score": 3 } ] ], @@ -5489,7 +5447,7 @@ { "analysisCon": "鐣�", "optionIndex": 0, - "id": "8A1E1B023", + "id": "8A1E1B067", "optionStyle": "Txt", "questionType": "singleChoice", "stem": { -- Gitblit v1.9.1