0915xx

src/views/authorize/app/index.vue

@@ -70,7 +70,7 @@ export default defineComponent({
       registerTable,
       { reload, collapseAll, getRowSelection, getSelectRowKeys, setSelectedRowKeys },
     ] = useTable({
-      title: '机构列表', //'菜单列表'
+      title: '应用列表', //'菜单列表'
       api: list, //加载数据
       columns, //加载列
       isTreeTable: true,

src/views/dataAdmin/dataAdmin/directoryManagement/index.vue

@@ -364,7 +364,7 @@ export default defineComponent({
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',
-        onOk:(()=> {
+        onOk: (() => {
           this.delFunc(item)
         })
       });
@@ -549,6 +549,22 @@ export default defineComponent({
       width: 20%;
 
       .tree-list {
+        height: 680px;
+        overflow: auto;
+
+        &::-webkit-scrollbar {
+          width: 3px;
+        }
+
+        &::-webkit-scrollbar-thumb {
+          border-radius: 2px;
+          background: #ccd5df;
+        }
+
+        &::-webkit-scrollbar-track {
+          display: none;
+        }
+
         ::v-deep .ant-tree-node-content-wrapper {
           .del-btn {
             position: absolute;

src/views/dataAdmin/dataAdmin/resourceCataloging/index.vue

@@ -6,7 +6,7 @@
       <div class="left">
         <a-card class="box-card" body-style="{height:'100%'}">
           <a-input-search v-model:value="treeSearchValue" style="margin-bottom: 8px" placeholder="搜索关键字" />
-          <a-tree :tree-data="treeData" @select="nodeSelect" :expandedKeys="expandedKeys"
+          <a-tree class="tree-list" :tree-data="treeData" @select="nodeSelect" :expandedKeys="expandedKeys"
             :auto-expand-parent="autoExpandParent" @expand="onExpand">
             <template #title="{ title }">
               <span v-if="title.indexOf(treeSearchValue) > -1">
@@ -33,19 +33,17 @@
                   @change="(checkedValue) => { selectType(checkedValue) }" />
               </a-col>
               <a-col :span="5">
-                坐标系：<a-select ref="select" :value="coordinateSearchvalue" style="width: 150px"
-                  @change="handleChange">
+                坐标系：<a-select ref="select" :value="coordinateSearchvalue" style="width: 150px" @change="handleChange">
                   <a-select-option v-for="item in coordinateData" :key="item.ID" :value="item.GEOMNAME">{{ item.GEOMNAME
                   }}</a-select-option>
                 </a-select>
               </a-col>
               <a-col :span="5">
-                资源名称：<a-input-search v-model:value="value" placeholder="支持名称搜索" style="width: 150px" 
-                  @search="onSearch" />
+                资源名称：<a-input-search v-model:value="value" placeholder="支持名称搜索" style="width: 150px" @search="onSearch" />
               </a-col>
               <a-col :span="4" style="display: flex;justify-content: flex-end;">
                 <a-button style="margin-right: 10px;" @click="">重置</a-button>
-                <a-button type="primary" >查询</a-button>
+                <a-button type="primary">查询</a-button>
               </a-col>
             </a-row>
           </a-card>
@@ -475,6 +473,24 @@ export default defineComponent({
 .mains {
   .box-card {
     height: calc(100% - 0px);
+
+    .tree-list {
+      height: 760px;
+      overflow: auto;
+
+      &::-webkit-scrollbar {
+        width: 3px;
+      }
+
+      &::-webkit-scrollbar-thumb {
+        border-radius: 2px;
+        background: #ccd5df;
+      }
+
+      &::-webkit-scrollbar-track {
+        display: none;
+      }
+    }
   }
 
   display: flex;

src/views/resource/plat/index.vue

@@ -7,7 +7,7 @@
       <div class="ztree-container">
         <a-directory-tree :tree-data="treeData" v-model:expandedKeys="expandedKeys" v-model:selectedKeys="selectedKeys"
           :replace-fields="{ children: 'child', key: 'id', value: 'name', title: 'name' }" v-if="treeData.length"
-          defaultExpandAll="true" v-model:checkedKeys="checkedKeys">
+          :defaultExpandAll="false" v-model:checkedKeys="checkedKeys">
           <template #title0010><span style="color: #1890ff">sss</span></template>
         </a-directory-tree>
       </div>
@@ -91,7 +91,45 @@ export default defineComponent({
   overflow: auto;
   width: 100%;
   height: auto;
-  max-height: 976px;
+  max-height: 760px;
+  padding: 10px;
+
+  &::-webkit-scrollbar {
+    width: 3px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    border-radius: 2px;
+    background: #ccd5df;
+  }
+
+  &::-webkit-scrollbar-track {
+    display: none;
+  }
+
+  ::v-deep .ant-tree-treenode-selected {
+    .ant-tree-node-content-wrapper.ant-tree-node-content-wrapper-normal.ant-tree-node-selected::before {
+      background: #e0eaf5!important;
+    }
+
+    .ant-tree-node-content-wrapper.ant-tree-node-content-wrapper-open.ant-tree-node-selected::before {
+      background: #e0eaf5!important;
+    }
+
+    .ant-tree-node-content-wrapper.ant-tree-node-content-wrapper-close.ant-tree-node-selected::before {
+      background: #e0eaf5!important;
+    }
+
+    .ant-tree-node-content-wrapper.ant-tree-node-content-wrapper-normal.ant-tree-node-selected {
+      color: #0671DD;
+    }
+    .ant-tree-node-content-wrapper.ant-tree-node-content-wrapper-open.ant-tree-node-selected {
+      color: #0671DD;
+    }
+    .ant-tree-node-content-wrapper.ant-tree-node-content-wrapper-close.ant-tree-node-selected {
+      color: #0671DD;
+    }
+  }
 }
 
 .datacenter-left .page-name {

src/views/tips/index.vue

@@ -54,7 +54,7 @@
             </div>
         </div>
         <!-- 底部图标 -->
-        <div class="bottom-panel" @dblclick="openTopPanel" v-if="!ifShowTop">
+        <div class="bottom-panel" @click="openTopPanel" v-if="!ifShowTop">
             <div class="icon"></div>
             <div class="msg-num">{{ totalTipsNum }}</div>
         </div>
@@ -203,6 +203,8 @@ export default defineComponent({
             return totalNum <= 99 ? totalNum === 0 ? '' : totalNum : `10+`
         })
 
+        const ifMove = ref(false)
+
         const dragEvent = (e) => {
             // tipsDomRef.value.stopPropagation()
             //算出鼠标相对元素的位置
@@ -216,6 +218,7 @@ export default defineComponent({
             let parentH = window.innerHeight;//父盒子的height
 
             let move = function (move) {
+                ifMove.value = true;
                 //用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
                 let left = move.clientX - disX;
                 let top = move.clientY - disY;
@@ -228,15 +231,19 @@ export default defineComponent({
                 tipsDomRef.value.style.top = top + "px";
             }
 
-            tipsDomRef.value.addEventListener('mousemove', move)
+            document.addEventListener('mousemove', move)
 
-            tipsDomRef.value.addEventListener('mouseup', (e) => {
+            document.addEventListener('mouseup', (e) => {
                 //鼠标弹起来的时候不再移动
-                tipsDomRef.value.removeEventListener('mousemove', move)
+                document.removeEventListener('mousemove', move)
             })
         }
 
         const openTopPanel = (e) => {
+            if(ifMove.value){
+                ifMove.value = false;
+                return;
+            }
             ifShowTop.value = !ifShowTop.value
             // let disX = e.clientX - tipsDomRef.value.offsetLeft;
             // let disY = e.clientY - tipsDomRef.value.offsetTop;