From b7bf4efe24a81690f55e5c083e99825519c3200f Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Thu, 9 Nov 2023 19:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/assets/images/icon-reset.png              | Bin 0 -> 838 bytes
 src/assets/images/icon-search.png             | Bin 0 -> 745 bytes
 src/views/components/dialog/index.vue         |  71 ++++----
 src/views/components/shop/components/tab2.vue | 155 +++++++++++++++++-
 src/views/components/shop/index.vue           |   3 +
 6 files changed, 197 insertions(+), 34 deletions(-)
 create mode 100644 src/assets/images/icon-reset.png
 create mode 100644 src/assets/images/icon-search.png

diff --git a/package.json b/package.json
index 75df9a4..ac41273 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
-    "leaflet": "^1.5.1",
+    "leaflet": "^1.9.4",
     "moment": "^2.29.1",
     "nprogress": "0.2.0",
     "postcss-px2rem": "^0.3.0",
diff --git a/src/assets/images/icon-reset.png b/src/assets/images/icon-reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcee63fdb553aed89ee87e1130663385e5a2fdb7
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&07*naRA@u(SV3~yKoIPa$kAXy?!m`Y0f8UD3z8oMzrgSUn-`e80P=(61?C4P
zKvj;Adq4so1De#z2FqCT?n)vqD$-FJ%}!7E&h8B1$R9fL_>ls5Z3a^YQU+pXAeB(e
z1jhb7Wx$`pTiZU(AX6paBQsYSTqMw`uwk%6pcxSj8TekdP6n~l4<vJtd4an|3q%(H
zyntm70W)U)nlaq|d&`>1?8Cmtme9yvHHmSp8u)%70*LFPQ+b>1M*$HFz{I}0X69DF
z!VVF>vCF@h$;&Pg7s;S^VAL5XJ_AD3Em<dRT@aB0Oy;W|6PkMq4nWkA>3eM7)xmrT
zpzi;l82wTqd#(c_5`cirJ4|R-EIk>Fey^H_flEIlx*)Uxh(*ajZ<{5dVUsqEs2lO8
zZ5KCe-aG}t?NTAvRbfI4!2V)!gWm=y{I1!&^%VkVO`EftWjQhsS^y^Ys>l4Odv<Xi
zwR-Fa_OLH*cJG-x<wEW%SpbXGbW1f6`Xx(m!^wgfFIED;c4I5Cpv=I&_CeH;RU28r
zG8SCs_6NycPzLZ+K0GYvb2Z%nRqV%$<t;$f`?EvNvN8Z&$11@F+4xH|gJ+d|?(8LB
z$^e9fwvOJIn?cmFDFY@d(w~jFJK$tRLK%Q;;n({9{{T3835^!ZDS^COBt^VAs>n>Y
z+9^v&*Re{lK{mS8P8q<D`LbmYiN@vr`3DD?%2h=ffY&y%IrUw*2IYLV5jE4nXTalK
zOI#F7`Rt2lfR{&|0LJs>6^KM5k~j;`uIUP=ur`1I7Mu)iYH<&>IM;M71_a{CeA!~(
zUWnTh1T{1&+TV#lM?zcM{eC#=WFcsxp<AN083+UM@cuZO`W=Xnv5H^>gh9|)g&CiM
zW=Oi3k0l|$?1Cl>nzD>E(MSw{aO5@RuF)i-&p|`05I_!?zpM?ntJ1uOB_;A62y-Z!
zbCu!l8tY-4z!POaQ!<H~C(b~k(J44f0VpKtpe88;2TiYn^OOOFBpuY`FC`qGK<6n3
QKL7v#07*qoM6N<$f~!7tG5`Po

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon-search.png b/src/assets/images/icon-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfa5956786bfb132e60476c4a6ef66ac82280ee6
GIT binary patch
literal 745
zcmV<F0v7#=P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%qe(<TRA@u(SnX{UK@1#s02M$wpo1h8Kq>$#AgLfw0igoufKUOU0_cErKsqoQ
z$r~-J_1*4zk4Mm1deZx`A0E%xYoFkOn>=v;u>&|XgF6HN1p})36u=|<-HOQV-vTxy
zAyuWbuK+v;aN;<71K<mQ>n#Cw0WinU0lcwjw+8wXfOlH}X$GLGjP&PD$8&&`)oT$U
zGt;aIfT}X;?<d_#Cf-guYyBZxasCd#57RpT)0oi53%S8HWP-8^+ad#2U4B+>p|c+V
zT!~0>{Eua}m$^drO5>hW5h3`HtpT9(jA*Ilv)0R1^_k^PdCrZ9oQAvyd<m&4%jCz3
z^Nd_qoi{eVR|-H_N-hJc$_p92+=eey)fdJ@eqNY`Dga0O;mcI@YbCjldKt|l-~p(~
zhq}LxXx5SCFst;%13>K)L~f70iqi_pUh-eXdRDTF)-%d=9ss_$)NC>~Xh)-$<oi^W
z0N6_<W3O~JdbS6k)apzCWoZuO*1y2OCIGg|0X}Bs%f3kt)S9<YwV=kGDio@2o`jfW
zWwi)VZ2)Sm$^3V~E~`B{!z?&mZ8#`Ptpo=cg2-*Ci#$j#w7^2wWVJBKh3bEb>RLO^
zs!{7AxqorawWwcKUi5VLg@{~@K447%jD=bkncvG9_ZxsT*gUZ=*85tK?;XymW&j3a
z=1g1$Jp`g@s5cPaWYwwy=1%(fH4Q{F00Th>$Og6DYWMTAji;<^c{7*J8DgRfK)T7=
zV&=w6(|hR<qn*B1u-e=Y{x&0fAULjeeK#5cP=?+BB@lOObHf6N?!IUWfL1N#>l_f>
zGCCN5tT3?i<$J@nqI<A8D1Z^>$~`-P8BvU!u`>{f-i*CF12du+Ib&xa61^FFcLrue
bF>=Ol9$^$flATG-00000NkvXXu0mjf1IJA*

literal 0
HcmV?d00001

diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 639933a..cbcaaaf 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -15,7 +15,15 @@
     :width="width"
     :style="heightStyle"
     append-to-body
-    :custom-class="type == 1 ? 'dialog-boxed': type == 2 ? 'dialog-boxed2' : type == 3 ? 'dialog-boxed3' : ''"
+    :custom-class="
+      type == 1
+        ? 'dialog-boxed'
+        : type == 2
+        ? 'dialog-boxed2'
+        : type == 3
+        ? 'dialog-boxed3'
+        : ''
+    "
   >
     <template slot="title">
       <div class="closeClick">
@@ -32,47 +40,48 @@
 export default {
   data() {
     return {
-      dialogVisible:false,
-      type:0,
-    }
+      dialogVisible: false,
+      type: 0,
+    };
   },
-  props:{
-    title:{
-      type:String,
-      default:"测试标题看看是啥样",
+  props: {
+    title: {
+      type: String,
+      default: "测试标题看看是啥样",
     },
-    width:{
-      type:String,
-      default:'50%'
+    width: {
+      type: String,
+      default: "50%",
     },
-    heightStyle:{
-      type:Object,
-      default: function(){
-        return {}
+    heightStyle: {
+      type: Object,
+      default: function () {
+        return {};
       },
     },
   },
-  methods:{
+  methods: {
     open(id) {
       this.type = Number(id);
-      this.dialogVisible = true
+      this.dialogVisible = true;
     },
     Close() {
-      this.dialogVisible = false
-    }
+      this.dialogVisible = false;
+    },
   },
-  mounted(){
+  mounted() {
     // console.log(this.type)
-  }
-}
+  },
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-dialog {
   // width: vw(878);
   // height: 520px;
   //   border: 1px solid red;
-  background-image: url('../../../assets/images/dialogbg.png');
+  background-image: url("../../../assets/images/dialogbg.png");
   background-size: 100% 100%;
+  background-color: transparent;
   .el-dialog__header {
     padding: 10px 20px;
     .closeClick {
@@ -82,27 +91,27 @@ export default {
       position: relative;
       padding-top: 10px;
       .headline {
-        background-image: url('../../../assets/images/dialogtitlebg.png');
+        background-image: url("../../../assets/images/dialogtitlebg.png");
         width: 451px;
         background-size: 100% 100%;
         padding-left: 22px;
         height: 38px;
         .headlinetitle {
           font-size: 20px;
-          font-family: 'YouSheBiaoTiHei';
+          font-family: "YouSheBiaoTiHei";
           font-weight: 400;
           // line-height: 26px;
-          color: #FFFFFF;
+          color: #ffffff;
           display: flex;
           flex: 1;
-          text-shadow: 1px 1px 0px #1A3F76;
+          text-shadow: 1px 1px 0px #1a3f76;
           &::before {
             content: attr(text);
             position: absolute;
             z-index: 10;
             color: #ffffff;
             // 渐变样式
-            background: linear-gradient(180deg, #FFFFFF 0%, #43B4C5 100%);
+            background: linear-gradient(180deg, #ffffff 0%, #43b4c5 100%);
             -webkit-background-clip: text;
             color: transparent;
             // 去除继承父级样式
@@ -125,7 +134,7 @@ export default {
   }
 }
 ::v-deep .dialog-boxed {
-  background-image: url('../../../assets/images/dialogbg/dialog13.png');
+  background-image: url("../../../assets/images/dialogbg/dialog13.png");
   .el-dialog__header {
     .closeClick {
       .close {
@@ -140,10 +149,10 @@ export default {
   }
 }
 ::v-deep .dialog-boxed2 {
-  background-image: url('../../../assets/images/dialogbg/dialog2.png');
+  background-image: url("../../../assets/images/dialogbg/dialog2.png");
 }
 ::v-deep .dialog-boxed3 {
-  background-image: url('../../../assets/images/dialogbg/792@2x.png');
+  background-image: url("../../../assets/images/dialogbg/792@2x.png");
   .el-dialog__header {
     .closeClick {
       .close {
diff --git a/src/views/components/shop/components/tab2.vue b/src/views/components/shop/components/tab2.vue
index 60265f6..0900da6 100644
--- a/src/views/components/shop/components/tab2.vue
+++ b/src/views/components/shop/components/tab2.vue
@@ -1,7 +1,158 @@
-<template></template>
+<template>
+  <div>
+    <div>
+      <div class="title">
+        <span class="icon-bar"></span>
+        <span class="subtitle">安全生产摸排</span>
+      </div>
+    </div>
+    <div class="search-gr">
+      <div class="btn-reset">
+        <div class="icon-reset"></div>
+        <span class="text">重置</span>
+      </div>
+      <div class="btn-search">
+        <div class="icon-search"></div>
+        <span class="text">查询</span>
+      </div>
+    </div>
+    <div>
+      <div class="tb-header">
+        <span>执法人员</span>
+        <span>网格</span>
+        <span>安全生产排查日期</span>
+        <span>是否发现隐患</span>
+        <span>是否发起整改工单</span>
+      </div>
+      <div class="tb-content">
+        <span>张天</span>
+        <span>网格1</span>
+        <span>2023-09-12</span>
+        <span>否</span>
+        <span>否</span>
+      </div>
+      <div class="tb-content_">
+        <span>张天</span>
+        <span>网格1</span>
+        <span>2023-09-12</span>
+        <span>否</span>
+        <span>否</span>
+      </div>
+    </div>
+  </div>
+</template>
 
 <script>
 export default {};
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.title {
+  margin-bottom: 14px;
+  display: flex;
+  align-items: center;
+
+  .icon-bar {
+    width: 4px;
+    height: 12px;
+    background-color: #5ba1d2;
+    display: block;
+  }
+
+  .subtitle {
+    margin-left: 10px;
+    font-size: 14px;
+    font-family: Source Han Sans-Medium, Source Han Sans;
+    color: #e9f4ff;
+  }
+}
+
+.search-gr {
+  display: flex;
+  margin: 10px 64px;
+  .btn-reset {
+    display: flex;
+    align-items: center;
+    border-radius: 2px 2px 2px 2px;
+    border: 1px solid rgba(181, 207, 255, 0.5);
+    .icon-reset {
+      width: 24px;
+      height: 24px;
+      background-image: url("../../../../assets/images/icon-reset.png");
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+    }
+
+    .text {
+      margin-left: 10px;
+      font-size: 14px;
+      font-family: Source Han Sans-Regular, Source Han Sans;
+      color: #d3eef2;
+    }
+  }
+  .btn-search {
+    display: flex;
+    align-items: center;
+    padding: 4px 16px;
+    background: rgba(255, 125, 64, 0.8);
+    box-shadow: inset 0px 0px 13px 0px #f6b463;
+    border-radius: 2px 2px 2px 2px;
+    border: 1px solid rgba(181, 207, 255, 0.5);
+    .icon-search {
+      width: 24px;
+      height: 24px;
+      background-image: url("../../../../assets/images/icon-search.png");
+      background-size: 100% 100%;
+      background-repeat: no-repeat;
+    }
+
+    .text {
+      margin-left: 10px;
+      font-size: 14px;
+      font-family: Source Han Sans-Regular, Source Han Sans;
+      color: #d3eef2;
+    }
+  }
+}
+.tb-header {
+  width: 100%;
+  background: rgba(7, 127, 255, 0.1608);
+  display: flex;
+  border-top: 1px solid #077fff;
+  padding: 10px 20px;
+  span {
+    flex: 1;
+    font-size: 14px;
+    font-family: Source Han Sans-Regular, Source Han Sans;
+    font-weight: 400;
+    color: #d3eef2;
+  }
+}
+
+.tb-content {
+  width: 100%;
+  background: rgba(216, 216, 216, 0.1);
+  display: flex;
+  padding: 10px 20px;
+  span {
+    flex: 1;
+    font-size: 14px;
+    font-family: Source Han Sans-Regular, Source Han Sans;
+    font-weight: 400;
+    color: #d3eef2;
+  }
+}
+.tb-content_ {
+  width: 100%;
+  background: rgba(216, 216, 216, 0.3);
+  display: flex;
+  padding: 10px 20px;
+  span {
+    flex: 1;
+    font-size: 14px;
+    font-family: Source Han Sans-Regular, Source Han Sans;
+    font-weight: 400;
+    color: #d3eef2;
+  }
+}
+</style>
diff --git a/src/views/components/shop/index.vue b/src/views/components/shop/index.vue
index 283d092..56a95e1 100644
--- a/src/views/components/shop/index.vue
+++ b/src/views/components/shop/index.vue
@@ -21,6 +21,9 @@
     </div>
     <div class="tab-page">
       <tab-one v-show="currentIndex == 0"></tab-one>
+      <tab2 v-show="currentIndex == 1" />
+      <tab3 v-show="currentIndex == 2" />
+      <tab4 v-show="currentIndex == 3" />
     </div>
   </dia-log>
 </template>