提交

config/dev.env.js

@@ -4,7 +4,9 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"/api"',
-  EMBED_API: '"/api"',
+  BASE_API: '"http://39.100.230.190:30047/"',
+  VERSION: '"1.0"',
+  // BASE_API: '"/api"',
+  // EMBED_API: '"/api"',
   TIME_OUT: '"100000"'
 })

config/prod.env.js

@@ -1,6 +1,7 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://101.200.225.123"',
+  BASE_API: '"http://39.100.230.190:30047/"',
+  VERSION: '"1.0"',
   TIME_OUT: '"100000"'
 }

src/utils/request.js

@@ -11,8 +11,9 @@ import Router from '../router'
  * timeout = 请求超时配置
  */
 const request = axios.create({
-  baseURL: "http://81.70.84.72:30047/",
+  // baseURL: "http://81.70.84.72:30047/",
   // baseURL: "http://39.100.230.190:30047/",
+  baseURL: process.env.BASE_API,
   timeout: process.env.TIME_OUT
 })
 let spinTime = 0

src/views/sqpScreen/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="screen">
     <div class="top">
-      <div class="title">SQP视板</div>
+      <div class="title">SQP视板({{version}})</div>
       <div class="content">
         <div class="left selectStyle">
           周次{{ workNo }}
@@ -179,6 +179,7 @@
               短期措施
             </div>
             <div class="ms">措施描述：{{ cs.shortLsolution }}</div>
+            <div class="ms">根本原因：{{ cs.shortCause || '' }}</div>
             <div class="line">计划时间：{{ cs.shortPlanFinishTime }}</div>
             <div class="line">
               状态：{{ toStatus(cs.shortSolutionStatus) }} 责任人：{{
@@ -192,6 +193,7 @@
               长期措施
             </div>
             <div class="ms">措施描述：{{ cs.longLsolution }}</div>
+            <div class="ms">根本原因：{{ cs.longCause || '' }}</div>
             <div class="line">计划时间：{{ cs.longPlanFinishTime }}</div>
             <div class="line">
               状态：{{ toStatus(cs.longSolutionStatus) }} 责任人：{{
@@ -247,6 +249,7 @@ export default {
   },
   data() {
     return {
+      version: process.env.VERSION,
       showStopTime: "",
       showTime: "",
       showPart: "",
@@ -752,8 +755,17 @@ export default {
       }
     }
 
+    // .ms {
+    //   height: calc(100% - 18vh);
+    //   width: 90%;
+    //   margin: 0 auto;
+    //   margin-top: 2.5vh;
+    //   font-size: 14px;
+    //   font-family: Adobe Heiti Std;
+    //   color: #ffffff;
+    // }
     .ms {
-      height: calc(100% - 16.5vh);
+      height: calc(100% - 26vh);
       width: 90%;
       margin: 0 auto;
       margin-top: 2.5vh;