sujunling 2 سال پیش
والد
کامیت
18ae343cc1
2فایلهای تغییر یافته به همراه27 افزوده شده و 22 حذف شده
  1. 10 11
      src/api/resource/plat.ts
  2. 17 11
      src/views/assembly/item/AssemblyData.vue

+ 10 - 11
src/api/resource/plat.ts

@@ -110,22 +110,21 @@ export function getResViewInfo(resId) {
 export function platList(text) {
     let userInfo = session.getItem('userInfo')
     let rolesId = []
-    userInfo.ROLES.forEach(item=>{
+    userInfo.ROLES.forEach(item => {
         rolesId.push(item.ROLE_ID)
     })
     rolesId.push('space')
     let userParams = {
-        EMPLOYEE:userInfo?.EMPLOYEE.EMPLOYEE_ID,
-        ROLES:rolesId
+        EMPLOYEE: userInfo?.EMPLOYEE.EMPLOYEE_ID,
+        ROLES: rolesId
     }
     const f = new URLSearchParams();
     f.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
     f.append("methodName", "getAllResourceByRootId");
     f.append("args[]", session.getItem('tokenV2'));
-    f.append("args[]", text|| '981ad898-6fbc-758b-5048-a866f2af5e72');
-    // f.append("args[]", '{"EMPLOYEE":"27AF004A-8BDN-885T-30FU-89DE3388762B","ROLES":["ed5e2ffa-bdfc-aeb7-89c7-70b593458207","1F899E7A-748N-609T-99CU-3FCE7FBEA814","090B70041E1EB211EA864C7C0ACCBF73","BF03E5DD1C1EB211738485703976FFEE","space"]}');
-    f.append("args[]",JSON.stringify(userParams))
-    f.append("args[]", `{"pagesize":12,"tag":"1","nodeId":"${text||"981ad898-6fbc-758b-5048-a866f2af5e72"}",
+    f.append("args[]", text || '981ad898-6fbc-758b-5048-a866f2af5e72');
+    f.append("args[]", JSON.stringify(userParams))
+    f.append("args[]", `{"pagesize":12,"tag":"1","nodeId":"${text || "981ad898-6fbc-758b-5048-a866f2af5e72"}",
     "MR":{"index":0,"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
     "SR":{"index":0,"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
     "ER":{"index":0,"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
@@ -149,13 +148,13 @@ export function platList(text) {
 export function platListByMenuId(id) {
     let userInfo = session.getItem('userInfo')
     let rolesId = []
-    userInfo.ROLES.forEach(item=>{
+    userInfo.ROLES.forEach(item => {
         rolesId.push(item.ROLE_ID)
     })
     rolesId.push('space')
     let userParams = {
-        EMPLOYEE:userInfo?.EMPLOYEE.EMPLOYEE_ID,
-        ROLES:rolesId
+        EMPLOYEE: userInfo?.EMPLOYEE.EMPLOYEE_ID,
+        ROLES: rolesId
     }
     const f = new URLSearchParams();
     f.append("interfaceName", "antu.space.provider.sservicebase.ServiceBaseMetaDataViewProvider");
@@ -163,7 +162,7 @@ export function platListByMenuId(id) {
     f.append("args[]", session.getItem('tokenV2'));
     f.append("args[]", id);
     // f.append("args[]", '{"EMPLOYEE":"27AF004A-8BDN-885T-30FU-89DE3388762B","ROLES":["ed5e2ffa-bdfc-aeb7-89c7-70b593458207","1F899E7A-748N-609T-99CU-3FCE7FBEA814","090B70041E1EB211EA864C7C0ACCBF73","BF03E5DD1C1EB211738485703976FFEE","space"]}');
-    f.append("args[]",JSON.stringify(userParams))
+    f.append("args[]", JSON.stringify(userParams))
     f.append("args[]", `{"pagesize":12,"tag":"1","nodeId":"${id}",
     "MR":{"index":0,"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},
     "SR":{"index":0,"total":0,"filterField":"SERVICETYPE,SERVICENAME,DESCRIPTION,UPDATEDATE"},

+ 17 - 11
src/views/assembly/item/AssemblyData.vue

@@ -33,18 +33,20 @@
         </div>
       </div>
     </div>
-    <a-drawer title="组件详情" width="400px" placement="right" :closable="false" v-model:visible="visible"
+    <a-modal title="组件详情" width="400px" placement="right" :closable="false" v-model:visible="visible"
       :after-visible-change="afterVisibleChange">
-      <p><b>资源名称:</b>&nbsp;&nbsp;<span>{{ action.servicename }}</span></p>
-      <p><b>资源别名:</b>&nbsp;&nbsp;<span>{{ action.servicealiasname }}</span></p>
-      <p><b>资源类型:</b>&nbsp;&nbsp;<span>{{ action.source }}</span></p>
-      <p><b>浏览资源:</b>&nbsp;&nbsp;<span><a :href="[`../../mapview.html?onlineIde_${action.servicealiasname}`]"
-            target="_blank" rel="noopener noreferrer">查看组件</a></span></p>
-      <p><b>资源描述:</b>&nbsp;&nbsp;<span>{{ action.description }}</span></p>
-      <div class="footer">
-        <a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+      <div class="assemblyModal">
+        <p><b>资源名称:</b>&nbsp;&nbsp;<span>{{ action.servicename }}</span></p>
+        <p><b>资源别名:</b>&nbsp;&nbsp;<span>{{ action.servicealiasname }}</span></p>
+        <p><b>资源类型:</b>&nbsp;&nbsp;<span>{{ action.source }}</span></p>
+        <p><b>浏览资源:</b>&nbsp;&nbsp;<span><a :href="[`../../mapview.html?onlineIde_${action.servicealiasname}`]"
+              target="_blank" rel="noopener noreferrer">查看组件</a></span></p>
+        <p><b>资源描述:</b>&nbsp;&nbsp;<span>{{ action.description }}</span></p>
       </div>
-    </a-drawer>
+      <template v-slot:footer>
+        <a-button type='primary' @click="onClose">取消</a-button>
+      </template>
+    </a-modal>
     <AssemblyDrawer @register="registerModal" />
   </div>
 </template>
@@ -123,7 +125,6 @@ export default defineComponent({
     };
 
     const showDrawer = (i) => {
-      console.log("i", i);
       action.value = i;
       visible.value = true;
     };
@@ -157,6 +158,7 @@ export default defineComponent({
       })
     }
 
+
     return {
       applyWay,
       getDataList,
@@ -176,6 +178,10 @@ export default defineComponent({
 </script>
 
 <style scoped>
+div.assemblyModal {
+  padding: 20px !important;
+}
+
 .footer {
   position: absolute;
   bottom: 0px;