Merge remote-tracking branch 'origin/master'

jnpf-java-boot/jnpf-web/src/layout/classic/sidebar/Logo.vue

@@ -5,19 +5,19 @@
         <el-image class="sidebar-logo" :src="define.comUrl+sysConfig.workLogoIcon"
           v-if="sysConfig && sysConfig.workLogoIcon">
           <template slot="error">
-            <img class="sidebar-logo" src="@/assets/images/yyslogo.png" alt="">
+            <img class="sidebar-logo" src="@/assets/images/yys3.png" alt="">
           </template>
         </el-image>
-        <img src="@/assets/images/yyslogo.png" class="sidebar-logo" v-else />
+        <img src="@/assets/images/yys3.png" class="sidebar-logo" v-else />
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <el-image class="sidebar-logo" :src="define.comUrl+sysConfig.navigationIcon"
           v-if="sysConfig && sysConfig.navigationIcon">
           <template slot="error">
-            <img class="sidebar-logo" src="@/assets/images/yyslogo.png" alt="">
+            <img class="sidebar-logo" src="@/assets/images/yys3.png" alt="">
           </template>
         </el-image>
-        <img src="@/assets/images/yyslogo.png" class="sidebar-logo" v-else />
+        <img src="@/assets/images/yys3.png" class="sidebar-logo" v-else />
       </router-link>
     </transition>
   </div>
@@ -72,4 +72,4 @@ export default {
       height: 100%;
       width: 100%;
     }
-</style>
+</style>

jnpf-java-boot/jnpf-web/src/views/login/index.scss

@@ -30,7 +30,8 @@
   .login-left {
     flex: 1;
     height: 100%;
-    background: #4393FA;
+    background: linear-gradient(to right, rgb(144, 190, 247), rgb(255, 255, 255));
+    // background: #fff;
     position: relative;
     display: flex;
     align-items: center;
@@ -427,4 +428,4 @@
     height: 600px !important;
     overflow: hidden !important;
   }
-}
+}

jnpf-java-boot/jnpf-web/src/views/login/index.vue

@@ -1,28 +1,17 @@
 <template>
   <div class="login-container">
-    <!-- <div class="login-version" v-if="sysConfig && sysConfig.sysVersion">
-      <p class="login-version-text">{{sysConfig.sysVersion}}</p>
-    </div> -->
     <div class="login-left">
-      <!-- <a class="login-company-logo" target="_blank" href="https://www.jnpfsoft.com"> -->
-        <!-- <img class="login-company-logo-img" src="@/assets/images/login-company-logo.png" alt="">
-      </a> -->
-      <img class="login-banners" src="@/assets/images/bg1@2x.png" alt="">
-      <div class="login-left-txt" v-if="showTxt">
-        <!-- <p class="title1">赋能开发者，提速企业数字化，零代码实现80%的基础功能</p>
-        <p class="title2">已帮助<span>20000+</span>家企业完成数字化转型升级</p>
-        <a class="link" target="_blank" href="https://www.jnpfsoft.com">了解更多</a> -->
-      </div>
+      <img class="login-banners" alt="Woman Image" src="@/assets/images/woman.png">
     </div>
     <div class="login-content">
       <div class="login-form">
         <el-image class="login-logo" :src="define.comUrl+sysConfig.loginIcon"
           v-if="sysConfig && sysConfig.loginIcon">
           <template slot="error">
-            <img class="login-logo" src="@/assets/images/yyslogo.png" alt="">
+            <img class="login-logo" src="@/assets/images/yys2.png" alt="">
           </template>
         </el-image>
-        <img class="login-logos" src="@/assets/images/yyslogo.png" alt="" v-else>
+        <img class="login-logos" src="@/assets/images/yys2.png" alt="" v-else>
         <div v-show="!isSso && !ssoLoading">
           <div class="login-tab" :class="'active'+active">
             <a class="item" :class="{'active': active==1}"
@@ -418,13 +407,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.login-banners {  
-  width: 100%;  
-  height: 100%;
+.login-banners {
+  width: 100%;
+  // height: 100%;
 };
 .login-logos{
-  width: 100%;  
+  width: 100%;
 
 }
 @import './index.scss';
-</style>
+</style>

jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/form.vue

@@ -115,11 +115,12 @@
                 <h2>绑定物料列表</h2>
               </div>
               <el-table :data="dataForm.data" size="mini">
-                <el-table-column label="序号">
+                <el-table-column type="index" width="50" label="序号" align="center" />
+                <!-- <el-table-column label="序号">
                   <template slot-scope="scope">
                     {{ scope.row.deviceCode }}
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column label="产品编码">
                   <template slot-scope="scope">
                     {{ scope.row.materialId }}