1108xx

src/api/resource/plat.ts

@@ -122,9 +122,9 @@ export function platList(text) {
     f.append("methodName", "getAllResourceByRootId");
     f.append("args[]", session.getItem('tokenV2'));
     // f.append("args[]", text || '981ad898-6fbc-758b-5048-a866f2af5e72');
-    f.append("args[]", '981ad898-6fbc-758b-5048-a866f2af5e72');
+    f.append("args[]", text?.id || '981ad898-6fbc-758b-5048-a866f2af5e72');
     f.append("args[]", JSON.stringify(userParams))
-    f.append("args[]", `{"pagesize":${text?.pageSize || 12},"tag":"1","nodeId":"${"981ad898-6fbc-758b-5048-a866f2af5e72"}",
+    f.append("args[]", `{"pagesize":${text?.pageSize || 12},"tag":"1","nodeId":"${text?.id || "981ad898-6fbc-758b-5048-a866f2af5e72"}",
     "MR":{"index":${text?.pageIndex || 0},"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
     "SR":{"index":${text?.pageIndex || 0},"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
     "ER":{"index":${text?.pageIndex || 0},"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
@@ -150,6 +150,7 @@ export function platList(text) {
 
 /**
  * @description:根据目录ID获取地图资源列表
+ * @description:改了之后这个没用了，直接在上面的接口传目录id获取
  */
 export function platListByMenuId(id) {
     let userInfo = session.getItem('userInfo')

src/layouts/default/header/index.vue

@@ -41,7 +41,8 @@
       </div>
 
 
-      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" />
+      <!-- <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" /> -->
+      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false"/>
 
       <UserDropDown :theme="getHeaderTheme" />
       <img :src="outSys" alt="" srcset="" class="outSys" @click="outSysWay">
@@ -208,7 +209,7 @@ export default defineComponent({
             }
           })
           let totalNum = todoNum + msgNum
-          tipsNum.value = totalNum <= 99 ? totalNum === 0 ? '' : totalNum + '' : `99+`
+          tipsNum.value = totalNum <= 99 ? totalNum === 0 ? '0' : totalNum + '' : `99+`
         }
       })
     }
@@ -332,15 +333,16 @@ export default defineComponent({
       position: absolute;
       top: 4px;
       right: 0px;
-      width: 20px;
-      height: 20px;
+      // width: 25px;
+      min-width: 15px;
+      // height: 23px;
       color: #fff;
       background-color: #f72a2a;
       font-family: Source Han Sans CN;
       font-size: 12px;
-      line-height: 17px;
+      line-height: 15px;
       text-align: center;
-      border-radius: 50%;
+      border-radius: 10px;
       border: 1px solid #fff;
       box-sizing: border-box;
     }

src/views/resource/plat/index.vue

@@ -52,13 +52,25 @@ export default defineComponent({
     const treeData = ref([]);
     const expandedKeys = ref([]);
     const selectedKeys = ref([]);
+    const currentTreeNodeKeys = ref([])
     const checkedKeys = ref([]);
     const achieveList = ref([]);
 
-    const nodeSelect = (selectedKeys, { selectedNode, node }) => {
-      if (selectedKeys.length) {
+    const nodeSelect = (selectedKey, { selectedNode, node }) => {
+      if (currentTreeNodeKeys.value.length && currentTreeNodeKeys.value[0] === selectedKey[0]) {
+        selectedKeys.value = [];
+        currentTreeNodeKeys.value = [];
+        platList().then((r) => {
+          if (r) {
+            achieveList.value = r
+          }
+        });
+        return;
+      }
+      currentTreeNodeKeys.value[0] = selectedKey[0]
+      if (selectedKey.length) {
         console.log(node.dataRef)
-        platListByMenuId(node.dataRef.id).then(res => {
+        platList({id: node.dataRef.id}).then(res => {
           if (res.length) {
             achieveList.value = res
           }
@@ -75,17 +87,37 @@ export default defineComponent({
           })
         }
       });
-      platList().then((r) => { if (r) achieveList.value = r });
+      platList().then((r) => {
+        if (r) {
+          achieveList.value = r
+          console.log(achieveList.value)
+        }
+      });
     });
 
     eventBus.on('platListCenter', (o) => {
       var type = null;
       if (o && o.type) type = o.type == 'MAP' ? 'MR' : o.type == 'SCENE' ? 'ER' : 'DR';
-      platList(o).then((r) => {
+      let params = JSON.parse(JSON.stringify(o))
+      params.id = currentTreeNodeKeys.value.length ? currentTreeNodeKeys.value[0] : null
+      platList(params).then((r) => {
         if (r) {
           if (type) {
             var list = JSON.parse(JSON.stringify(achieveList.value))
-            achieveList.value = list.map(i => { if (i.type == type) { i = r.find(j => j.type == type) } return i; })
+            let resArr = []
+            list.forEach((item,index)=>{
+              item.type!==type && (resArr[index]=item)
+            })
+            r.forEach((item,index)=>{
+              item.type===type && (resArr[index]=item)
+            })
+            achieveList.value = resArr;
+            // achieveList.value = list.map(i => {
+            //   if (i.type == type) { 
+            //     i = r.find(j => j.type == type) 
+            //   }
+            //   return i;
+            // })
           } else {
             achieveList.value = r;
           }
@@ -94,7 +126,10 @@ export default defineComponent({
     });
 
     const resAddToCar = () => {
-      platList().then((r) => { if (r) achieveList.value = r });
+      let params = {
+        id:currentTreeNodeKeys.value.length ? currentTreeNodeKeys.value[0] : null
+      }
+      platList(params).then((r) => { if (r) achieveList.value = r });
     }
 
     return {

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

@@ -73,15 +73,16 @@ import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
 
 const props = {
   listData: {
-    type: Array,
-    default: () => [],
+    type: Object,
+    default: () => {},
   }
 }
 
 export default defineComponent({
-  name: 'SmsLog',
+  name: 'FileData',
   components: { Search, DetailModal, MyPage },
   props,
+  emits:['resAddToCar'],
   setup(props, { emit }) {
     const showResDeatil = ref(false)
     const searchRef = ref(null)

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

@@ -71,12 +71,13 @@ import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
 
 
 export default defineComponent({
-  name: 'SmsLog',
+  name: 'MapData',
   components: { Search, DetailModal, MyPage },
+  emits:['resAddToCar'],
   props: {
     listData: {
-      type: Array,
-      default: () => [],
+      type: Object,
+      default: () => {},
     }
   },
   setup(props, { emit }) {

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

@@ -80,15 +80,16 @@ import { setHtmlImg } from '/@/views/minWidgets/CommonWay.js';
 
 const props = {
   listData: {
-    type: Array,
-    default: () => [],
+    type: Object,
+    default: () => {},
   }
 }
 
 export default defineComponent({
-  name: 'SmsLog',
+  name: 'SceneData',
   components: { BasicTable, TableAction, Search, DetailModal, Authority, Popconfirm, Tooltip, SceneDrawer, MyPage },
   props,
+  emits:['resAddToCar'],
   setup(props, { emit }) {
     const showResDeatil = ref(false)
     const detailResId = ref('')

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

@@ -2,12 +2,12 @@
     <div class="wrapper">
         <span class="sqrk" @click="showModal">申请库({{ resNum }})</span>
         <span>
-            <a-select ref="select" allowClear="true" v-model:value="statusValue" style="width: 200px" :options="options"
-                @change="handleChange">
+            <a-select ref="select" allowClear v-model:value="statusValue" style="width: 200px" :options="options"
+                @change="onSearch">
             </a-select>
         </span>
         <span>
-            <a-input-search allowClear="true" v-model:value="keyWord" placeholder="请输入搜索内容" style="width: 200px"
+            <a-input-search allowClear v-model:value="keyWord" placeholder="请输入搜索内容" style="width: 200px"
                 @search="onSearch" />
         </span>
         <div>

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

@@ -1,40 +1,37 @@
 <template>
-    <a-drawer :title="title" :visible="true" :width="540" :body-style="{ paddingBottom: '80px' }"
-        :footer-style="{ textAlign: 'right' }" @close="onClose">
-        <a-form ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
-            <!-- 名称 -->
-            <a-form-item label="字典名称" name="name">
-                <a-input v-model:value="form.name" style="width: 100%" placeholder="请输入名称" />
-            </a-form-item>
-            <!-- 编码 -->
-            <a-form-item label="字典编码" name="code">
-                <a-input v-model:value="form.code" style="width: 100%" placeholder="根据名称生成" disabled />
-            </a-form-item>
-            <!-- 类型 -->
-            <a-form-item label="字典类型" name="type">
-                <a-select v-model:value="form.type" style="width: 100%" :options="selectOptions">
-                </a-select>
-            </a-form-item>
-            <!-- 排序 -->
-            <a-form-item label="字典排序" name="px">
-                <a-input v-model:value="form.px" style="width: 100%" placeholder="请输入序号" />
-            </a-form-item>
-        </a-form>
-        <div :style="{
-            position: 'absolute',
-            right: 0,
-            bottom: 0,
-            width: '100%',
-            borderTop: '1px solid #e9e9e9',
-            padding: '10px 16px',
-            background: '#fff',
-            textAlign: 'right',
-            zIndex: 1,
-        }">
-            <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
-            <a-button type="primary" @click="onSubmit">确定</a-button>
+    <a-modal :title="title" :visible="true" :width="540" centered :footer="null" @cancel="onClose">
+        <div class="content" style="padding: 10px;">
+            <a-form ref="formRef" :model="form" :rules="rules" :label-col="labelCol" :wrapper-col="wrapperCol">
+                <!-- 名称 -->
+                <a-form-item label="字典名称" name="name">
+                    <a-input v-model:value="form.name" style="width: 100%" placeholder="请输入名称" />
+                </a-form-item>
+                <!-- 编码 -->
+                <a-form-item label="字典编码" name="code">
+                    <a-input v-model:value="form.code" style="width: 100%" placeholder="根据名称生成" disabled />
+                </a-form-item>
+                <!-- 类型 -->
+                <a-form-item label="字典类型" name="type">
+                    <a-select v-model:value="form.type" style="width: 100%" :options="selectOptions">
+                    </a-select>
+                </a-form-item>
+                <!-- 排序 -->
+                <a-form-item label="字典排序" name="px">
+                    <a-input v-model:value="form.px" style="width: 100%" placeholder="请输入序号" />
+                </a-form-item>
+            </a-form>
+            <div :style="{
+                paddingTop:'10px',
+                width: '100%',
+                borderTop: '1px solid #e9e9e9',
+                display:'flex',
+                justifyContent:'center',
+            }">
+                <a-button style="margin-right: 35px" @click="onClose">取消</a-button>
+                <a-button type="primary" @click="onSubmit">确定</a-button>
+            </div>
         </div>
-    </a-drawer>
+    </a-modal>
 </template>
 <script>
 import { defineComponent, reactive, ref, onMounted, watch } from 'vue';
@@ -197,7 +194,7 @@ export default defineComponent({
             title,
             formRef,
             labelCol: { span: 6 },
-            wrapperCol: { span: 18 },
+            wrapperCol: { span: 16 },
             selectOptions,
             onClose,
             onSubmit,

src/views/tips/index.vue

@@ -227,6 +227,7 @@ export default defineComponent({
                             nodeIsPass: lc.ISPASS==='0'?'不通过':'通过'
                         })
                     })
+                    formItemData.lcxx.pop()
                 }
             })
             ifShowDialog.value = true