上传图片

src/main/vue/src/components/SingleUpload.vue

@@ -85,9 +85,9 @@ export default {
 .single-uploader-icon {
     font-size: 28px;
     color: #8c939d;
-    width: 50px;
-    height: 50px;
-    line-height: 50px;
+    width: 60px;
+    height: 60px;
+    line-height: 56px;
     text-align: center;
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -102,7 +102,7 @@ export default {
 }
 
 .upload-image {
-    height: 50px;
+    height: 60px;
     display: block;
     border: 1px dashed #d9d9d9;
     border-radius: 6px;

src/main/vue/src/components/VideoUpload.vue

@@ -22,7 +22,7 @@
             <i class="el-icon-loading"></i>
             <el-progress :stroke-width="4" :percentage="progress"></el-progress>
         </div>
-        <el-button v-else type="primary" size="mini" plain>上传视频 </el-button>
+        <el-button v-else type="primary" size="mini" plain>上传视频</el-button>
     </el-upload>
 </template>
 <script>

src/main/vue/src/views/organization/OrganizationEdit.vue

@@ -134,15 +134,18 @@
                     <single-upload v-model="formData.businessLicense"></single-upload>
                 </el-form-item>
             </div>
-            <el-form-item class="fixed-btn">
-                <!-- <el-button @click="readonly = false" :loading="saving" type="success">编辑</el-button> -->
-                <div style="margin: 10px">
-                    <!-- <el-button @click="onSave" :loading="saving" type="primary">保存</el-button> -->
-                    <el-button @click="onDelete" type="danger" size="mini">删除</el-button>
-                    <el-button @click="$router.go(-1)">返回</el-button>
-                </div>
-            </el-form-item>
+            <!-- <el-form-item class="fixed-btn"> -->
+            <!-- <el-button @click="readonly = false" :loading="saving" type="success">编辑</el-button> -->
+            <!-- <div style="margin: 10px"> -->
+            <!-- <el-button @click="onSave" :loading="saving" type="primary">保存</el-button> -->
+
+            <!-- </div> -->
+            <!-- </el-form-item> -->
         </el-form>
+        <div class="btn">
+            <el-button @click="onDelete" type="danger" size="mini">删除</el-button>
+            <el-button @click="$router.go(-1)">返回</el-button>
+        </div>
     </div>
 </template>
 <script>
@@ -295,6 +298,17 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    background: #ffffff;
+    height: 50px;
+    line-height: 50px;
+    z-index: 999;
+    margin-left: -20px;
+    padding-left: 20px;
+}
 .info-content {
     // background: #f5f7fa;
     padding: 39px 25px 25px;

src/main/vue/src/views/performance/ProgrammeEdit.vue

@@ -32,6 +32,7 @@
                                 class="width"
                                 v-model="formData.specialtyId"
                                 :props="optionProps"
+                                @change="change"
                                 :options="artTypes"
                                 :show-all-levels="false"
                                 placeholder="请选择专业"
@@ -93,7 +94,37 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="durationOfWork" label="作品时长">
+                        <el-form-item
+                            prop="durationOfWork"
+                            label="作品时长"
+                            v-if="
+                                code != 187 &&
+                                    code != 188 &&
+                                    code != 189 &&
+                                    code != 190 &&
+                                    code != 191 &&
+                                    code != 192 &&
+                                    code != 193 &&
+                                    code != 194 &&
+                                    code != 589 &&
+                                    code != 590 &&
+                                    code != 591 &&
+                                    code != 592 &&
+                                    code != 593 &&
+                                    code != 594 &&
+                                    code != 595 &&
+                                    code != 596 &&
+                                    code != 597 &&
+                                    code != 598 &&
+                                    code != 599 &&
+                                    code != 600 &&
+                                    code != 601 &&
+                                    code != 602 &&
+                                    code != 603 &&
+                                    code != 604 &&
+                                    code != 605
+                            "
+                        >
                             <el-input-number
                                 type="number"
                                 v-model="formData.durationOfWork"
@@ -103,7 +134,41 @@
                         <el-form-item prop="instructor" label="指导老师">
                             <el-input v-model="formData.instructor" class="width"></el-input>
                         </el-form-item>
-                        <el-form-item prop="video" label="作品视频">
+
+                        <el-form-item
+                            prop="annex"
+                            label="作品图片"
+                            v-if="
+                                code == 187 ||
+                                    code == 188 ||
+                                    code == 189 ||
+                                    code == 190 ||
+                                    code == 191 ||
+                                    code == 192 ||
+                                    code == 193 ||
+                                    code == 194 ||
+                                    code == 589 ||
+                                    code == 590 ||
+                                    code == 591 ||
+                                    code == 592 ||
+                                    code == 593 ||
+                                    code == 594 ||
+                                    code == 595 ||
+                                    code == 596 ||
+                                    code == 597 ||
+                                    code == 598 ||
+                                    code == 599 ||
+                                    code == 600 ||
+                                    code == 601 ||
+                                    code == 602 ||
+                                    code == 603 ||
+                                    code == 604 ||
+                                    code == 605
+                            "
+                        >
+                            <single-upload v-model="formData.annex"></single-upload>
+                        </el-form-item>
+                        <el-form-item prop="video" label="作品视频" v-else>
                             <video-upload v-model="formData.video" class="width"></video-upload>
                         </el-form-item>
                     </el-card>
@@ -240,7 +305,7 @@ export default {
                 .get('programme/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
-
+                    console.log(res);
                     this.$http
                         .post(
                             '/participant/all',
@@ -368,6 +433,7 @@ export default {
         return {
             saving: false,
             formData: {},
+            code: '',
             rules: {
                 phone: [
                     {
@@ -428,6 +494,10 @@ export default {
         }
     },
     methods: {
+        change(e) {
+            this.code = e;
+            console.log(this.code);
+        },
         onSave(isSubmit) {
             // this.$refs.form.validate(valid => {
             //     if (valid) {
@@ -598,7 +668,8 @@ export default {
         padding-left: 10px;
     }
     .del {
-        margin-left: 25px;
+        margin-left: 10px;
+        // text-align: right;
     }
     .sex {
         width: 90px;

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -198,7 +198,12 @@
                     <el-button type="success" @click="editRow(row)" size="mini" plain v-if="row.status == 0"
                         >编辑</el-button
                     >
-                    <el-button type="warning" @click="playVideo(row)" size="mini" plain>浏览视频</el-button>
+                    <el-button type="warning" @click="playVideo(row)" v-if="row.video" size="mini" plain
+                        >浏览视频</el-button
+                    >
+                    <el-button type="warning" @click="playImg(row)" v-if="!row.video" size="mini" plain
+                        >浏览图片</el-button
+                    >
                     <el-button @click="showCode(row)" type="primary" size="mini" plain>查看二维码</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
@@ -245,6 +250,9 @@
                 您的浏览器不支持 video 标签。
             </video>
         </el-dialog>
+        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showImg" width="40%">
+            <img style="height: 100%; max-width: 100%" :src="annex" alt="" />
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -291,7 +299,9 @@ export default {
             },
             specialtyId: '',
             showViedo: false,
+            showImg: false,
             videoUrl: '',
+            annex: '',
             name: '',
             instructor: '',
             uploadUrl: '',
@@ -305,6 +315,7 @@ export default {
         this.$http
             .post('/setting/byFlag', { flag: 3 })
             .then(res => {
+                // console.log(res);
                 if (res.length > 0) {
                     res.forEach(item => {
                         this.levelSingleOptions.push({
@@ -325,6 +336,7 @@ export default {
         this.$http
             .post('/setting/byFlag', { flag: 4 })
             .then(res => {
+                // console.log(res);
                 if (res.length > 0) {
                     res.forEach(item => {
                         this.levelCollectiveOptions.push({
@@ -342,6 +354,7 @@ export default {
         this.$http
             .post('/gradingOrganization/all', { size: 1000, query: { del: false } }, { body: 'json' })
             .then(res => {
+                // console.log(res);
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
                         this.gradingOrganizationIdOptions.push({
@@ -368,6 +381,7 @@ export default {
                 { body: 'json' }
             )
             .then(res => {
+                // console.log(res);
                 if (res.content.length > 0) {
                     // res.content.forEach(item => {
                     //     this.performances.push({
@@ -619,7 +633,11 @@ export default {
         playVideo(row) {
             this.showViedo = true;
             this.videoUrl = row.video;
-            console.log(this.videoUrl);
+        },
+        playImg(row) {
+            console.log(row);
+            this.showImg = true;
+            this.annex = row.annex;
         },
         upload() {},
         onfail(e) {

src/main/vue/src/views/performance/ProgrammeShow.vue

@@ -86,13 +86,16 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="durationOfWork" label="作品时长">
+                        <el-form-item prop="durationOfWork" label="作品时长" v-if="formData.video">
                             <el-input v-model="formData.durationOfWork" class="width" readonly></el-input>
                         </el-form-item>
                         <el-form-item prop="instructor" label="指导老师">
                             <el-input v-model="formData.instructor" class="width" readonly></el-input>
                         </el-form-item>
-                        <el-form-item prop="video" label="作品视频">
+                        <el-form-item prop="annex" label="作品图片" v-if="formData.annex">
+                            <img class="imgBox" :src="formData.annex" alt="" />
+                        </el-form-item>
+                        <el-form-item prop="video" label="作品视频" v-if="formData.video">
                             <video-upload v-model="formData.video" class="width" :readonly="true"></video-upload>
                         </el-form-item>
                     </el-card>
@@ -206,6 +209,7 @@ export default {
             this.$http
                 .get('programme/get/' + this.$route.query.id)
                 .then(res => {
+                    console.log(res);
                     this.formData = res;
                     console.log(res);
                     this.$http
@@ -309,6 +313,7 @@ export default {
         return {
             saving: false,
             formData: {},
+            level: '',
             rules: {
                 phone: [
                     {
@@ -456,6 +461,11 @@ export default {
 /deep/ .el-timeline-item {
     padding-bottom: 35px;
 }
+.imgBox {
+    width: 178px;
+    height: 178px;
+    border-radius: 4px;
+}
 .btn {
     position: fixed;
     bottom: 0;