Merge branch 'master' into mock

src/components/easyMap/func/dom.scss

@@ -1,47 +1,52 @@
 .tooltip {
+  margin-right: 4px;
   position: relative;
-  background: rgba(0, 0, 0, 0.5);
+  background: rgba(0, 0, 0, 0.7);
   border-radius: 4px;
-  color: white;
-  padding: 4px 8px;
+  padding: 8px;
   white-space: nowrap;
+  font-size: 14px;
+  font-family: PingFang SC, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 20px;
 }
 
 .tooltip-measure {
-  opacity: 1;
-  font-weight: bold;
+  //opacity: 1;
+  //font-weight: bold;
 }
 
 .tooltip-static {
-  background-color: #ffcc33;
-  color: black;
-  border: 1px solid white;
+  background-color: rgba(255, 255, 255,0.7);
+  border-radius: 4px;
+  border: 1px solid rgba(255,43,43,0.7);
+  color: #000000;
 }
 
 .tooltip-measure:before,
 .tooltip-static:before {
-  border-top: 6px solid rgba(0, 0, 0, 0.5);
+  border-top: 6px solid rgba(0, 0, 0, 0.7);
   border-right: 6px solid transparent;
   border-left: 6px solid transparent;
   content: "";
   position: absolute;
   bottom: -6px;
-  margin-left: -7px;
-  left: 50%;
+  left: calc((100% - 6px) / 2);
 }
 
 .tooltip-static:before {
-  border-top-color: #ffcc33;
+  border-top-color: rgba(255,43,43,0.7);
 }
 .lineDel {
+  position: absolute;
   width: 16px;
   height: 16px;
-  display: inline-block;
-  vertical-align: middle;
-  margin-left: 10px;
   cursor: pointer;
   background: url('../images/lineDel.png') no-repeat;
   background-size: 100% 100%;
+  top: -18px;
+  right: 0;
 }
 
 .tooltip-location {

src/views/gis/business/enterprise/index.vue

@@ -73,8 +73,19 @@
                   <CusEllipsis :value="`${(enterprise.table.pageNum - 1) * enterprise.table.pageSize + index + 1}.${item.qymc}`"/>
                 </div>
                 <div class="table-card-item-right-bottom">
-                  <img src="@/assets/images/gis-business/enterprise_list-icon2.png" alt=""/>
-                  {{item.qykx}}
+                  <template v-if="item.qykx === '零关税自用进口生产设备'">
+                    <img src="@/assets/images/gis-business/enterprise_list-icon3.png" alt=""/>
+                    <span style="color: #77E24D;">{{item.qykx}}</span>
+                  </template>
+                  <template v-else-if="item.qykx === '加工增值免关税'">
+                    <img src="@/assets/images/gis-business/enterprise_list-icon2.png" alt=""/>
+                    <span style="color: #F67D61;">{{item.qykx}}</span>
+                  </template>
+                  <template v-else-if="item.qykx === '零关税进口原辅料'">
+                    <img src="@/assets/images/gis-business/enterprise_list-icon4.png" alt=""/>
+                    <span style="color: #E0C50D;">{{item.qykx}}</span>
+                  </template>
+                  <template v-else>{{item.qykx}}</template>
                 </div>
               </div>
             </div>