界面小修改

index.html

@@ -60,6 +60,10 @@
     .vben-default-layout-main {
       margin-left: 0px !important;
     }
+
+    .ztree-container span.ant-tree-icon__customize {
+      display: none !important;
+    }
   </style>
 </head>
 

src/api/sys/menu.ts

@@ -210,7 +210,6 @@ export const getMenusIdsByRoleId = () => {
 
 
   return Promise.all([p1, p2]).then((res) => {
-    console.log("权限汇总:", res)
     var arr = Array.from(new Set(res[0].concat(res[1])));
     return arr
   }).catch((error) => {

src/views/assembly/item/AssemblyData.vue

@@ -48,7 +48,7 @@
   </div>
 </template>
 <script lang="ts">
-import { defineComponent, nextTick, onMounted, ref, defineProps, watch, reactive } from 'vue';
+import { defineComponent, nextTick, onMounted, ref, defineProps, watch, reactive, getCurrentInstance } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { columns, searchFormSchema } from './sms.data';
 import { Popconfirm, Tooltip } from 'ant-design-vue';

src/views/assembly/item/child/Search.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="wrapper">
-        <span class="sqrk"  @click="showModal">申请库(1)</span>
+        <span class="sqrk" @click="showModal">申请库(1)</span>
         <span>
             <a-select ref="select" v-model:value="value" style="width: 200px" :options="options" @focus="focus"
                 @change="handleChange">
@@ -11,9 +11,9 @@
         </span>
         <div>
             <a-checkbox v-model:checked="checked1">全部</a-checkbox>
-            <a-checkbox v-model:checked="checked2">测试数据1</a-checkbox>
+            <!-- <a-checkbox v-model:checked="checked2">测试数据1</a-checkbox>
             <a-checkbox v-model:checked="checked3">测试数据2</a-checkbox>
-            <a-checkbox v-model:checked="checked4">测试数据3</a-checkbox>
+            <a-checkbox v-model:checked="checked4">测试数据3</a-checkbox> -->
         </div>
         <a-modal v-model:visible="visible" title="申请库" @ok="handleOk" width="1440px" height="980px">
             <library></library>
@@ -23,12 +23,12 @@
 
 
 <script lang="ts">
-import { defineComponent, ref, computed, unref } from 'vue';
+import { defineComponent, ref, computed, unref, getCurrentInstance } from 'vue';
 import library from "../../library/index.vue"
 
 export default defineComponent({
     name: 'Search',
-    components: {library},
+    components: { library },
     setup() {
         const value = ref<string>('1');
         const key = ref<string>('');
@@ -36,6 +36,8 @@ export default defineComponent({
         const checked2 = ref<boolean>(false);
         const checked3 = ref<boolean>(false);
         const checked4 = ref<boolean>(false);
+        const currentInstance = getCurrentInstance();
+        const parentSetup = currentInstance.parent.setupState;
 
         const options = ref<SelectTypes['options']>([
             {
@@ -53,7 +55,7 @@ export default defineComponent({
         ]);
 
         function onSearch() {
-
+            parentSetup.getDataList(key.value)
         }
 
         const visible = ref<boolean>(false);

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

@@ -25,7 +25,8 @@
           </div>
           <div class="operation-box">
             <div class="operation-item browse-item-btn browse-item-MR00001936">
-              <a target="_blank" :href="(i.info && i.info.length && i.info[0].thumbnail) || '/static/img/default-dr3.jpg'">
+              <a target="_blank"
+                :href="(i.info && i.info.length && i.info[0].thumbnail) || '/static/img/default-dr3.jpg'">
                 <span>浏览</span>
               </a>
             </div>
@@ -47,7 +48,7 @@
                 <span>详细</span>
               </a>
             </div>
-            <div class="operation-item" @click="handleQuery(i)">
+            <!-- <div class="operation-item" @click="handleQuery(i)">
               <a href="javascript:void(0)" class="">
                 <span>加入申请库</span>
               </a>
@@ -56,7 +57,7 @@
               <a href="javascript:void(0)" class="">
                 <span>已加入申请库</span>
               </a>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
@@ -127,21 +128,21 @@ export default defineComponent({
       }
     })
 
-    // setInterval(() => {
-    //   console.log(props)
-    // }, 2000)
-    onMounted(() => {
-      platList().then((r) => {
-        if (r) {
+    onMounted(() => getDataList());
+
+    function getDataList(text) {
+      platList(text).then((r) => {
+        if (r && r.length) {
           var o = r.find(i => i.type == 'DR')
           if (o && o.items && o.items.length) {
             o.items.map(async (i) => i.info = await img(i.SERVICEID))
-            console.log(o);
             list.value = o.items;
           }
+        } else {
+          list.value = [];
         }
       });
-    });
+    }
 
     function handleQuery(record: Recordable) {
       console.log("11111:", record)
@@ -151,6 +152,7 @@ export default defineComponent({
     }
 
     return {
+      getDataList,
       registerModal,
       list,
       handleQuery,

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

@@ -40,7 +40,7 @@
                 <span>详细</span>
               </a>
             </div>
-            <div class="operation-item" @click="applyWay(i)">
+            <!-- <div class="operation-item" @click="applyWay(i)">
               <a href="javascript:void(0)" class="">
                 <span>加入申请库</span>
               </a>
@@ -49,7 +49,7 @@
               <a href="javascript:void(0)" class="">
                 <span>已加入申请库</span>
               </a>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
@@ -125,15 +125,19 @@ export default defineComponent({
     // setInterval(() => {
     //   console.log(props)
     // }, 2000)
-    onMounted(() => {
-      platList().then((r) => {
+    onMounted(() => getDataList());
+
+    function getDataList(text) {
+      platList(text).then((r) => {
         console.log(r)
-        if (r) {
+        if (r && r.length) {
           list.value = r[0].items;
           list.value.map(async (i) => i.info = await img(i.SERVICEID))
+        } else {
+          list.value = r;
         }
       });
-    });
+    }
 
     function handleQuery(record: Recordable) {
       console.log("11111:", record)
@@ -161,6 +165,7 @@ export default defineComponent({
     }
 
     return {
+      getDataList,
       applyWay,
       registerModal,
       list,

src/views/resource/plat/item/child/Search.vue

@@ -11,9 +11,9 @@
         </span>
         <div>
             <a-checkbox v-model:checked="checked1">全部</a-checkbox>
-            <a-checkbox v-model:checked="checked2">测试数据1</a-checkbox>
+            <!-- <a-checkbox v-model:checked="checked2">测试数据1</a-checkbox>
             <a-checkbox v-model:checked="checked3">测试数据2</a-checkbox>
-            <a-checkbox v-model:checked="checked4">测试数据3</a-checkbox>
+            <a-checkbox v-model:checked="checked4">测试数据3</a-checkbox> -->
         </div>
 
         <a-modal v-model:visible="visible" title="申请库" @ok="handleOk" width="1440px" height="980px">
@@ -24,7 +24,7 @@
 
 
 <script lang="ts">
-import { defineComponent, ref, computed, unref } from 'vue';
+import { defineComponent, ref, computed, unref, getCurrentInstance } from 'vue';
 import library from "../../../library/index.vue"
 export default defineComponent({
     name: 'Search',
@@ -36,6 +36,8 @@ export default defineComponent({
         const checked2 = ref<boolean>(false);
         const checked3 = ref<boolean>(false);
         const checked4 = ref<boolean>(false);
+        const currentInstance = getCurrentInstance();
+        const parentSetup = currentInstance.parent.setupState;
 
         const options = ref<SelectTypes['options']>([
             {
@@ -53,7 +55,7 @@ export default defineComponent({
         ]);
 
         function onSearch() {
-
+            parentSetup.getDataList(key.value)
         }
 
         const visible = ref<boolean>(false);

src/views/systemAdmin/system/account/account.data.ts

@@ -27,6 +27,7 @@ export const columns: BasicColumn[] = [
     title: '性别',
     dataIndex: 'SEX',
     width: 80,
+    slots: { customRender: 'SEX' },
   },
 ];
 

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

@@ -29,6 +29,9 @@
             }}
           </Tag>
         </template>
+        <template #SEX="{ record }">
+          <span>{{ record.SEX ? '男' : '女' }}</span>
+        </template>
         <template #statusT="{ record }">
           <Tag :color="record.locked == true ? 'red' : 'green'">
             {{ record.locked == true ? '已锁定' : '正常' }}
@@ -106,7 +109,7 @@
       </BasicTable>
       <AccountModal @register="registerModal" @success="handleSuccess" />
     </PageWrapper>
-    <PowerDrawer  @register="registerDrawer" @success="handleSuccess"></PowerDrawer>
+    <PowerDrawer @register="registerDrawer" @success="handleSuccess"></PowerDrawer>
   </div>
 </template>
 <script lang="ts">

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

@@ -5,9 +5,9 @@
         <Button type="primary" @click="handleCreate">
           {{ getI18nCreateMenu }}
         </Button>
-        <Button type="primary" danger :disabled="getCanBatchDelete" @click="handleBatchDelete">
+        <!-- <Button type="primary" danger :disabled="getCanBatchDelete" @click="handleBatchDelete">
           批量删除
-        </Button>
+        </Button> -->
       </template>
       <template #action="{ record }">
         <TableAction

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

@@ -5,11 +5,11 @@
         <Authority>
           <a-button type="primary" @click="handleCreate">新增角色</a-button>
         </Authority>
-        <Authority>
+        <!-- <Authority>
           <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消" @confirm="handleDeleteOrBatchDelete(null)">
             <a-button type="primary" color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
-        </Authority>
+        </Authority> -->
       </template>
       <template #status="{ record }">
         <Switch :checked="record.status === 1" :loading="record.pendingStatus" checkedChildren="启用" unCheckedChildren="禁用"

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

@@ -1,6 +1,6 @@
 <template>
   <div class="p-4">
-    <BasicTable @register="registerTable" @fetch-success="onFetchSuccess">
+    <BasicTable defaultExpandAllRows @register="registerTable" @fetch-success="onFetchSuccess" >
       <template #toolbar>
         <Button type="primary" @click="handleCreate">
           {{ getI18nCreateMenu }}