修改页面

ruoyi-ui/src/api/dataEngine/index.js

@@ -2,16 +2,22 @@ import request from '@/utils/request'
 
 export function tableInfoList() {
   return request({
-    url: '/tableInfo/tableInfoList?databaseName=zkqy-call',
+
+    // url: '/tableInfo/tableInfoList?databaseName=zkqy-call',
+
+    url: '/tableInfo/tableInfoList?databaseName=',
+
     method: 'get',
     baseURL:process.env.VUE_APP_BASE_API2
   })
 }
 
+
 export function removeTable(tableName) {
   return request({
     url: '/tableInfo/removeTable/' + tableName,
     method: 'get',
     baseURL:process.env.VUE_APP_BASE_API2
   })
-}
+}
+

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -73,7 +73,7 @@
 
     .el-menu-item, .el-submenu__title {
       overflow: hidden !important;
-      text-overflow: ellipsis !important;
+      // text-overflow: ellipsis !important;
       white-space: nowrap !important;
     }
 
@@ -118,7 +118,6 @@
     }
 
     .submenu-title-noDropdown {
-      padding: 0 !important;
       position: relative;
 
       .el-tooltip {

ruoyi-ui/src/assets/styles/variables.scss

@@ -38,7 +38,7 @@ $base-sub-menu-hover: #373f78;
 // $base-sub-menu-hover:#001528;
 // */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 218px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

ruoyi-ui/src/components/TopNav/index.vue

@@ -197,7 +197,7 @@ export default {
   height: 50px !important;
   line-height: 50px !important;
   color: #999093 !important;
-  padding: 0 5px !important;
+  padding: 0 96px !important;
   margin: 0 10px !important;
 }
 .sidebar-logo-container[data-v-6494804b] {
@@ -215,7 +215,7 @@ export default {
   border-radius: 10px;
   /* background:   linear-gradient(to right, #2b3fed, #2a81e4) !important; */
   line-height:45px;
-  text-align: center;
+  text-align: left;
   box-sizing:inherit;
   color:#a6b2d9 !important;
 }
@@ -253,7 +253,7 @@ element.style {
 }
 
 .submenu-title-noDropdown {
-    padding-left: 60px !important;
+    padding-left: 40px !important;
 }
 
 

ruoyi-ui/src/layout/index.vue

@@ -2,37 +2,41 @@
   <div class="combarr">
     <div class="combar">
       <div class="bar">
-        <span>
-          <img src="../assets/images/comlo.png" alt="" class="imgg" />
-        </span>
-        <span class="spann">智能制造平台</span>
-
-        <span style="float: right; margin-right: -1000px">
-          <el-dropdown
-            class="avatar-container right-menu-item hover-effect"
-            trigger="click"
-          >
-            <div class="avatar-wrapper">
-              <img :src="avatar" class="user-avatar" />
-              <span style="">
-                <button class="jianbiase">Admin</button>
-              </span>
-              <i class="el-icon-caret-bottom" />
-            </div>
-            <el-dropdown-menu slot="dropdown" style="margin-top: -20px">
-              <router-link to="/user/profile">
-                <el-dropdown-item>个人中心</el-dropdown-item>
-              </router-link>
-              <el-dropdown-item @click.native="setting = true">
-                <span>布局设置</span>
-              </el-dropdown-item>
-              <el-dropdown-item divided @click.native="logout">
-                <span>退出登录</span>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </span>
+        
+        
       </div>
+      <el-row>
+        <el-col :span="12">
+          <span>
+            <img src="../assets/images/comlo.png" alt="" class="imgg" />
+          </span>
+        </el-col>
+        <el-col :span="4" :offset="8">
+            <el-dropdown
+              class="avatar-container right-menu-item hover-effect"
+              trigger="click"
+            >
+              <div class="avatar-wrapper">
+                <img :src="avatar" class="user-avatar" />
+                <span style="">
+                  <button class="jianbiase">Admin</button>
+                </span>
+                <i class="el-icon-caret-bottom" />
+              </div>
+              <el-dropdown-menu slot="dropdown" style="margin-top: -20px">
+                <router-link to="/user/profile">
+                  <el-dropdown-item>个人中心</el-dropdown-item>
+                </router-link>
+                <el-dropdown-item @click.native="setting = true">
+                  <span>布局设置</span>
+                </el-dropdown-item>
+                <el-dropdown-item divided @click.native="logout">
+                  <span>退出登录</span>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+        </el-col>
+      </el-row>
     </div>
     <div style="height: 100px"></div>
     <div
@@ -55,7 +59,7 @@
         class="main-container"
       >
         <div :class="{ 'fixed-header': fixedHeader }">
-          <navbar />
+          <!-- <navbar /> -->
           <tags-view v-if="needTagsView" />
         </div>
         <app-main />
@@ -153,7 +157,7 @@ export default {
 .combar {
   position: fixed;
   display: block;
-  width: 90%;
+  width: 100%;
   z-index: 1;
   background: #fff;
 }
@@ -192,6 +196,9 @@ export default {
   font-size: 18px;
   color: #7c008a;
   vertical-align: text-bottom;
+  float: right;
+  margin-right: 50px;
+  margin-top: 18px;
 }
 
 .bar {
@@ -203,7 +210,7 @@ export default {
 }
 
 .imgg {
-  width: 120px;
+  width: 353px;
   height: 45px;
   float: left;
   margin-top: 28px;

ruoyi-ui/src/views/login.vue

@@ -6,7 +6,89 @@
       :rules="loginRules"
       class="login-form"
     >
-      <img src="../assets/images/comlo.png" class="comlogo" />
+      <el-row>
+        <el-col :span="12" class="comlogo"></el-col>
+        <el-col :span="12">
+          <div class="grid-content bg-purple-dark title">
+            智能制造平台
+          </div></el-col
+        >
+      </el-row>
+      <el-row class="rowww">
+        <el-col :span="12" class="text" prop="username">用户名</el-col>
+        <el-input
+          v-model="loginForm.username"
+          type="text"
+          auto-complete="off"
+          placeholder="账号"
+          show-password
+          class="inputt"
+        />
+      </el-row>
+      <el-row class="roww">
+        <el-col :span="12" class="text" prop="password">密码</el-col>
+        <el-input
+          v-model="loginForm.password"
+          type="password"
+          auto-complete="off"
+          placeholder="密码"
+          @keyup.enter.native="handleLogin"
+          show-password
+          class="inputt"
+        >
+        </el-input>
+      </el-row>
+      <el-row class="roww">
+        <el-row>
+          <el-col class="text" prop="code">验证码</el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="18">
+            <el-input
+              v-model="loginForm.code"
+              auto-complete="off"
+              placeholder="验证码"
+              @keyup.enter.native="handleLogin"
+              class="inputt"
+              show-password
+            >
+            </el-input>
+          </el-col>
+          <el-col :span="5" :offset="1">
+            <div class="login-code">
+              <img :src="codeUrl" @click="getCode" class="login-code-img" />
+            </div>
+          </el-col>
+        </el-row>
+      </el-row>
+
+      <el-row class="bottomtext">
+        <!-- <div class="login-code">
+          <img :src="codeUrl" @click="getCode" class="login-code-img" />
+        </div> -->
+        <el-checkbox
+          v-model="loginForm.rememberMe"
+          class="aaa"
+          >在这个设备上记住我</el-checkbox
+        >
+      </el-row>
+
+
+      <el-row>
+        <el-col class="logg"  :loading="loading"
+          @click.native.prevent="handleLogin"
+          
+          >登录</el-col>
+      </el-row>
+    </el-form>
+
+    <!-- <el-form
+      ref="loginForm"
+      :model="loginForm"
+      :rules="loginRules"
+      class="login-form"
+    >
+      <img src="../assets/images/comp.png" class="comlogo" />
       <span class="title">智能制造平台</span>
       <el-form-item prop="username">
         <p style="line-height: 12px">用户名</p>
@@ -17,7 +99,7 @@
           placeholder="账号"
           show-password
         >
-          <!-- <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" /> -->
+          
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -30,7 +112,7 @@
           @keyup.enter.native="handleLogin"
           show-password
         >
-          <!-- <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" /> -->
+         
         </el-input>
       </el-form-item>
 
@@ -44,7 +126,7 @@
           @keyup.enter.native="handleLogin"
           show-password
         >
-          <!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" /> -->
+         验证码呢？上面有呀
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img" />
@@ -52,17 +134,15 @@
       </el-form-item>
       <el-checkbox
         v-model="loginForm.rememberMe"
-        style="margin: 0px 0px 25px 0px"
         class="a"
         >在这个设备上记住我</el-checkbox
       >
 
-      <el-form-item style="width: 100%">
+      <el-form-item >
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width: 100%"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
@@ -75,10 +155,10 @@
         </div>
       </el-form-item>
     </el-form>
-    <!--  底部  -->
+  
     <div class="el-login-footer">
       <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -187,82 +267,128 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+.logg{
+  margin-top:42px ;
+  margin-left:196px ;
+  width: 240px;
+  height: 54px;
+  line-height: 54px;
+  text-align: center;
+  opacity: 1;
+  border-radius: 27px;
+  background: linear-gradient(135deg, rgba(79, 138, 255, 1) 0%, rgba(75, 94, 255, 1) 100%);
+  box-shadow: 0px 4px 16px  rgba(179, 192, 231, 1);
+  color: #fff;
+  font-size: 20px;
+  font-weight: 500;
+}
+.aaa{
+  width: 248px;
+  height: 24px;
+  font-size: 16px !important;
+  font-weight: 400;
+  letter-spacing: 0px;
+  line-height: 24px;
+  color: rgba(58, 63, 99, 1);
+  text-align: left;
+  vertical-align: top;
+  margin-top: 16px;
+}
+.bottomtext {
+  margin-top: -5px !important;
+  margin-left: 58px !important;
+}
+.rowww {
+  width: 522px;
+  height: 80px;
+  margin-top: 25px;
+  margin-left: 55px;
+}
+.roww {
+  width: 522px;
+  height: 80px;
+  margin-top: 16px;
+  margin-left: 55px;
+}
+.ppp {
+  width: 522px;
+  height: 24px;
+  opacity: 1;
+  /** 文本1 */
+  font-size: 16px;
+  font-weight: 400;
+  letter-spacing: 0px;
+  line-height: 24px;
+  color: rgba(58, 63, 99, 1);
+  text-align: left;
+  vertical-align: top;
+}
+.el-input__inner{
+  width: 522px;
+  height: 54px  !important;
+}
+.inputt {
+  /* width: 522px; */
+  height: 54px;
+  border-radius: 4px;
+  background: rgba(255, 255, 255, 1);
+  border: 1px solid rgba(218, 224, 242, 1);
+  margin-top: 2px;
+}
+.inputt input{
+  width: 100%;
+}
+
 .comlogo {
-  width: 90px;
-  margin-right: 15px;
+  margin-left: 28px;
+  margin-top: 57px;
+  width: 194px;
+  height: 64px;
+  background: url(../assets/images/comp.png);
+  /* box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25); */
+  opacity: 1;
 }
 .login {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/one.jpg");
+  background-image: url("../assets/images/background.jpg");
   background-size: cover;
 }
 
 .title {
-  margin: 0px 30px 30px auto;
-  text-align: center;
-  color: #07448a;
-  font-size: 26px;
-  font-weight: bolder;
+  width: 212px;
+  height: 35px;
+  margin-top: 69px;
+  margin-left: 17px;
+  font-size: 32px;
+  font-weight: 400;
+  letter-spacing: 0px;
+  line-height: 38.4px;
+  color: rgba(7, 68, 138, 1);
+  text-align: left;
+  vertical-align: top;
+  float: left;
 }
 
 .login-form {
-  border-radius: 20px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
-
-  .el-input {
-    height: 38px;
+  margin-left: 677px;
+  margin-top:48px ;
+  width: 621px;
+  height: 624px;
+  opacity: 1;
+  border-radius: 39px;
+  background: rgba(255, 255, 255, 1);
+  float: left;
 
-    input {
-      height: 38px;
-    }
-  }
 
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
-  }
 }
 
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-
-.login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
+.login-code{
+  height: 54px;
+  opacity: 1;
 }
 
-.el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
 
-.login-code-img {
-  height: 38px;
-}
-.a {
-  float: left;
-}
 </style>

ruoyi-ui/src/views/system/data/index.vue

@@ -267,4 +267,8 @@ export default {
     text-align: left;
     padding: 10px 0 0px 0 !important;
 } */
+
+.el-form-item {
+    margin-bottom: 10px !important;
+}
 </style>

ruoyi-ui/src/views/system/processModeling/index.vue

@@ -29,6 +29,7 @@ export default {
     getFlowJson() {
       setTimeout(() => {
         const graphJson = JSON.parse(window.localStorage.getItem('graphJson'))
+        console.log(graphJson)
         if(graphJson) {
           this.initFlowImage(graphJson)
         } else {
@@ -64,7 +65,7 @@ export default {
     },
     // 改变状态
     editFlowData() {
-      const { graph } = FlowGraph
+      const { graph } = FlowGraph;
       graph.getNodes().forEach(node => {
         if(node.getData()) {
           let curStatus = node.getData().status