Merge branch 'master' of http://221.182.8.141:11666/sujunlin/xld-gis-admin

src/views/assembly/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="[`${prefixCls}-bottom`, '!dark:bg-dark-900']">
+  <div :class="[`${prefixCls}-bottom`, '!dark:bg-dark-900','zjzyWrapper']">
     <div class="datacenter-left">
       <div class="page-name">
         <p>组件目录</p>
@@ -84,6 +84,16 @@ export default defineComponent({
   },
 });
 </script>
+<style>
+.zjzyWrapper .datacenter-right{
+  height: calc(100vh - 195px);
+  overflow: auto;
+  background: #fff;
+  &::-webkit-scrollbar {
+    width: 3px;
+  }
+}
+</style>
 <style lang="less" scoped>
 .ztree-container p.action {
   background: #0671DD;
@@ -100,7 +110,6 @@ export default defineComponent({
   float: left;
   width: calc(100vw - 320px);
   height: 100%;
-  overflow-y: scroll;
 }
 
 .ztree-container {

src/views/dataAdmin/dataAdmin/configProcess/index.vue

@@ -29,7 +29,7 @@
           },
           {
             label: '删除',
-            color: 'error',
+            //color: 'error',
             ifShow: true,
             onClick: handleDeletes.bind(null, record),
             // popConfirm: {

src/views/interface/item/AssemblyData.vue

@@ -223,7 +223,7 @@ export default defineComponent({
       overflow: auto;
 
       &::-webkit-scrollbar {
-        width: 1px;
+        width: 3px;
       }
 
       .item {

src/views/resource/plat/index.vue

@@ -178,18 +178,20 @@ export default defineComponent({
   font-weight: bold;
   font-size: 16px;
 }
+.vben-layout-content {
+  height: calc(100vh - 50px);
+}
 </style>
 <style lang="less" scoped>
 .p-4 {
   height: 100%;
-
+  overflow: hidden;
   .resoure-center {
     padding: 20px;
     width: 100%;
     height: 100%;
     background-color: #fff;
     border-radius: 6px;
-
     .datacenter-left {
       float: left;
       width: 250px;

src/views/resource/plat/item/FileData.vue

@@ -196,7 +196,6 @@ export default defineComponent({
 .operation-item {
   border-radius: 3px;
 }
-
 .datacenter-right .resource_list .item-title .r_name {
   color: #5e5d5e;
   display: inline-block;

src/views/resource/plat/item/MapData.vue

@@ -60,11 +60,12 @@
         </div>
         <a-empty style="margin: 100px auto;" v-else description="暂无数据"></a-empty>
       </div>
+      
     </div>
     <MyPage :total="total"></MyPage>
     <!-- <DetailModal v-if="showResDeatil" :type="'MAP'" @closeModal="showResDeatil = false" :resId="detailResId"
       :res="detailRes" /> -->
-      <DetailModal @register="registerModal" :type="'FILE'" @closeModal="showResDeatil = false" :res="detailRes" :resId="detailResId" />
+    <DetailModal @register="registerModal" :type="'FILE'" @closeModal="showResDeatil = false" :res="detailRes" :resId="detailResId" />
     <EmpowerInfo @register="registerModalEM" title="地图资源申请信息" ref="infoRef"></EmpowerInfo>
   </div>
 </template>
@@ -208,7 +209,16 @@ export default defineComponent({
   },
 });
 </script>
-
+<style>
+.datacenter-right{
+  height: calc(100vh - 270px);
+  overflow: auto;
+  background: #fff;
+  &::-webkit-scrollbar {
+    width: 3px;
+  }
+}
+</style>
 <style scoped>
 .operation-item {
   border-radius: 3px;

src/views/systemAdmin/system/role/index.vue

@@ -198,9 +198,13 @@ export default defineComponent({
         },
       ];
     });
+    var dom = null;
     const rowClick = (record, index) => {
       return {
         onClick: () => {
+          if(dom) dom.style.color = '#000000';
+          dom = document.querySelector(`tr[data-row-key='${record.key}']`);
+          if(dom) dom.style.color = '#377dff';
           handleEdit(record)
         }
       }
@@ -276,8 +280,13 @@ export default defineComponent({
   },
 });
 </script>
-
+<style>
+.left-table tr{
+  cursor: pointer;
+}
+</style>
 <style lang="less" scoped>
+
 .p-4 {
   height: 100%;
 

src/views/systemAdmin/system/tag/index.vue

@@ -37,8 +37,8 @@
                     onClick: openDialog.bind(null, record),
                 },
                 {
-                    label: '批量删除',
-                    tooltip: '批量删除',
+                    label: '删除',
+                    tooltip: '删除',
                     // icon: 'ant-design:delete-outlined',
                     onClick: onDelete.bind(null, record.id),
                 },
@@ -281,7 +281,7 @@ export default defineComponent({
                 hideOnSinglePage: false
             },
             rowKey: (record) => record.id,
-            // canResize: false,
+            canResize: false,
             actionColumn: {
                 width: 150,
                 title: '操作',
@@ -301,9 +301,14 @@ export default defineComponent({
                 key: 'TYPE'
             },
         ]
+
+        var dom = null;
         const rowClick = (record, index) => {
             return {
                 onClick: () => {
+                    if(dom) dom.style.color = '#000000';
+                    dom = document.querySelector(`tr[data-row-key='${record.key}']`);
+                    if(dom) dom.style.color = '#377dff';
                     searchTagsByType(record.TYPE)
                 }
             }
@@ -326,13 +331,13 @@ export default defineComponent({
                 fullScreen: false
             },
             customRow: rowClick,
+            canResize: false,
             showIndexColumn: true,
             autoCreateKey: true, //不自动创建key
             pagination: {
                 // pageSize: 10,
                 hideOnSinglePage: false
             },
-            // canResize:false
             // actionColumn: {
             //     width: 100,
             //     title: '操作',
@@ -361,8 +366,15 @@ export default defineComponent({
     },
 });
 </script>
+<style>
+.tagType-box tr{
+    height: 49px;
+    cursor: pointer;
+}
+</style>
 
 <style lang="less">
+
 .p-4 {
     .tag-box {
         .ant-table-body {
@@ -373,7 +385,7 @@ export default defineComponent({
 
     .tagType-box {
         .ant-table-body {
-            height: 706px;
+            //height: 706px;
             // overflow: auto !important;
         }
     }