fix

src/layouts/header/index.vue

@@ -1,7 +1,13 @@
 <template>
   <div class="header">
     <div style="line-height: 60px">
-      <img class="logo"
+      <img v-if="isSq"
+           class="logo"
+           style="max-height: 100%"
+           src="/images/1.png"
+           alt="">
+      <img v-else
+           class="logo"
            :src="logoUrl" />
       <span class="title">{{ title }}</span>
     </div>
@@ -78,6 +84,7 @@ import Bus from '@/libs/bus'
 export default {
   data () {
     return {
+      isSq: Setting.isSq,
       passwordVisible: false,
       passwordForm: {
         password: "",
@@ -235,8 +242,8 @@ export default {
     background-color: #fff;
 
     .logo {
-        height: 50px;
+        max-height: 50px;
-        margin: 0 20px;
+        margin: 0 40px;
     }
 
     .title {

src/pages/achievement/info/project.vue

@@ -564,10 +564,16 @@ export default {
             show: true,
             type: 'slider',
             start: 0,
-            end: 150,
+            end: 50,
             xAxisIndex: [0],
             bottom: -10,
-          }
+          },
+          // {
+          //   type: 'inside',
+          //   show: true,
+          //   xAxisIndex: [0],
+          //   start: 0
+          // }
         ],
         xAxis: [{
           type: 'category',
@@ -589,7 +595,7 @@ export default {
               //   return value;
               // }
               return value
-            }
+            },
             // rotate: 45
           },
           data: data.map(e => e.judgmentName)

src/pages/achievement/show/index.vue

@@ -114,11 +114,13 @@
             </el-table-column>
             <el-table-column prop="judgmentName"
                              label="判分点"
+                             :key="1"
                              width="270"
                              align="center"></el-table-column>
             <el-table-column v-if='project'
                              prop="judgmentName"
                              label="考核点"
+                             :key="2"
                              align="center"
                              width="150">
               <template slot-scope="scope">
@@ -132,6 +134,7 @@
             </el-table-column>
             <el-table-column prop="ruleAnswer"
                              label="参考答案"
+                             :key="3"
                              style='word-wrap: break-word'>
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>
@@ -147,6 +150,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="userAnswer"
+                             :key="4"
                              label="学生答案">
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>
@@ -168,6 +172,7 @@
             <el-table-column v-if="!project"
                              prop="runResult"
                              label="学生运行结果"
+                             :key="5"
                              align="center">
               <template slot-scope="scope">
                 <div class="m-b-20"
@@ -183,8 +188,14 @@
                 </template>
               </template>
             </el-table-column>
+            <el-table-column prop="quesScore"
+                             label="分值"
+                             :key="6"
+                             width="80"
+                             align="center"></el-table-column>
             <el-table-column prop="score"
                              label="得分"
+                             :key="7"
                              width="80"
                              align="center"></el-table-column>
           </el-table>

src/pages/assessment/add/index.vue

@@ -30,8 +30,7 @@
                class="m-b-20">
         <div>
           <p class="m-b-20">发布方式</p>
-          <el-radio-group v-model="form.type"
+          <el-radio-group v-model="form.type">
-                          :disabled="form.id ? true : false">
             <el-radio :label="1">手动发布</el-radio>
             <el-radio :label="2">定时发布</el-radio>
           </el-radio-group>
@@ -507,10 +506,8 @@ export default {
         if (!this.form.invitationCode) return util.warningMsg("请设置邀请码");
         if (!this.form.invitationCode || String(this.form.invitationCode).length < 6 || isNaN(this.form.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码");
       }
-      if (this.form.type == 2) {
+      this.form.startTime = this.form.type == 2 ? this.startTime : ''
-        this.form.startTime = this.startTime;
+      this.form.stopTime = this.form.type == 2 ? this.stopTime : ''
-        this.form.stopTime = this.stopTime;
-      }
       let classId = [];
       let stuInfo = [];
       this.allCheckedNodes.forEach(i => {

src/pages/assessment/list/index.vue

@@ -164,7 +164,7 @@
                        label="结束时间"
                        align="center">
         <template slot-scope="scope">
-          <span>{{ transferTime(scope.row.stopTime) }}</span>
+          <span>{{ (scope.row.status == 0 && scope.row.type == 1) ? '---' : transferTime(scope.row.stopTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="倒计时"

src/pages/expSystem/list/index.vue

@@ -23,11 +23,6 @@
                       clearable></el-input>
           </li>
         </ul>
-        <div>
-          <el-button v-if="isDev"
-                     type="primary"
-                     @click="toSand">进入沙盘系统</el-button>
-        </div>
       </div>
 
       <el-table :data="systemData"
@@ -69,6 +64,7 @@
       </el-table>
       <div class="pagination">
         <el-pagination background
+                       :current-page="pageNo"
                        @current-change="handleCurrentChange"
                        layout="total, prev, pager, next"
                        :total="totals">
@@ -86,7 +82,7 @@ import Cookie from 'js-cookie'
 export default {
   data () {
     return {
-      isDev: Setting.isDev,
+      isPro: Setting.isPro,
       token: util.local.get(Setting.tokenKey),
       systemType: "",
       systemSearch: "",
@@ -158,12 +154,12 @@ export default {
     },
     // 进入系统后台
     toBackstage (row) {
-      this.$router.push(`backstage?systemId=${row.systemId}&show=1&name=${row.systemName}`)
+      if (row.systemId == 19) {
+        location.href = `${Setting.sandPath}/#/config?token=${this.token}&referrer=${encodeURIComponent(location.href)}`
+      } else {
+        this.$router.push(`backstage?systemId=${row.systemId}&show=1&name=${row.systemName}`)
+      }
     },
-    toSand () {
-      Cookie.set('sand-token', this.token)
-      window.open(`http://192.168.31.125:9520/#/product/index`)
-    }
   }
 };
 </script>

src/pages/product/show/index.vue

@@ -100,7 +100,8 @@
           <div class="courses">
             <div class="des"
                  v-html="form.mall.detailedIntroduction"></div>
-            <div class="chapter"
+            <div v-if="isCourse"
+                 class="chapter"
                  id="part1"
                  v-for="(item, i) in chapterList"
                  :key="i">
@@ -286,16 +287,18 @@ export default {
         }
         this.form = e
         this.chapterList = ''
-        e.mall.associatedProduct && this.getChapter()
         this.$nextTick(() => {
+          this.getChapter()
           this.height = document.querySelector('#fields').clientHeight + 'px'
         })
       }).catch(err => { })
     },
     // 获取章节小节
     async getChapter () {
-      let res = await this.$get(this.api.curriculumChapter + '/' + this.form.mall.associatedProduct)
+      if (this.isCourse) {
-      this.chapterList = res.chapterList
+        let res = await this.$get(this.api.curriculumChapter + '/' + this.form.mall.associatedProduct)
+        this.chapterList = res.chapterList
+      }
     },
     // tab切换
     tabChange ({ id }) {
@@ -513,7 +516,7 @@ export default {
             div,
             p,
             span {
-                font-family: PingFangSC-Regular !important;
+                font-family: PingFang SC !important;
             }
         }
         .chapters {

src/pages/station/list/index.vue

@@ -23,14 +23,18 @@
         </div>
         <div class="curs">
           <template v-if="curriculumList.length">
-            <template v-for="(item,index) in curriculumList">
+            <template v-for="(item,i) in curriculumList">
               <div class="item"
                    :title="item.curriculumName"
                    @click="goPreview(item)"
-                   :key="index"
+                   :key="i"
                    v-if="!keyword || item.curriculumName.includes(keyword)">
-                <img :src="item.coverUrl"
+                <div v-if="isSq"
-                     alt="">
+                     class="cover"
+                     :style="{backgroundImage: 'url(/images/' + i + '.png)'}"></div>
+                <div v-else
+                     class="cover"
+                     :style="{backgroundImage: 'url(' + item.coverUrl + ')'}"></div>
                 <div class="bottom">
                   <p class="text"><span>{{ item.goodsName || item.curriculumName }}</span></p>
                   <a>进入实验</a>
@@ -53,10 +57,12 @@
 </template>
 
 <script>
+import Setting from "@/setting";
 export default {
   name: "backstage",
   data () {
     return {
+      isSq: Setting.isSq,
       keyword: "",
       active: 0,
       tabs: [
@@ -183,11 +189,14 @@ export default {
             &:hover {
                 opacity: 0.9;
             }
-            img {
+            .cover {
                 width: 215px;
                 height: 118px;
                 margin-top: -20px;
                 border-radius: 12px;
+                background-size: 100% 100%;
+                background-position: 0 0;
+                background-repeat: no-repeat;
             }
             .bottom {
                 display: flex;

src/pages/station/preview/index.vue

@@ -961,7 +961,6 @@ export default {
       let token = util.local.get(Setting.tokenKey);
       let roleId = this.roleId == 4 ? 0 : 1;
       let userName = window.btoa(encodeURIComponent(this.userName));
-
       if (systemId == 11) {
         // 银行系统
         sessionStorage.removeItem('projectId')
@@ -969,7 +968,10 @@ export default {
         location.href = `${Setting.bankPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true&manager=1`
       } else if (systemId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1&mallId=${this.mallId}`);
+        window.open(`http://${Setting.zcPath}?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1&mallId=${this.mallId}${Setting.isTest ? '&beta=1' : ''}`);
+      } else if (systemId == 19) {
+        // 沙盘
+        location.href = `${Setting.sandPath}/#/?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&manager=1&referrer=${encodeURIComponent(location.href)}`
       } else if (systemId == 21) {
         window.open(`http://121.37.29.24:80/yyyflogin?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=3989a0ad671849b99dcbdcc208782333&caseId=9681f86902314b10bc752909121f9ab9&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=7ff5d4715b114b7398b6f26c20fac460`);
       } else if (systemId == 22) {

src/setting.js

@@ -8,8 +8,11 @@ const isCH = url.includes("124.71.12.62"); //巢湖版本
 const isPro = url.includes("occupationlab.com"); //职站生产
 const isZxy = url.includes("izhixinyun.com"); //智信云
 const isTest = url.includes('121.37.12.51'); //中台测试服
+const isSq = url.includes('10.20.100.204'); // 商丘
 
+let zcPath = `120.78.139.126:8879` // 众筹
 let bankPath = `${location.origin}/banksystem` // 银行系统地址
+let sandPath = `${location.origin}/sandbox` // 沙盘地址
 let jumpPath = `${location.origin}/judgmentPoint`
 let host = `${location.origin}/`
 let uploadURL = `${location.origin}/`
@@ -23,11 +26,14 @@ if (isPro) {
 } else if (isDev) {
     jumpPath = `http://${location.hostname}:8087/`
     bankPath = `http://${location.hostname}:8093`
+    sandPath = `http://${location.hostname}:9520`
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
     // host = "http://192.168.31.217:9000/"; // 榕
     // host = 'http://192.168.31.51:9000/'; // 赓
+} else if (isSq) {
+	zcPath = `10.20.100.204:8883`
 }
 
 const Setting = {
@@ -49,9 +55,12 @@ const Setting = {
     cookiesExpires: 1, // Cookies 默认保存时间，单位：天
     tokenExpires: 1296000000, // token在localStorage的时间(毫秒)
     bankPath,
+		sandPath,
     isDev,
     isTest,
     isPro,
+		isSq,
+		zcPath,
     /**
      * 路由白名单
      * */

src/styles/common.scss

@@ -4,6 +4,10 @@
     font-family: youshe;
     src: url('font/YouSheBiaoTiHei.ttf');
 }
+@font-face {
+    font-family: PingFang SC;
+    src: url('font/PingFang-Regular.otf');
+}
 
 [v-cloak] {
     display: none;