ZHOUTD 1 vuosi sitten
vanhempi
commit
06c703919f

+ 6 - 4
xzl-ui/src/views/dataGovernance/databaseManage.vue

@@ -30,22 +30,24 @@
       <el-table-column
         prop="characterName"
         label="字符集"
-        width="300">
+        width="200">
       </el-table-column>
       <el-table-column
         prop="collationName"
         label="排序规则"
-        width="300">
+        width="200">
       </el-table-column>
       <el-table-column
         prop="collationName"
         label="ER图"
-        width="200">
+        width="160">
         <template slot-scope="scope">
           <el-image
             style="width: 100px; height: 100px"
             :src="getERImageUrl(scope.$index, tableData)"
-            :preview-src-list="getERImageDetailUrl(scope.$index, tableData)">
+            :preview-src-list="getERImageDetailUrl(scope.$index, tableData)"
+            fit="contain"
+          >
           </el-image>
         </template>
       </el-table-column>

+ 49 - 0
xzl-ui/src/views/monitor/map/customerPositionBmap.vue

@@ -39,10 +39,34 @@
     </div>
     <div id="container" v-bind:style="'width: 100%;border: 1px solid #cecece;height:'+pageHeight*0.797+'px;'">
     </div>
+    <div class="scroll-box-Position">
+      <h3>区域许可证办理情况</h3>
+      <div class="scroll-item-Position">
+        <vue-seamless-scroll :data="areaOptions" class="warp">
+          <div v-for="c in areaOptions" class="customer-info">
+            <table align="center" width="98%" cellpadding="0">
+              <tr>
+                <td width="35%">区域名:</td>
+                <td width="65%">{{c.name}}</td>
+              </tr>
+              <tr>
+                <td>状态:</td>
+                <td>{{c.type=='1'?'已饱和':"可办证"}}</td>
+              </tr>
+              <tr>
+                <td>可办证:</td>
+                <td>{{c.type=='1'?"0":c.num}}</td>
+              </tr>
+            </table>
+          </div>
+        </vue-seamless-scroll>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import request from '@/utils/request'
+import vueSeamlessScroll from 'vue-seamless-scroll'
 
 export default {
   data() {
@@ -69,6 +93,9 @@ export default {
       pageHeight: document.documentElement.clientHeight
     }
   },
+  components: {
+    vueSeamlessScroll
+  },
   created() {
     setTimeout(() => {
       this.initMap()
@@ -247,4 +274,26 @@ export default {
 .anchorBL {
   display: none;
 }
+
+.scroll-box-Position {
+  width: 240px;
+  height: 200px !important;
+  position: absolute;
+  z-index: 1999;
+  background: #ffffff;
+  right: 10px;
+  top: 60px !important;
+  border-radius: 8px;
+  opacity: 0.8;
+}
+
+.scroll-box-Position h3 {
+  text-align: center;
+  line-height: 40px;
+}
+
+.scroll-item-Position {
+  height: 100px !important;
+  overflow: hidden;
+}
 </style>