修改

src/main/h5/src/views/Home.vue

@@ -16,7 +16,7 @@
       </div>
       <div class="btn" @click="logout">切换账号</div>
     </div>
-    <div style="margin-top:20px">
+    <div style="margin-top:20px" v-if="info.video">
       <video-upload v-model="info2" class="width"></video-upload>
     </div>
     <div class="base">
@@ -115,9 +115,9 @@
               v-for="(item, index) in scores"
               :key="index"
             >
-              <div class="name">得分明细{{ index + 1 }}</div>
+              <div class="name">明细{{ index + 1 }}</div>
               <div class="val">{{ item.score }}</div>
-              <div style="margin-left:10px">{{ item.remark }}</div>
+              <div class="val">{{ item.remark }}</div>
             </div>
           </div>
         </div>
@@ -254,7 +254,6 @@ export default {
           this.info2 = {
             src: this.info.video
           };
-          console.log(this.info2);
           if (
             `${programmeId}` === this.$route.query.programmeId &&
             this.isAdmin
@@ -274,7 +273,7 @@ export default {
           this.$http
             .post("/programmeScore/breakdown?programmeId=" + programmeId)
             .then(res => {
-              console.log(res, "111");
+              // console.log(res, "111");
               this.scores = res;
             });
           // if (this.isAdmin) {
@@ -283,6 +282,7 @@ export default {
           //   .then(res => {
           //     if (res) {
           //       this.myScore = res;
+          //       console.log(this.myScore);
           //     } else {
           //       this.myScore = null;
           //     }
@@ -303,6 +303,7 @@ export default {
             this.info.performanceId
         )
         .then(res => {
+          console.log(res);
           this.relatedList = res;
           this.nowActive = res.findIndex(item => {
             return item.id === this.info.id;
@@ -549,7 +550,13 @@ export default {
         margin-top: 16px;
       }
     }
-
+    .val {
+      font-size: 18px;
+      font-weight: bold;
+      color: #000000;
+      line-height: 26px;
+      margin-left: 20px;
+    }
     border-top: 1px solid #f5f7fa;
   }
 }

src/main/h5/src/views/programme/arrangeList.vue

@@ -26,11 +26,14 @@
       >
         <div class="left">
           <div class="name">{{ item.name }}</div>
-          <div class="status">
+          <div v-for="(spec, index) in item.specialtyId" :key="index">
+            <div class="name">{{ spec }}</div>
+          </div>
+          <div class="status" v-if="item.date">
             <img src="../../assets/icon_status.svg" alt="" />
             <span>{{ item.date }}</span>
           </div>
-          <div class="status">
+          <div class="status" v-if="item.startTime && item.endTime">
             <img src="../../assets/icon_status.svg" alt="" />
             <span
               >{{ formatTime(item.startTime) }} -
@@ -98,6 +101,7 @@ export default {
         { body: "json" }
       )
       .then(res => {
+        console.log(res);
         this.tableData = res.content;
         this.empty = res.empty;
       });

src/main/h5/src/views/programme/programmeDetail.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="home">
     <div class="base">
+      <div style="margin-top:20px" v-if="info.video">
+        <video-upload v-model="info2" class="width"></video-upload>
+      </div>
       <div class="base-info">
         <div class="base-info-item">
           <div class="text1">节目名称</div>
@@ -70,18 +73,33 @@
         </div>
       </div>
     </div>
-
-    <div class="bottom" v-if="!info.second">
-      <van-button
-        @click="submitScore"
-        :disabled="!score"
-        round
-        block
-        :color="$colors.prim"
-      >
-        提交评分
-      </van-button>
-    </div>
+    <template>
+      <!-- <div class="bottom" v-if="!info.second">
+        <van-button
+          @click="submitScore"
+          :disabled="!score"
+          round
+          block
+          :color="$colors.prim"
+        >
+          提交评分
+        </van-button>
+      </div> -->
+      <div class="bottom btnList">
+        <!-- <van-button
+          v-if="nowActive !== 0"
+          @click="pre"
+          round
+          block
+          :color="$colors.prim"
+        >
+          上一个
+        </van-button> -->
+        <van-button @click="next" round block :color="$colors.prim">
+          下一个
+        </van-button>
+      </div>
+    </template>
   </div>
 </template>
 
@@ -99,6 +117,7 @@ export default {
     return {
       tab: 0,
       info: {},
+      info2: {},
       persons: [],
       isAdmin: false,
       scores: [],
@@ -121,6 +140,9 @@ export default {
             .join(" ")
         : "暂无";
     },
+    programmeId() {
+      return this.$route.query.id;
+    },
     url() {
       return (
         "http://wljtest.izouma.com/home?performanceId=" +
@@ -147,12 +169,43 @@ export default {
     }
   },
   mounted() {
-    this.getInfo();
+    this.getInfo(this.programmeId);
+    if (window.localStorage.getItem("loginPhoneToken")) {
+      this.$store.dispatch("getUserInfo");
+      this.isAdmin = true;
+    } else {
+      this.isAdmin = false;
+    }
   },
   methods: {
-    getInfo() {
-      this.$http.post("/programme/getDTO/" + this.$route.query.id).then(res => {
+    next() {
+      console.log(111);
+      // this.nowActive = this.nowActive + 1;
+      // this.persons = [];
+      // this.scores = [];
+      // this.score = "";
+      // this.myScore = null;
+      // this.isScore = false;
+      this.getInfo(1340, true);
+    },
+    pre() {
+      this.nowActive = this.nowActive - 1;
+      this.persons = [];
+      this.scores = [];
+      this.score = "";
+      this.myScore = null;
+      this.isScore = false;
+      this.getInfo(
+        this.relatedList[this.nowActive % this.relatedList.length].id,
+        true
+      );
+    },
+    getInfo(programmeId) {
+      this.$http.post("/programme/getDTO/" + programmeId).then(res => {
         this.info = res;
+        this.info2 = {
+          src: this.info.video
+        };
         this.score = "";
         this.message = "";
       });
@@ -178,6 +231,7 @@ export default {
           remark: this.message
         })
         .then(res => {
+          console.log(res);
           this.$toast.success("评分成功");
           this.getInfo();
         })

src/main/vue/src/components/ArrangeLog.vue

@@ -43,14 +43,15 @@
     </el-dialog>
 </template>
 <script>
+import pageableTable from '@/mixins/pageableTable';
 export default {
     props: ['dialogVisible'],
+    mixins: [pageableTable],
     data() {
         return {
             saving: false,
             showMore: false,
             formData: {},
-            // { required: true, pattern: /^[1][3,4,5,7,8,9][0-9]{9}$/, message: '请输入联系电话', trigger: 'blur' }
             rules: {
                 phone: [
                     {
@@ -77,7 +78,6 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    location.reload();
                     this.submit();
                 } else {
                     return false;
@@ -119,7 +119,8 @@ export default {
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
-                    // this.$router.go(-1);
+                    this.getData();
+                    this.$forceUpdate();
                     this.dialogVisible = false;
                 })
                 .catch(e => {

src/main/vue/src/components/OrganLog.vue

@@ -63,7 +63,7 @@
 <script>
 import pageableTable from '@/mixins/pageableTable';
 export default {
-    props: ['dialogVisible'],
+    props: ['dialogVisible', 'tableData'],
     mixins: [pageableTable],
     data() {
         return {
@@ -129,9 +129,15 @@ export default {
         },
         init(row) {
             this.id = row;
-            // console.log(this.id);
+            // this.emps = this.tableData.map(item => {
+            //     console.log(item);
+            //     return {
+            //         label: item.phone + '--' + item.specialtyName
+            //     };
+            // });
+            // });
             this.$http
-                .post('/user/all1', { size: 0, query: {}, size: 1000, sort: '' }, { body: 'json' })
+                .post('/user/all1', { query: {}, size: 1000, sort: '' }, { body: 'json' })
                 .then(res => {
                     this.users = res.content;
                     res.content.forEach(item => {

src/main/vue/src/plugins/http.js

@@ -5,9 +5,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://wljtest.izouma.com';
-        // baseUrl = 'http://192.168.50.190:8080';
+        baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':
         baseUrl = 'http://localhost:8080';

src/main/vue/src/views/performance/ArrangeJudgeList.vue

@@ -167,7 +167,7 @@
             >
             </el-pagination>
         </div>
-        <organ-log :dialogVisible="isShow" @close="isShow = false" ref="public"></organ-log>
+        <organ-log :tableData="tableData" :dialogVisible="isShow" @close="isShow = false" ref="public"></organ-log>
     </div>
 </template>
 <script>
@@ -224,7 +224,7 @@ export default {
             )
             .then(res => {
                 this.onlines = res.content[0].online;
-                console.log(this.onlines);
+                // console.log(this.onlines);
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
                         this.performances.push({
@@ -457,7 +457,6 @@ export default {
                 return row[item];
             });
             let info = this.getInfo(this.showTable, keys);
-            console.log(this.showTable);
             let arrid = info.list.map(item => {
                 return item.id;
             });