zydx-plus 1.32.178 → 1.32.180

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zydx-plus",
3
- "version": "1.32.178",
3
+ "version": "1.32.180",
4
4
  "description": "Vue.js",
5
5
  "main": "src/index.js",
6
6
  "files": [
@@ -9,7 +9,7 @@
9
9
  <th>难</th>
10
10
  <th>合计题量</th>
11
11
  <th>合计分值</th>
12
- <th v-if="!readOnly">操作</th>
12
+ <th v-if="!readOnly&&butShow">操作</th>
13
13
  </tr>
14
14
  <tbody v-for="(item,index) in question" :key="index">
15
15
  <tr>
@@ -35,7 +35,7 @@
35
35
  </td>
36
36
  <td rowspan="2">{{ item.count }}</td>
37
37
  <td rowspan="2">{{ item.allScore }}</td>
38
- <td rowspan="2" v-if="!readOnly">
38
+ <td rowspan="2" v-if="!readOnly&&butShow">
39
39
  <button class="but" @click="cancel(index)">撤销选择</button>
40
40
  </td>
41
41
  </tr>
@@ -66,7 +66,7 @@
66
66
  <td>{{ hardNum === 0? '-': hardNum }}</td>
67
67
  <td>{{ midNum === 0? '-': midNum }}</td>
68
68
  <td>试卷总分</td>
69
- <td :colspan="readOnly? 1: 2">{{ totalNum === 0? '-': totalNum }}</td>
69
+ <td :colspan="readOnly&&butShow? 1: 2">{{ totalNum === 0? '-': totalNum }}</td>
70
70
  </tr>
71
71
  </table>
72
72
  </div>
@@ -94,6 +94,10 @@ export default {
94
94
  type: Boolean,
95
95
  default: false
96
96
  },
97
+ butShow: {
98
+ type: Boolean,
99
+ default: false
100
+ }
97
101
  },
98
102
  watch: {
99
103
  data: {
@@ -160,7 +164,10 @@ export default {
160
164
  if(i === 6) this.question[n].midScore = value === 0? '' : value
161
165
  const total = (this.question[n].easy === ''? 0: this.question[n].easy) + (this.question[n].hard === ''? 0: this.question[n].hard) + (this.question[n].mid === ''? 0: this.question[n].mid)
162
166
  this.question[n].count = (total === 0)? '-' : total
163
- const total2 = (this.question[n].easyScore === ''? 0: this.question[n].easyScore) + (this.question[n].hardScore === ''? 0: this.question[n].hardScore) + (this.question[n].midScore === ''? 0: this.question[n].midScore)
167
+ const num1 = this.question[n].easyScore === ''? 0: this.question[n].easyScore * this.question[n].easy
168
+ const num2 = this.question[n].hardScore === ''? 0: this.question[n].hardScore * this.question[n].hard
169
+ const num3 = this.question[n].midScore === ''? 0: this.question[n].midScore * this.question[n].mid
170
+ const total2 = num1 + num2 + num3
164
171
  this.question[n].allScore = (total2 === 0)? '-' : total2
165
172
  this.totalScore()
166
173
  },
@@ -169,9 +176,9 @@ export default {
169
176
  this.hardNum = 0
170
177
  this.midNum = 0
171
178
  this.question.forEach(x => {
172
- this.easyNum += x.easyScore === '' ? 0: Number(x.easyScore)
173
- this.hardNum += x.hardScore === '' ? 0: Number(x.hardScore)
174
- this.midNum += x.midScore === '' ? 0: Number(x.midScore)
179
+ this.easyNum += x.easyScore === '' ? 0: Number(x.easyScore) * Number(x.easy)
180
+ this.hardNum += x.hardScore === '' ? 0: Number(x.hardScore) * Number(x.hard)
181
+ this.midNum += x.midScore === '' ? 0: Number(x.midScore) * Number(x.mid)
175
182
  })
176
183
  this.totalNum = this.easyNum + this.hardNum + this.midNum
177
184
  },
package/src/index.js CHANGED
@@ -77,7 +77,7 @@ function install(app) {
77
77
  }
78
78
 
79
79
  export default {
80
- version: '1.32.178',
80
+ version: '1.32.180',
81
81
  install,
82
82
  Calendar,
83
83
  Message,