睿德看板修改，增加欢迎词

package.json

@@ -3,8 +3,8 @@
   "version": "1.5.1",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "serve": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

src/assets/scss/index.scss

@@ -12,10 +12,19 @@
   .bg {
     width: 100%;
     height: 100%;
-    padding: 16px 16px 0 16px;
+    padding: 19px 16px 0 16px;
     background-image: url("../assets/pageBg.png");
     background-size: cover;
     background-position: center center;
+
+    .welcome{
+      font-size: 36px;
+      color: #f30606;
+      margin-bottom: -8px;
+      font-weight: bold;
+      letter-spacing: 3px;
+      text-align: center;
+    }
   }
 
   .host-body {
@@ -123,7 +132,7 @@
     }
 
     .body-box {
-      margin-top: 8px;
+      margin-top: 3px;
       display: flex;
       flex-direction: column;
 
@@ -136,7 +145,7 @@
 
       // 底部数据
       .bottom-box {
-        margin-top: 5px;
+        margin-top: 2px;
         display: grid;
         grid-template-columns: 10fr 4fr;
       }

src/views/index.vue

@@ -2,103 +2,108 @@
   <div id="index" ref="appRef">
     <div class="bg">
       <dv-loading v-if="loading">Loading...</dv-loading>
-      <div v-else class="host-body">
-        <div class="d-flex jc-center">
-          <dv-decoration-10 class="dv-dec-10" />
+      <div v-else >
+        <div class="welcome">
+          {{this.welwords}}
+        </div>
+        <div  class="host-body">
           <div class="d-flex jc-center">
-            <dv-decoration-8 class="dv-dec-8" :color="decorationColor" />
-            <div class="title">
-              <span class="title-text">UAS-MES可视化平台</span>
-              <dv-decoration-6
-                class="dv-dec-6"
+            <dv-decoration-10 class="dv-dec-10" />
+            <div class="d-flex jc-center">
+              <dv-decoration-8 class="dv-dec-8" :color="decorationColor" />
+              <div class="title">
+                <span class="title-text">UAS-MES可视化平台</span>
+                <dv-decoration-6
+                  class="dv-dec-6"
+                  :reverse="true"
+                  :color="['#50e3c2', '#67a1e5']"
+                />
+              </div>
+              <dv-decoration-8
+                class="dv-dec-8"
                 :reverse="true"
-                :color="['#50e3c2', '#67a1e5']"
+                :color="decorationColor"
               />
             </div>
-            <dv-decoration-8
-              class="dv-dec-8"
-              :reverse="true"
-              :color="decorationColor"
-            />
+            <dv-decoration-10 class="dv-dec-10-s" />
           </div>
-          <dv-decoration-10 class="dv-dec-10-s" />
-        </div>
 
-        <!-- 第二行 -->
-        <div class="d-flex jc-between px-2">
-          <div class="d-flex aside-width">
-            <div class="react-left ml-4 react-l-s bg-color-blue">
-              <span class="react-left"></span>
-              <span class="text">惠州市睿兴元技术有限公司</span>
+          <!-- 第二行 -->
+          <div class="d-flex jc-between px-2">
+            <div class="d-flex aside-width">
+              <div class="react-left ml-4 react-l-s bg-color-blue">
+                <span class="react-left"></span>
+                <span class="text">惠州市睿兴元技术有限公司</span>
+              </div>
+              <div class="react-left ml-3">
+                <span class="text">生产实况分析{{slevel}}</span>
+              </div>
             </div>
-            <div class="react-left ml-3">
-              <span class="text">生产实况分析{{slevel}}</span>
+            <div class="d-flex aside-width">
+              <div class="react-right bg-color-r mr-3">
+                <span class="text ">品质趋势分析</span>
+              </div>
+              <div class="react-right mr-4 react-l-s">
+                <span class="react-after"></span>
+                <span class="text"
+                  >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
+                >
+              </div>
             </div>
           </div>
-          <div class="d-flex aside-width">
-            <div class="react-right bg-color-r mr-3">
-              <span class="text ">品质趋势分析</span>
-            </div>
-            <div class="react-right mr-4 react-l-s">
-              <span class="react-after"></span>
-              <span class="text"
-                >{{ dateYear }} {{ dateWeek }} {{ dateDay }}</span
-              >
-            </div>
-          </div>
-        </div>
 
-        <div class="body-box">
-          <!-- 第三行数据 -->
-          <div class="content-box">
-            <div style="margin:0px 5px 0px 0px;">
-              <dv-border-box-12>
-                <centerLeft_two />
-              </dv-border-box-12>
-            </div>
-            <div>
-              <dv-border-box-12 :color="box10Color">
-                <centerLeft1 />
-              </dv-border-box-12>
-            </div>
-            <!-- 中间 -->
-            <div>
-              <dv-border-box-12>
-                <center />
-              </dv-border-box-12>
+          <div class="body-box">
+            <!-- 第三行数据 -->
+            <div class="content-box">
+              <div style="margin:0px 5px 0px 0px;">
+                <dv-border-box-12>
+                  <centerLeft_two />
+                </dv-border-box-12>
+              </div>
+              <div>
+                <dv-border-box-12 :color="box10Color">
+                  <centerLeft1 />
+                </dv-border-box-12>
+              </div>
+              <!-- 中间 -->
+              <div>
+                <dv-border-box-12>
+                  <center />
+                </dv-border-box-12>
+              </div>
+              <!-- 中间 -->
+              <div>
+                <dv-border-box-12>
+                 <centerRight2 />
+                </dv-border-box-12>
+              </div>
+              <div>
+                <dv-border-box-12>
+                  <centerOldData/>
+                </dv-border-box-12>
+              </div>
+              <div>
+                <dv-border-box-12>
+                  <bottomRight2/>
+                </dv-border-box-12>
+              </div>
             </div>
-            <!-- 中间 -->
-            <div>
+
+            <!-- 第四行数据 -->
+            <div class="bottom-box">
               <dv-border-box-12>
-               <centerRight2 />
+                <bottomLeft2 />
               </dv-border-box-12>
-            </div>
-            <div>
+             <!-- <dv-border-box-13>
+                <bottomRightNg />
+              </dv-border-box-13>-->
+              <!--<dv-border-box-13>
+                <centerRight1 />
+              </dv-border-box-13>-->
               <dv-border-box-12>
-                <centerOldData/>
+                <bottomRight />
               </dv-border-box-12>
             </div>
-            <div>
-              <dv-border-box-12>
-                <bottomRight2/>
-              </dv-border-box-12>
-            </div>
-          </div>
-
-          <!-- 第四行数据 -->
-          <div class="bottom-box">
-            <dv-border-box-12>
-              <bottomLeft2 />
-            </dv-border-box-12>
-           <!-- <dv-border-box-13>
-              <bottomRightNg />
-            </dv-border-box-13>-->
-            <!--<dv-border-box-13>
-              <centerRight1 />
-            </dv-border-box-13>-->
-            <dv-border-box-12>
-              <bottomRight />
-            </dv-border-box-12>
           </div>
         </div>
       </div>
@@ -111,7 +116,6 @@ import drawMixin from "../utils/drawMixin";
 import { formatTime } from '../utils/index.js';
 import centerLeft1 from './centerLeft1'
 import centerLeft_two from './centerLeft_two'
-//import centerRight1 from './centerRight1'
 import centerRight2 from './centerRight2'
 import center from './center'
 import bottomLeft2 from './bottomLeft2'
@@ -132,6 +136,7 @@ export default {
       decorationColor: ['#568aea', '#000000'],
       box10Color :[],//['red', 'green'],
       slevel: '',
+      welwords:''  //欢迎词
     }
   },
   components: {
@@ -149,6 +154,7 @@ export default {
     this.timeFn()
     this.cancelLoading()
     this.showlevel()
+    this.getWelWord();
   },
   beforeDestroy () {
     clearInterval(this.timing)
@@ -173,8 +179,29 @@ export default {
       } else {
         this.slevel="";
       }
+    },
+
+    getWelWord () {
+      this.getData();
+      setInterval(() => {
+        this.getData(); //获取-数据
+      }, 30000);
+    },
+
+    async getData () {
+      await this.$http.get("kanban/datalist.action?caller=KB!WelcomeWords&_noc=1&page=1&pageSize=100&condition=1=1")
+          .then((result)=>{
+                let dataList = JSON.parse(result.data.data);
+                if(dataList.length>0){
+                  this.welwords = dataList[0].en_words_user;
+                }
+              },(result)=>{
+                console.error(result)
+              }
+          );
     }
-  }
+  },
+
 }
 </script>
 

src/views/login.vue

@@ -72,11 +72,9 @@
             submitLogin(){
                 this.$refs.loginForm.validate((valid) => {
                     if (valid) {
-                        console.log('登录',this.loginForm);
                         //?username=zhongyl&password=asd&sob=N_MES_TEST
                         this.$http.get("kanban/login.action",{params:{username:this.loginForm.username,password:this.loginForm.password,sob:this.loginForm.sob}}).then(
                             (result)=>{
-                                console.info(result.data);
                                 var res = result.data;
                                 if(res.success || "检测到您已登录本系统,请不要重复登录、打开空白页!" == res.reason) {
                                     //登录成功返回session