Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/site/website.vue

@@ -16,10 +16,16 @@
                 @click="handleSync(siteData[0].id)"
                 >同步数据</a-button
               >
-              <a-button type="primary" @click="editSiteInfo(siteData[0])"
+              <a-button
+                type="primary"
+                v-permission="[1]"
+                @click="editSiteInfo(siteData[0])"
                 >编辑</a-button
               >
-              <a-button type="danger" @click="deleteSite(siteData[0].id, 0)"
+              <a-button
+                type="danger"
+                v-permission="[1]"
+                @click="deleteSite(siteData[0].id, 0)"
                 >删除</a-button
               >
             </a-space>

portal-manager-ui/admin/src/main.js

@@ -19,8 +19,6 @@ Vue.use(GlobalComponents);
 import common from "./utils/commin";
 Vue.use(common);
 
-import VScaleScreen from "v-scale-screen";
-Vue.use(VScaleScreen);
 // 公共样式
 import "@/assets/css/normalize.css";
 import "@/assets/css/reset.css";

portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue

@@ -45,7 +45,11 @@
             v-for="(v, i) in collectList"
             :key="'' + v.id + i"
           >
-            <div class="item-logo cursor-pointer" @click="openWindow(v)">
+            <div
+              class="item-logo cursor-pointer"
+              @click="openWindow($event, v, 'click')"
+              @contextmenu="openWindow($event, v)"
+            >
               <img
                 class="w-full h-full object-contain"
                 :src="api + v.modelIcon"
@@ -91,7 +95,11 @@
               v-for="item in v.list"
               :key="item.id"
             >
-              <div class="item-logo cursor-pointer" @click="openWindow(item)">
+              <div
+                class="item-logo cursor-pointer"
+                @click="openWindow($event, item, 'click')"
+                @contextmenu="openWindow($event, item)"
+              >
                 <img
                   class="w-full h-full object-contain"
                   :src="api + item.modelIcon"
@@ -157,7 +165,7 @@ export default {
         this.siteModelList = data;
       }
     },
-    openWindow(row) {
+    async openWindow(event, row, type) {
       let siteid = Storage.get(2, "siteId") || 0;
       let siteName = Storage.get(2, "siteName") || "";
       let userInfo = JSON.stringify({
@@ -166,13 +174,48 @@ export default {
       });
       let { modelUrl, modelName, modelIcon } = row;
       let path = this.$route.path;
-      modelName = encodeURI(modelName);
-      window.open(
-        `${modelUrl}?token=${this.token}&siteid=${siteid}&siteName=${encodeURI(
-          siteName
-        )}&userInfo=${userInfo}&sysName=${modelName}&sysLogo=${modelIcon}&path=${path}`,
-        "_blank"
-      );
+      let compileModelName = encodeURI(modelName);
+      let params = `?token=${this.token}&siteid=${siteid}&siteName=${encodeURI(
+        siteName
+      )}&userInfo=${userInfo}&sysName=${compileModelName}&sysLogo=${modelIcon}&path=${path}`;
+      if (type === "click") {
+        window.open(`${modelUrl}${params}`, "_blank");
+        return;
+      }
+
+      if (this.userData.admin || this.userData.id == 1) {
+        event.preventDefault();
+        // let redirectUrl = "";
+        // let hash = "";
+        // let redirect = await this.getFinalRedirect(modelUrl);
+        // if (!modelUrl.includes("http")) {
+        //   let index = modelUrl.indexOf("/");
+        //   hash = modelUrl.slice(index + 1);
+        // }
+        // if (redirect) {
+        //   redirectUrl = redirect + hash;
+        // } else {
+        //   redirectUrl = modelUrl;
+        // }
+
+        this.$notification.open({
+          message: "跳转链接",
+          key: 1,
+          duration: null,
+          description: (
+            <div>
+              <div class="notif-name">{modelName}-完整链接：</div>
+              <div>{modelUrl + params}</div>
+              <div class="notif-name">链接参数：</div>
+              <div>{params}</div>
+            </div>
+          ),
+          style: {
+            "word-break": "break-all",
+          },
+          icon: <a-icon type="smile" style="color: #108ee9" />,
+        });
+      }
     },
 
     handleJoin() {
@@ -230,15 +273,36 @@ export default {
       }
       return false;
     },
+
+    // 获取重定向地址
+    // getFinalRedirect(url) {
+    //   return fetch(url, { method: "GET", redirect: "follow" })
+    //     .then((response) => {
+    //       if (!response.ok) {
+    //         throw new Error("Network response was not ok");
+    //       }
+    //       return response.url;
+    //     })
+    //     .catch((error) => {
+    //       console.error("Error:", error);
+    //       return null;
+    //     });
+    // },
   },
 };
 </script>
-
+<style>
+.notif-name {
+  font-size: 14px;
+  font-weight: 600;
+}
+</style>
 <style lang="less" scoped>
 .station {
   background: url("@/assets/images/siteArrange/bg_2.png") no-repeat;
   background-size: 100% 100%;
   overflow: hidden;
+
   .del-box {
     width: 100%;
     height: 150px;

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/userManagement.vue

@@ -21,6 +21,7 @@
             v-model="userform.searchVal"
             style="width: 250px"
             placeholder="请输入关键字搜索"
+            @pressEnter="handleSearch"
           >
             <a-icon slot="prefix" type="search" />
           </a-input>
@@ -36,7 +37,7 @@
               >{{ v }}</a-select-option
             >
           </a-select>
-          <a-button type="primary" class="addclass" @click="getUserList"
+          <a-button type="primary" class="addclass" @click="handleSearch"
             >搜索</a-button
           >
           <a-button @click="resetList">重置</a-button>
@@ -202,6 +203,12 @@ export default {
       this.getUserList();
     },
 
+    // 搜索
+    handleSearch() {
+      this.tablePagination.current = 1;
+      this.getUserList();
+    },
+
     // 获取用户列表
     async getUserList() {
       this.tableLoading = true;