7f7549fb by chentao

no message

1 parent 280929ea
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
18 <el-button type="primary" icon="Search" @click="btn_search">查询</el-button> 18 <el-button type="primary" icon="Search" @click="btn_search">查询</el-button>
19 </el-form-item> 19 </el-form-item>
20 </el-form> 20 </el-form>
21 21
22 <!-- 列表操作 --> 22 <!-- 列表操作 -->
23 <el-col :span="1.5"> 23 <el-col :span="1.5">
24 <el-button 24 <el-button
25 type="primary" 25 type="primary"
26 plain 26 plain
27 icon="Plus" 27 icon="Plus"
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 </el-header> 32 </el-header>
33 <el-main id="max-height"> 33 <el-main id="max-height">
34 <!-- 列表内容 --> 34 <!-- 列表内容 -->
35 <el-table 35 <el-table
36 v-loading="status.loading" 36 v-loading="status.loading"
37 :data="list" 37 :data="list"
38 :max-height="windowSize.height - 70" 38 :max-height="windowSize.height - 70"
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
45 <el-table-column :label="$t('block.groupName')" prop="entiretyName" /> 45 <el-table-column :label="$t('block.groupName')" prop="entiretyName" />
46 <el-table-column :label="$t('block.tableControlsName')" class-name="small-padding fixed-width"> 46 <el-table-column :label="$t('block.tableControlsName')" class-name="small-padding fixed-width">
47 <template #default="{ row }"> 47 <template #default="{ row }">
48 <el-button 48 <el-button
49 link 49 link
50 type="info" 50 type="info"
51 @click="handleEdit(row)" 51 @click="handleEdit(row)"
52 >{{ $t('course.controlsEditName') }}</el-button> 52 >{{ $t('course.controlsEditName') }}</el-button>
53 <el-button 53 <el-button
54 link 54 link
55 type="info" 55 type="info"
56 @click="handleDel(row)" 56 @click="handleDel(row)"
...@@ -69,19 +69,19 @@ ...@@ -69,19 +69,19 @@
69 </el-container> 69 </el-container>
70 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog"> 70 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog">
71 <el-form ref="tableRefs" :model="showForm.form" :rules="rules"> 71 <el-form ref="tableRefs" :model="showForm.form" :rules="rules">
72 <el-form-item :label="$t('block.dialogName')" label-width="80"> 72 <el-form-item :label="$t('block.dialogName')" prop="name" label-width="80">
73 <el-input v-model="showForm.form.name" placeholder="请输入参数键名" /> 73 <el-input v-model="showForm.form.name" placeholder="请输入系列名称" />
74 </el-form-item> 74 </el-form-item>
75 <el-form-item :label="$t('block.dialogGroup')" label-width="80"> 75 <el-form-item :label="$t('block.dialogGroup')" prop="entiretyId" label-width="80">
76 <el-select-v2 76 <el-select-v2
77 v-model="showForm.form.entiretyId" 77 v-model="showForm.form.entiretyId"
78 :options="kitLists" 78 :options="kitLists"
79 :props="props" 79 :props="props"
80 placeholder="" 80 placeholder="请选择套件"
81 style="width: 180px;" 81 style="width: 180px;"
82 /> 82 />
83 </el-form-item> 83 </el-form-item>
84 <el-form-item :label="$t('block.dialogPhoto')" label-width="80"> 84 <el-form-item :label="$t('block.dialogPhoto')" prop="ossId" label-width="80">
85 <imageUpload v-model="showForm.form.ossId" :fileType='["png", "jpg", "jpeg", "ico"]'/> 85 <imageUpload v-model="showForm.form.ossId" :fileType='["png", "jpg", "jpeg", "ico"]'/>
86 </el-form-item> 86 </el-form-item>
87 </el-form> 87 </el-form>
...@@ -133,9 +133,11 @@ const data = reactive({ ...@@ -133,9 +133,11 @@ const data = reactive({
133 133
134 } 134 }
135 }, 135 },
136 rules: [ 136 rules: {
137 {} 137 name: [{ required: true, message: "系列名称不能为空", trigger: "blur" }],
138 ] 138 entiretyId: [{ required: true, message: "套件不能为空", trigger: "blur" }],
139 ossId: [{ required: true, message: "图片不能为空", trigger: "blur" }]
140 }
139 }) 141 })
140 142
141 const { status, queryParams, total, list, showForm, rules, kitLists } = toRefs(data) 143 const { status, queryParams, total, list, showForm, rules, kitLists } = toRefs(data)
...@@ -199,7 +201,7 @@ function handleDel(row) { ...@@ -199,7 +201,7 @@ function handleDel(row) {
199 getList(); 201 getList();
200 proxy.$modal.msgSuccess(res.msg); 202 proxy.$modal.msgSuccess(res.msg);
201 }).finally(() => { 203 }).finally(() => {
202 204
203 }); 205 });
204 } 206 }
205 207
...@@ -222,4 +224,4 @@ function closeDialog() { ...@@ -222,4 +224,4 @@ function closeDialog() {
222 form: {} 224 form: {}
223 } 225 }
224 } 226 }
225 </script>
...\ No newline at end of file ...\ No newline at end of file
227 </script>
......
...@@ -70,25 +70,25 @@ ...@@ -70,25 +70,25 @@
70 </el-container> 70 </el-container>
71 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog"> 71 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog">
72 <el-form ref="tableRefs" :model="showForm.form" :rules="rules"> 72 <el-form ref="tableRefs" :model="showForm.form" :rules="rules">
73 <el-form-item :label="$t('course.dialogName')" label-width="80"> 73 <el-form-item :label="$t('course.dialogName')" prop="name" label-width="80">
74 <el-input v-model="showForm.form.name" placeholder="请输入参数键名" /> 74 <el-input v-model="showForm.form.name" placeholder="请输入课程名称" />
75 </el-form-item> 75 </el-form-item>
76 <el-form-item :label="$t('course.dialogBlock')" label-width="80"> 76 <el-form-item :label="$t('course.dialogBlock')" prop="buildingBlockId" label-width="80">
77 <el-select-v2 77 <el-select-v2
78 v-model="showForm.form.buildingBlockId" 78 v-model="showForm.form.buildingBlockId"
79 :options="blockLists" 79 :options="blockLists"
80 :props="props" 80 :props="props"
81 placeholder="" 81 placeholder="请选择系列"
82 style="width: 180px;" 82 style="width: 180px;"
83 /> 83 />
84 </el-form-item> 84 </el-form-item>
85 <el-form-item :label="$t('course.dialogTypes')" label-width="80"> 85 <el-form-item :label="$t('course.dialogTypes')" prop="type" label-width="80">
86 <el-checkbox-group v-model="showForm.form.type"> 86 <el-checkbox-group v-model="showForm.form.type">
87 <div style="display: flex;align-items: center;"> 87 <div style="display: flex;align-items: center;">
88 <el-checkbox label="2D" value="2D" /> 88 <el-checkbox label="2D" value="2D" />
89 <el-select 89 <el-select
90 v-model="showForm.form.twoDimensionalType" 90 v-model="showForm.form.twoDimensionalType"
91 placeholder="Select" 91 placeholder="请选择上传内容"
92 size="small" 92 size="small"
93 style="width: 240px;margin-left: 16px;" 93 style="width: 240px;margin-left: 16px;"
94 > 94 >
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 <el-checkbox label="3D" value="3D" /> 104 <el-checkbox label="3D" value="3D" />
105 <el-select 105 <el-select
106 v-model="showForm.form.threeDimensionalType" 106 v-model="showForm.form.threeDimensionalType"
107 placeholder="Select" 107 placeholder="请选择上传内容"
108 size="small" 108 size="small"
109 style="width: 240px;margin-left: 16px;" 109 style="width: 240px;margin-left: 16px;"
110 > 110 >
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
137 <el-form-item :label="$t('course.dialogCase')" label-width="80"> 137 <el-form-item :label="$t('course.dialogCase')" label-width="80">
138 <fileUpload v-model="showForm.form.caseOssId" :limit="1" :fileType='["mp4", "avi", "mov", "flv"]'/> 138 <fileUpload v-model="showForm.form.caseOssId" :limit="1" :fileType='["mp4", "avi", "mov", "flv"]'/>
139 </el-form-item> 139 </el-form-item>
140 <el-form-item :label="$t('course.dialogTeaching')" label-width="80"> 140 <el-form-item :label="$t('course.dialogTeaching')" prop="teachingOssId" label-width="80">
141 <fileUpload v-model="showForm.form.teachingOssId" :limit="1" :fileType='["pdf"]'/> 141 <fileUpload v-model="showForm.form.teachingOssId" :limit="1" :fileType='["pdf"]'/>
142 </el-form-item> 142 </el-form-item>
143 <el-form-item :label="$t('course.dialogPpt')" label-width="80"> 143 <el-form-item :label="$t('course.dialogPpt')" label-width="80">
...@@ -195,9 +195,12 @@ const data = reactive({ ...@@ -195,9 +195,12 @@ const data = reactive({
195 195
196 } 196 }
197 }, 197 },
198 rules: [ 198 rules: {
199 {} 199 name: [{ required: true, message: "课程名称不能为空", trigger: "blur" }],
200 ] 200 buildingBlockId: [{ required: true, message: "系列不能为空", trigger: "blur" }],
201 type: [{ required: true, message: "搭建类型不能为空", trigger: "blur" }],
202 teachingOssId: [{ required: true, message: "教案不能为空", trigger: "blur" }],
203 }
201 }) 204 })
202 205
203 const { status, queryParams, total, list, showForm, rules, blockLists } = toRefs(data) 206 const { status, queryParams, total, list, showForm, rules, blockLists } = toRefs(data)
...@@ -278,6 +281,7 @@ function handleDel(row) { ...@@ -278,6 +281,7 @@ function handleDel(row) {
278 } 281 }
279 282
280 function submitForm(type) { 283 function submitForm(type) {
284
281 const data = { 285 const data = {
282 ...showForm.value.form, 286 ...showForm.value.form,
283 type: showForm.value.form?.type.join('、') 287 type: showForm.value.form?.type.join('、')
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <!-- 列表操作 --> 6 <!-- 列表操作 -->
7 <el-row :gutter="10" class="mb8" justify="end"> 7 <el-row :gutter="10" class="mb8" justify="end">
8 <el-col :span="1.5"> 8 <el-col :span="1.5">
9 <el-button 9 <el-button
10 type="primary" 10 type="primary"
11 plain 11 plain
12 icon="Plus" 12 icon="Plus"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 </el-header> 17 </el-header>
18 <el-main id="max-height"> 18 <el-main id="max-height">
19 <!-- 列表内容 --> 19 <!-- 列表内容 -->
20 <el-table 20 <el-table
21 v-loading="status.loading" 21 v-loading="status.loading"
22 :data="list" 22 :data="list"
23 :max-height="windowSize.height - 70" 23 :max-height="windowSize.height - 70"
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
38 </el-table-column> 38 </el-table-column>
39 <el-table-column :label="$t('kit.tableControlsName')" class-name="small-padding fixed-width"> 39 <el-table-column :label="$t('kit.tableControlsName')" class-name="small-padding fixed-width">
40 <template #default="{ row }"> 40 <template #default="{ row }">
41 <el-button 41 <el-button
42 link 42 link
43 type="text" 43 type="text"
44 @click="handleDel(row)" 44 @click="handleDel(row)"
45 >{{ $t('kit.controlsDelName') }}</el-button> 45 >{{ $t('kit.controlsDelName') }}</el-button>
46 <el-button 46 <el-button
47 link 47 link
48 type="text" 48 type="text"
49 @click="handleEdit(row)" 49 @click="handleEdit(row)"
...@@ -62,11 +62,11 @@ ...@@ -62,11 +62,11 @@
62 </el-container> 62 </el-container>
63 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog"> 63 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog">
64 <el-form ref="tableRefs" :model="showForm.form" :rules="rules"> 64 <el-form ref="tableRefs" :model="showForm.form" :rules="rules">
65 <el-form-item :label="$t('kit.dialogName')" label-width="80"> 65 <el-form-item :label="$t('kit.dialogName')" prop="name" label-width="80">
66 <el-input v-model="showForm.form.name" placeholder="" /> 66 <el-input v-model="showForm.form.name" placeholder="请输入套件名称" />
67 </el-form-item> 67 </el-form-item>
68 <el-form-item :label="$t('kit.dialogCate')" label-width="80"> 68 <el-form-item :label="$t('kit.dialogCate')" prop="type" label-width="80">
69 <el-select v-model="showForm.form.type" placeholder="" clearable> 69 <el-select v-model="showForm.form.type" placeholder="请选择类别" clearable>
70 <el-option 70 <el-option
71 v-for="dict in entirety_type" 71 v-for="dict in entirety_type"
72 :key="dict.value" 72 :key="dict.value"
...@@ -121,9 +121,10 @@ const data = reactive({ ...@@ -121,9 +121,10 @@ const data = reactive({
121 121
122 } 122 }
123 }, 123 },
124 rules: [ 124 rules: {
125 {} 125 name: [{ required: true, message: "套件名称不能为空", trigger: "blur" }],
126 ] 126 type: [{ required: true, message: "类别不能为空", trigger: "blur" }]
127 }
127 }) 128 })
128 129
129 const { status, queryParams, total, list, showForm, rules } = toRefs(data) 130 const { status, queryParams, total, list, showForm, rules } = toRefs(data)
...@@ -179,7 +180,7 @@ function handleDel(row) { ...@@ -179,7 +180,7 @@ function handleDel(row) {
179 getList(); 180 getList();
180 proxy.$modal.msgSuccess(res.msg); 181 proxy.$modal.msgSuccess(res.msg);
181 }).finally(() => { 182 }).finally(() => {
182 183
183 }); 184 });
184 } 185 }
185 186
...@@ -202,4 +203,4 @@ function closeDialog() { ...@@ -202,4 +203,4 @@ function closeDialog() {
202 form: {} 203 form: {}
203 } 204 }
204 } 205 }
205 </script>
...\ No newline at end of file ...\ No newline at end of file
206 </script>
......
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
94 </el-container> 94 </el-container>
95 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog"> 95 <el-dialog :title="showForm.title" v-model="showForm.open" width="500px" append-to-body @close="closeDialog">
96 <el-form ref="tableRefs" :model="showForm.form" :rules="rules"> 96 <el-form ref="tableRefs" :model="showForm.form" :rules="rules">
97 <el-form-item :label="$t('problem.dialogName')" label-width="80"> 97 <el-form-item :label="$t('problem.dialogName')" prop="title" label-width="80">
98 <el-input v-model="showForm.form.title" placeholder="请输入参数键名" /> 98 <el-input v-model="showForm.form.title" placeholder="请输入问题" />
99 </el-form-item> 99 </el-form-item>
100 <el-form-item :label="$t('problem.dialogPhote')" label-width="80"> 100 <el-form-item :label="$t('problem.dialogPhote')" label-width="80">
101 <imageUpload v-model="showForm.form.coverOssId" :limit="1" :fileType='["png", "jpg", "jpeg", "ico"]'/> 101 <imageUpload v-model="showForm.form.coverOssId" :limit="1" :fileType='["png", "jpg", "jpeg", "ico"]'/>
...@@ -161,9 +161,9 @@ const data = reactive({ ...@@ -161,9 +161,9 @@ const data = reactive({
161 161
162 } 162 }
163 }, 163 },
164 rules: [ 164 rules: {
165 {} 165 title: [{ required: true, message: "问题不能为空", trigger: "blur" }]
166 ] 166 }
167 }) 167 })
168 168
169 const tableRefs = ref(null) 169 const tableRefs = ref(null)
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!