日志完善

package.json

@@ -8,7 +8,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
-    "axios": "^0.18.0",
+    "axios": "^0.26.1",
     "babel-polyfill": "^6.26.0",
     "core-js": "^2.6.10",
     "echarts": "^4.9.0",
@@ -18,15 +18,12 @@
     "js-cookie": "^2.2.1",
     "jspdf": "^2.4.0",
     "mavon-editor": "^2.9.1",
-    "postcss-px2rem": "^0.3.0",
-    "px2rem-loader": "^0.1.9",
     "vue": "^2.6.14",
     "vue-cropperjs": "^3.0.0",
     "vue-i18n": "^8.26.5",
     "vue-pdf": "^4.3.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.3",
-    "vue-schart": "^2.0.0",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.6.2",
     "wow.js": "^1.2.2"

src/api/index.js

@@ -13,7 +13,7 @@ export default {
     logoDetail: `${host}occupationlab/sys/logo/detail`, //查看系统设置信息
     isClient: `${host}users/users/user/isClient`,
 
-    platformLogList: `${host1}/nakadai/log/platformLogList`,
+    platformLogList: `${host}nakadai/log/platformLogList`,
     //实验台
     curriculumDetail: `${host}nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
     curriculumChapter: `${host}nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构

src/pages/index/list/index.vue

@@ -592,8 +592,8 @@ export default {
                 width: 530px;
             }
             .bg4 {
-                top: -20px;
-                left: 80px;
+                top: 140px;
+                left: -20px;
                 width: 140px;
             }
             .bg5 {
@@ -606,7 +606,7 @@ export default {
                     transform: scale(1.1);
                 }
                 .bg4 {
-                    transform: translate(40px, 0px);
+                    transform: translate(40px, -70px);
                 }
                 .bg5 {
                     transform: translate(20px, -60px) scale(1.2);

src/pages/log/list/index.vue

@@ -1,21 +1,23 @@
 <template>
     <div class="wrap">
-        <el-timeline>
-            <el-timeline-item v-for="(item, i) in listData" :key="i" :timestamp="item.updateTime" placement="top" color="#007EFF">
-                <el-card>
-                    <h6>{{ platformList.find(e => e.id === item.platformId).name + item.versionName }}</h6>
-                    <img v-if="item.coverUrl" :src="item.coverUrl" alt="" class="cover">
-                    <ul class="detail">
-                      <li v-for="(item, i) in item.logContents" :key="i">
-                          <p class="name">{{ funcList.find(e => e.id === item.type).name }}</p>
-                          <div class="val">
-                            <p class="" v-for="(item, i) in item.content" :key="i">{{ item }}</p>
-                          </div>
-                      </li>
-                  </ul>
-                </el-card>
-            </el-timeline-item>
-        </el-timeline>
+        <div class="inner">
+            <el-timeline>
+                <el-timeline-item v-for="(item, i) in listData" :key="i" :timestamp="item.updateTime" placement="top" color="#007EFF">
+                    <el-card>
+                        <h6>{{ platformList.find(e => e.id === item.platformId).name + item.versionName }}</h6>
+                        <img v-if="item.coverUrl" :src="item.coverUrl" alt="" class="cover">
+                        <ul class="detail">
+                        <li v-for="(item, i) in item.logContents" :key="i">
+                            <p class="name"><img :src="require('@/assets/img/' + funcList.find(e => e.id === item.type).icon + '.png')" alt=""> {{ funcList.find(e => e.id === item.type).name }}</p>
+                            <div class="val">
+                                <p class="" v-for="(item, i) in item.content" :key="i">{{ item }}</p>
+                            </div>
+                        </li>
+                    </ul>
+                    </el-card>
+                </el-timeline-item>
+            </el-timeline>
+        </div>
     </div>
 </template>
 
@@ -30,15 +32,18 @@ export default {
             funcList: [
                 {
                     id: 0,
-                    name: '新功能'
+                    name: '新功能',
+                    icon: 'func'
                 },
                 {
                     id: 1,
-                    name: '修复'
+                    name: '修复',
+                    icon: 'bug'
                 },
                 {
                     id: 2,
-                    name: '优化'
+                    name: '优化',
+                    icon: 'optimize'
                 }
             ]
         }
@@ -64,10 +69,14 @@ export default {
 
 <style lang="scss" scoped>
 .wrap{
-    padding-top: 50px;
+    padding: 50px 0 20px;
     background-color: #fff;
+    .inner {
+        width: 1000px;
+        margin: 0 auto;
+    }
     /deep/.el-card__body {
-      padding-left: 30px;
+      padding-left: 40px;
     }
     h6 {
       margin-bottom: 15px;
@@ -82,9 +91,15 @@ export default {
             margin-bottom: 20px;
         }
         .name {
+            display: flex;
+            align-items: center;
             margin-bottom: 5px;
             font-size: 14px;
             color: $main-color;
+            img {
+                margin-right: 5px;
+                margin-left: -26px;
+            }
         }
         .val {
             font-size: 15px;

src/pages/station/preview/index.vue

@@ -291,7 +291,7 @@ export default {
                 window.open(`https://danbao.czcyedu.com/#/loginFromYyyf?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=eb7d8355119d449184c548b07dc01ed9&caseId=1198241070647873538&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=faaedd82adb9444285a5785e4a3dd4f9`);
             } else {
                 if(process.env.NODE_ENV === 'development') {
-                    href = 'http://192.168.31.125:8080/#/'
+                    href = 'http://192.168.1.103:8080/#/'
                 } else {
                     href = `${location.origin}/pyTrials` // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
                 }

src/setting.js

@@ -38,10 +38,10 @@ if (isHh) {
 } else if (isDev) {
     // 本地
     // host = "http://www.occupationlab.com:9000/";//线上
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://39.108.250.202:9000/"; // 中台测试服
     systemPath = `http://192.168.31.125:8093`
     // host = "http://192.168.31.137:9000"; // 赓
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     title = "职站";
 } else {
     console.log("其它版本");