WQQ 1 долоо хоног өмнө
parent
commit
68726d9ff0

BIN
ruoyi-ui/src/assets/yujing/img/右箭头.png


+ 14 - 19
ruoyi-ui/src/views/YuJing/index.vue

@@ -212,7 +212,7 @@ function setLayout() {
   display: flex;
   flex-direction: column;
   .yjIndexTop {
-    height: 82px;
+    height: 7.74vh;
     width: 100%;
     background: url("../../assets/images/top-bg.png") no-repeat;
     background-size: 100% 100%;
@@ -222,22 +222,22 @@ function setLayout() {
       width: 26.5%;
       margin-left: 20px;
       .yujing-logo{
-        width: 60px;
-        height: 60px;
+        width: 3.125vw;
+        height: 5.66vh;
         position: absolute;
         top: 7px;
       }
       span{
         font-size: 28px;
-        line-height: 76px;
+        line-height: 7.17vh;
         color: #fff;
         position: absolute;
         right: 20%;
       }
     }
     .menu {
-      margin-top: 10px;
-      line-height: 45px;
+      margin-top: 0.9vh;
+      line-height: 4.25vh;
       width: 62%;
       display: flex;
       align-items: center; /* 水平居中 */
@@ -271,8 +271,8 @@ function setLayout() {
         display: flex;
         align-items: center;
         .user-avatar{
-          width: 40px;
-          height: 40px;
+          width: 2.083vw;
+          height: 3.77vh;
         }
         .user-nickname{
           font-size: 14px;
@@ -280,8 +280,8 @@ function setLayout() {
           color: #fff;
         }
         .user-icon{
-          width: 17px;
-          height: 10px;
+          width: 0.885vw;
+          height: 0.9vh;
         }
       }
     }
@@ -291,7 +291,7 @@ function setLayout() {
     flex: 1;
     display: flex;
     .leftItemClass {
-      width: 63px !important;
+      width: 3.281vw !important;
       img {
         margin: auto;
         cursor: pointer;
@@ -307,7 +307,7 @@ function setLayout() {
         position: relative;
         color: #fff;
         text-align: center;
-        line-height: 30px;
+        line-height: 2.83vh;
         font-size: 18px;
         background: url("../../assets/images/lefttitle-bg.png") no-repeat;
         background-size: 100% 100%;
@@ -319,7 +319,7 @@ function setLayout() {
         }
       }
       &.collapsed {
-        width: 63px !important;
+        width: 3.281 !important;
 
         .leftTitle {
           padding: 0 5px;
@@ -336,7 +336,7 @@ function setLayout() {
       }
       .leftTitle {
         width: 100%;
-        height: 30px;
+        height: 2.83vh;
       }
     }
     .contentRight {
@@ -353,16 +353,11 @@ function setLayout() {
 <style>
  .contentLeft .el-menu {
   height: 100%;
-  /* background: rgb(74, 147, 245); */
 }
 .contentLeft .el-menu-item.is-active {
   background-color: rgb(93, 171, 255) !important;
   color: #fff !important;
 }
-/*.contentLeft .el-sub-menu__title,
-.contentLeft .el-menu-item {
-  color: #fff;
-}*/
 
 .contentLeft .el-menu .el-menu-item:hover,
 .contentLeft .el-menu .el-sub-menu__title:hover {

+ 7 - 7
ruoyi-ui/src/views/YuJing/transaction/dutyRecord.vue

@@ -26,7 +26,7 @@
         :data="zhiBanData" 
         border 
         stripe
-        style="width: 100%;" 
+        style="width: 100%;margin-bottom: 0.9vh;" 
         :height="heightAll" 
         :header-cell-style="{
           background: '#d2eafa !important',
@@ -133,7 +133,7 @@ const handelSave = () => {};
 }
 .zhiban-content{
   width: 100%;
-  margin-bottom: 10px;
+  margin-bottom: 0.9vh;
   border: #DCDFE6 solid 1px;
   background-color: #fff;
 }
@@ -144,12 +144,12 @@ const handelSave = () => {};
   color: #333;
   font-size: 14px;
   font-weight: bolder;
-  line-height: 30PX;
-  padding-left: 10px;
+  line-height: 2.83vh;
+  padding-left: 0.9vh;
 }
 .zhiban-shuiwen-form{
   width: 100%;
-  margin: 10px auto; 
+  margin: 0.9vh auto; 
   .el-form-item {
     width: 18%;
     text-align: right !important;
@@ -163,14 +163,14 @@ const handelSave = () => {};
 }
 .zhiban-lanzao-form{
   width: 98%;
-  margin: 10px auto; 
+  margin: 0.9vh auto; 
   .el-form-item {
     width: 100%;
     text-align: right !important;
     .el-form-item__content{
       .el-input{
         width: 100% !important;
-        height: 66px !important;
+        height: 6.23vh !important;
       }
     }
   }

+ 144 - 0
ruoyi-ui/src/views/YuJing/water/monitorAlert.vue

@@ -13,6 +13,81 @@
         <img v-else src="@/assets/yujing/map/area-active.png"/>
       </div>
     </div>
+    <!-- 右边栏 -->
+     <div class="jiance-rightbox">
+      <div class="rightbox-title">
+        <img src="@/assets/yujing/img/右箭头.png" class="title-img"/>
+        <span>筛选条件</span>
+      </div>
+      <el-form :model="form" label-width="auto" label-position="right" size="small" class="jiance-form">
+        <el-form-item label="评价时间:">
+          <el-date-picker
+            v-model="form.date"
+            type="date"
+            placeholder="请选择时间"
+            style="width: 100%"
+          />
+        </el-form-item>
+        <el-form-item label="是否达标:">
+          <el-checkbox-group v-model="form.status" v-for="item in statusCheckData">
+            <el-checkbox :value="item.value" style="margin-right: 10px;">
+              {{item.name}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="水功能区:">
+          <el-select v-model="form.water" placeholder="请选择...">
+            <el-option label="Zone one" value="shanghai" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属流域:">
+          <el-checkbox-group v-model="form.type" v-for="check in liuYuCheckData">
+            <el-checkbox :value="check.value" style="margin-right: 10px;">
+              {{check.name}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="所属省份:">
+          <el-select v-model="form.region" placeholder="请选择...">
+            <el-option label="Zone one" value="shanghai" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字:">
+          <el-input v-model="form.name" placeholder="请输入关键字"/>
+        </el-form-item>
+        <div style="text-align: center;">
+          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" @click="handleReset">重置</el-button>
+        </div>
+      </el-form>
+      <div class="right-table">
+        <el-table 
+          :data="jianCeData" 
+          border 
+          stripe
+          style="width: 100%;" 
+          :height="heightAll" 
+          :header-cell-style="{
+            background: '#d2eafa !important',
+            fontSize: '12px'
+          }"
+        >
+          <el-table-column type="index" align="center"/>
+          <el-table-column prop="name" label="名称"/>
+        </el-table>
+        <el-pagination
+          v-model:current-page="pagination.currentPage"
+          v-model:page-size="pagination.pageSize"
+          :size="pagination.size"
+          :total="pagination.totalCount"
+          :disabled=false
+          background
+          layout="total, prev, pager, next"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+     </div>
     <!-- 图例 -->
     <div class="jiance-tuli">
       <div class="tuli-title">图例</div>
@@ -85,6 +160,29 @@ const mapPointData = [
     cod:8.87,
   },
 ];
+const statusCheckData = [
+  {name:"是",value:1},
+  {name:"否",value:2},
+];
+const liuYuCheckData = [
+  {name:"太湖流域",value:1},
+  {name:"东南诸河",value:2},
+];
+const form = ref({
+  date: '',
+  status: '',
+  water: '',
+  type: [],
+  region: '',
+  name: ''
+});
+const heightAll = 65.8 + 'vh';
+const jianCeData = ref([]);
+const pagination = ref({
+  currentPage: 1,
+  pageSize: 10,
+  totalCount: 0,
+});
 
 onMounted(() => {
   initMap();
@@ -153,6 +251,10 @@ const initMap = () => {
 const handleMapTools = (name) => {
   mapToolName.value = name;
 }
+const handleSearch = () => {};
+const handleReset = () => {};
+const handleSizeChange = (val) => {};
+const handleCurrentChange = (val) => {};
 </script>
 
 <style scoped lang="scss">
@@ -252,5 +354,47 @@ const handleMapTools = (name) => {
         }
     }
   }
+  .jiance-rightbox{
+    height: 100%;
+    width: 320px;
+    background-color: #fff;
+    border-radius: 5px;
+    position: absolute;
+    top: 0;
+    right: 0;
+    .rightbox-title{
+      width: 100%;
+      height: 30px;
+      background: linear-gradient(to right, #a8d2fa, #fff);
+      box-shadow: 0 5px 5px #b2d3f9;
+      position: relative;
+      .title-img{
+        width: 20px;
+        height: 20px;
+        position: absolute;
+        top: 5px;
+        left: 2%;
+      }
+      span{
+        font-size: 16px;
+        font-family: 'ALIMAMASHUHEITI';
+        color: #4a93f5;
+        line-height: 30px;
+        position: absolute;
+        left: 10%;
+      }
+    }
+    .jiance-form{
+      width: 94%;
+      margin: 2% auto;
+      .el-form-item{
+        margin-bottom: 6px !important;
+      }
+    }
+    .right-table{
+      width: 94%;
+      margin: 0 auto;
+    }
+  }
 }
 </style>