Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc

psdc-ui/src/App.vue

@@ -20,4 +20,11 @@ onMounted(() => {
     padding: 0;
     box-sizing:border-box;
   }
+  h2{
+    margin: 0;
+  }
+  body{
+    color: #f3ffff;
+    font-size: 14px;
+  }
 </style>

psdc-ui/src/router/index.js

@@ -59,15 +59,13 @@ export const constantRoutes = [
   },
   {
     path: '',
-    component: Layout,
-    redirect: '/index',
     children: [
       {
-        path: '/index',
-        component: () => import('@/views/index'),
-        name: 'Index',
+        path: 'bigview',
+        component: () => import('@/views/bigview/index'),
+        name: 'bigview',
         meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
+      },
     ]
   },
   {

psdc-ui/src/views/analyse/nhfx/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container home">
-    <h1>这是能源控制页</h1>
+    <h1>能耗分析</h1>
   </div>
 </template>
 

psdc-ui/src/views/analyse/nhtj/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>能耗统计</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/bigview/index.vue

@@ -0,0 +1,113 @@
+<template>
+  <div class="home">
+    <div class="header">
+      <h2>电能替代分布式控制试验平台</h2>
+      <router-link :to="{path:'control/manual'}" tag="div" class="back">返回后台</router-link>
+    </div>
+    <div class="main">
+      <div class="left">
+        <div class="left_top">
+          <div class="title">电磁锅炉</div>
+        </div>
+        <div class="left_bottom"></div>
+      </div>
+      <div class="middle"></div>
+      <div class="right">
+        <div class="right_top"></div>
+        <div class="right_bottom"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+.home{
+  height: 100%;
+  background-image: url("../../assets/images/bg.png");
+  background-size: 100% 100%;
+  .header{
+    position: relative;
+    width: 100%;
+    height: 70px;
+    background-image: url("../../assets/images/headtitle.png");
+    background-size: 100% 100%;
+    h2{
+      font-size: 36px;
+      color: #AFEAFF;
+      font-weight: bold;
+      text-align: center;
+      line-height: 70px;
+    }
+    .back{
+      position: absolute;
+      top: 5px;
+      right: 20px;
+      font-size: 16px;
+      color: #fff;
+      padding: 8px 15px;
+      background-color: #2c3e50;
+    }
+  }
+  .main{
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: nowrap;
+    padding: 0 20px;
+    width: 100%;
+    height: calc(100% - 70px);
+    .left{
+      width: 24%;
+      height: 100%;
+      .left_top{
+        width: 100%;
+        height: 49%;
+        border: 1px solid red;
+        margin-bottom: 4%;
+      }
+      .left_bottom{
+        width: 100%;
+        height: 49%;
+        border: 1px solid red;
+      }
+    }
+    .middle{
+      width: 50.5%;
+      height: 100%;
+      border: 1px solid red;
+    }
+    .right{
+      width: 24%;
+      height: 100%;
+      .right_top{
+        width: 100%;
+        height: 49%;
+        border: 1px solid red;
+        margin-bottom: 4%;
+      }
+      .right_bottom{
+        width: 100%;
+        height: 49%;
+        border: 1px solid red;
+      }
+    }
+  }
+}
+.title{
+  width: 45%;
+  height: 30px;
+  margin: 0 auto;
+  color: #19C3F4;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
+  background-image: url("../../assets/images/wrappertitle.png");
+  background-size: 100% 100%;
+}
+</style>
+

psdc-ui/src/views/control/manual/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>手动控制</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/control/timer/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>定时控制</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/emonitor/db/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>电表</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/emonitor/drgl/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>电热锅炉</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/emonitor/frdl/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>发热电缆</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/emonitor/kqyrb/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>空气源热泵</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/emonitor/sp/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>沙盘</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/emonitor/wdcgq/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>温度传感器</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/emonitor/xrgl/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>蓄热锅炉</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/error/404.vue

@@ -17,7 +17,7 @@
         <div class="bullshit__info">
           对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
         </div>
-        <router-link to="/controller" class="bullshit__return-home">
+        <router-link to="/control/manual" class="bullshit__return-home">
           返回首页
         </router-link>
       </div>

psdc-ui/src/views/login.vue

@@ -1,63 +1,68 @@
 <template>
   <div class="login">
     <h2>电能替代分布式控制试验平台</h2>
-    <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">用户登录</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          size="large"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          size="large"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter="handleLogin"
-        >
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          size="large"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter="handleLogin"
-        >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="large"
-          type="primary"
-          style="width:100%;"
-          @click.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
+    <div class="loginBox">
+      <div class="dianzhui"></div>
+      <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
+        <h3 class="title">用户登录</h3>
+        <el-form-item prop="username">
+          <el-input
+              v-model="loginForm.username"
+              type="text"
+              size="large"
+              auto-complete="off"
+              placeholder="账号"
+          >
+            <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input
+              v-model="loginForm.password"
+              type="password"
+              size="large"
+              auto-complete="off"
+              placeholder="密码"
+              @keyup.enter="handleLogin"
+          >
+            <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="code" v-if="captchaEnabled">
+          <el-input
+              v-model="loginForm.code"
+              size="large"
+              auto-complete="off"
+              placeholder="验证码"
+              style="width: 63%"
+              @keyup.enter="handleLogin"
+          >
+            <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
+          </el-input>
+          <div class="login-code">
+            <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+          </div>
+        </el-form-item>
+        <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+        <el-form-item style="width:100%;">
+          <el-button
+              :loading="loading"
+              size="large"
+              type="primary"
+              style="width:100%;"
+              @click.prevent="handleLogin"
+          >
+            <span v-if="!loading">登 录</span>
+            <span v-else>登 录 中...</span>
+          </el-button>
+          <div style="float: right;" v-if="register">
+            <router-link class="link-type" :to="'/register'">立即注册</router-link>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+
+
     <!--  底部  -->
     <div class="el-login-footer">
 <!--      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>-->
@@ -156,39 +161,70 @@ getCookie();
   height: 100%;
   background-image: url("../assets/images/bg.png");
   background-size: cover;
+  padding-top: 50px;
   h2{
     text-align: center;
     font-size: 36px;
     font-weight: bold;
     color: #AFEAFF;
-    margin:20px 0 50px 0;
+    margin:0px 0 50px 0;
+  }
+  .loginBox{
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    width: 400px;
+    .dianzhui{
+      width: 100%;
+      height: 20px;
+      background-image: url("../assets/images/1.png");
+      background-size: 100% 100%;
+      margin-bottom: 10px;
+    }
+    .login-form {
+      border-radius: 4px;
+      background-image: url("../assets/images/5.png");
+      background-size: 100% 100%;
+      padding: 25px 25px 5px 25px;
+      .title {
+        font-size: 24px;
+        font-weight: bold;
+        margin: 0px auto 30px auto;
+        text-align: center;
+        color: #9BCDFF;
+      }
+      .el-input {
+        height: 40px;
+        input {
+          height: 40px;
+        }
+      }
+      .input-icon {
+        height: 39px;
+        width: 14px;
+        margin-left: 0px;
+      }
+    }
   }
 }
-.title {
-  font-size: 24px;
-  font-weight: bold;
-  margin: 0px auto 30px auto;
-  text-align: center;
+
+::v-deep .el-input__prefix{
+  color: #1678C0;
+}
+::v-deep .el-input__inner{
+  color: #1678C0;
+}
+::v-deep .el-input__wrapper{
+  border: 1px solid #1678C0 !important;
+  border-radius: 5px;
+  background-color: #1B2553 !important;
+}
+::v-deep .el-checkbox__input.is-checked+.el-checkbox__label{
   color: #9BCDFF;
 }
-
-.login-form {
-  border-radius: 4px;
-  background-image: url("../assets/images/5.png");
-  background-size: 100% 100%;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 40px;
-    input {
-      height: 40px;
-    }
-  }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 0px;
-  }
+::v-deep .el-button.el-button--primary.el-button--large{
+  background-image: linear-gradient(#339BF6,#336FF6);
 }
 .login-tip {
   font-size: 13px;

psdc-ui/src/views/system/cl/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>策略管理</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+

psdc-ui/src/views/system/tactics/index.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="app-container home">
+    <h1>策略管理</h1>
+  </div>
+</template>
+
+<script setup name="Index">
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+</style>
+