merge

.gitignore

@@ -13,9 +13,12 @@ tests/server/static/upload
 .env.local
 .env.*.local
 .eslintcache
+.env
+.env.analyze
 .env.development
+.env.lindidiaocha
+.env.tiankongdi
 .env.production
-.env
 # Log files
 npm-debug.log*
 yarn-debug.log*

src/views/demo/workflow/task/process/audit.vue

@@ -866,16 +866,10 @@
       // 根据ids获取图斑
       if (gids) {
         try {
-          let geomids = "";
-          if(gids.match(",")){
-            geomids = gids.split(",");
-          }else{
-            geomids = [gids];
-          }
           let getGeomPrams = {
             TableName: layer,
             FieldName: 'gid',
-            FieldValue: geomids,
+            FieldValue: gids?.split(","),
             page: 1,
             limit: 999,
             key: null,

src/views/demo/workflow/task/process/look.vue

@@ -479,16 +479,10 @@
       // 根据ids获取图斑
       if (gids) {
         try {
-          let geomids = "";
-          if(gids.match(",")){
-            geomids = gids.split(",");
-          }else{
-            geomids = [gids];
-          }
           let getGeomPrams = {
             TableName: layer,
             FieldName: 'gid',
-            FieldValue: geomids,
+            FieldValue: gids?.split(","),
             page: 1,
             limit: 999,
             key: null,

src/views/sys/exception/dataScreen/index.vue

@@ -14,7 +14,8 @@
         <PatchSummary :countyId="props.countyId" :landType="landType"/>
       </template>
       
-      <div class="page-turning" @click="() => firstPage = !firstPage">{{firstPage? '排名 ' : '汇总 '}}
+      <div class="page-turning" @click="() => firstPage = !firstPage">
+        <span >{{firstPage? '排名 ' : '汇总 '}}</span>
         <img src="/public/statistical/arrow.png" alt="">
       </div>
       <div class="right-decoration"></div>
@@ -55,7 +56,7 @@ const changeLandType = (value) => {
     background: linear-gradient(to right,rgba(0, 0, 0, 0),rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.9),rgba(0, 0, 0, 0.9));
     right: 0px;
     padding: 74px 42px 15px 21px;
-    padding-top:60px;
+    padding-top:80px;
     .currentCounty{
       color:#fff;
       padding:20px 0px 0px 20px;
@@ -67,8 +68,8 @@ const changeLandType = (value) => {
 // }
 .page-turning{
   position: absolute;
-  top: 31px;
-  right: 34px;
+  top: 36px;
+  right: 32px;
   width: 74px;
   height: 30px;
   background: url('@/assets/statistical/page_turning.png');

src/views/sys/exception/mapComponent/left_county.vue

@@ -177,7 +177,7 @@
           position: relative;
           // top: 20 * bi px;
           // width: 110 * bi px;
-
+          z-index:999;
           display: inline-flex;
           align-items: center;
           text-align: center;

src/views/sys/exception/mapComponent/top_title.vue

@@ -4,12 +4,12 @@
         <div class="screen-title">临沂市自然资源综合监管</div>
         <div class="left-category-container">
             <div class="category-item" v-for="(item,index) in left_categorys"
-                :style="{left:-index*20+'px'}"
+                :style="{left:-index*26+'px'}"
             >{{item.name}}</div>
         </div>
         <div class="right_category-container">
             <div class="category-item" v-for="(item,index) in right_categorys"
-                :style="{left:-index*20+'px'}"
+                :style="{left:-index*26+'px'}"
             >{{item.name}}</div>
         </div>
     </div>
@@ -44,16 +44,17 @@
   <style lang="less" scoped>
     .screen-header-container{
         width:100%;
-        height:80px;
+        height:96px;
         background-image:url("/public/statistical/header.png");
-        background-size:100% 80px;
+        background-size:100% 96px;
         position:absolute;
         top:0px;
         left:0px;
         z-index:2;
         .screen-title{
             width: 602px;
-            height: 80px;
+            height: 96px;
+            line-height:90px;
             font-family: Alibaba PuHuiTi;
             font-weight: bold;
             font-size: 45px;
@@ -66,8 +67,9 @@
         }
         .left-category-container{
             position:absolute;
-            top:38px;
-            left:100px;
+            top:50px;
+            left:50%;
+            transform: translate( calc( -50% - 580px),0);
             .category-item{
                 float:left;
                 width:138px;
@@ -75,16 +77,18 @@
                 font-size:14px;
                 line-height:32px;
                 text-align: center;
-                background-image:url("/public/statistical/category.png");
+                background-image:url("/public/statistical/category-left.png");
                 background-size:138px 32px;
                 color:#fff;
                 position:relative;
+                cursor:pointer;
             }
         }
         .right_category-container{
             position:absolute;
-            top:38px;
-            right:120px;
+            top:50px;
+            right:50%;
+            transform: translate( calc( 50% + 580px),0);
             .category-item{
                 float:left;
                 width:138px;
@@ -92,9 +96,10 @@
                 font-size:14px;
                 line-height:32px;
                 text-align: center;
-                background-image:url("/public/statistical/category.png");
+                background-image:url("/public/statistical/category-right.png");
                 background-size:138px 32px;
                 color:#fff;
+                cursor:pointer;
                 position:relative;
             }
         }