From fdb97cca1f302db3fe07cc700130a085d991d682 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 19 六月 2024 22:41:49 +0800
Subject: [PATCH] 1
---
src/views/myiframe/urlPath.vue | 43 +++++++++++++++++++++
src/layout/index.vue | 6 +-
src/views/login/components/passwordForm.vue | 10 ++---
src/config/route.js | 13 ++++++
src/views/mdc/time-analysis.vue | 3 +
5 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/src/config/route.js b/src/config/route.js
index 83bc1d1..6a3c0fb 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-05-24 11:25:26
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-29 16:16:57
+ * @LastEditTime: 2024-06-19 21:52:58
* @FilePath: /src/config/route.js
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -88,6 +88,17 @@
type: 'menu',
hidden: true
}
+ },
+ {
+ name: "浠诲姟璋冨害",
+ path: "/myiframe/urlPath",
+ component: "myiframe/urlPath",
+ meta: {
+ icon: "el-icon-menu",
+ title: "浠诲姟璋冨害",
+ type: 'menu',
+ hidden: true
+ }
}
]
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 6672cb4..0265cae 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -284,13 +284,13 @@
// 濡傛灉娌℃湁鎵惧埌鍖归厤鐨刾ath锛岃繑鍥瀗ull
return null;
},
- handleSelect(key, keyPath) {
+ handleSelect(key, keyPath,index,routeResult) {
var MENU = this.$TOOL.data.get("MENU");
var foundRoute = this.findRouteByPath(MENU, key);
//http://116.63.148.72:8080/xxl-job-admin
var TOKEN = this.$TOOL.cookie.get("TOKEN");
- if(key == '/i/浠诲姟璋冨害') {
- window.open("http://116.63.148.72:8080/xxl-job-admin");
+ if(key == "/myiframe/urlPath") { //浠诲姟璋冨害
+ this.$router.push({path: '/myiframe/urlPath',query:{name: foundRoute.name,src:foundRoute.origin}});
return;
}
if(foundRoute.name != "鏁板瓧鐪嬫澘") {
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 7881276..0f39872 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -114,16 +114,14 @@
// 濡傛灉娌℃湁 children 灞炴�э紝璇存槑鏄渶鍚庝竴绾э紝娣诲姞 component 瀵硅薄
var len = clonedItem.path.length;
if (item.name == "浠诲姟璋冨害") {
- //clonedItem.component = clonedItem.path; //鏈塩omponent涓嶅彲浠ヤ娇鐢╥frame
+ clonedItem.origin = item.path;
+ clonedItem.component = "myiframe/urlPath"; //鏈塩omponent涓嶅彲浠ヤ娇鐢╥frame
+ clonedItem.path = "/myiframe/urlPath";
} else {
clonedItem.component = clonedItem.path.substring(1, len);
}
}
- if (item.name == "浠诲姟璋冨害") {
- clonedItem.meta = { title: clonedItem.name, icon: "el-icon-takeaway-box", type: "iframe" }
- } else {
- clonedItem.meta = { title: clonedItem.name, icon: "el-icon-takeaway-box", type: "menu" }
- }
+ clonedItem.meta = { title: clonedItem.name, icon: "el-icon-takeaway-box", type: "menu" }
return clonedItem;
});
}
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index b8011e7..882170a 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-18 17:46:40
+ * @LastEditTime: 2024-06-19 22:40:07
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -298,6 +298,7 @@
if(value <= 1) {
value = value * 100;
}
+ console.log(value)
return value + "%";
}
},
diff --git a/src/views/myiframe/urlPath.vue b/src/views/myiframe/urlPath.vue
new file mode 100644
index 0000000..470db32
--- /dev/null
+++ b/src/views/myiframe/urlPath.vue
@@ -0,0 +1,43 @@
+<!--
+ * @Author: lzhe lzhe@example.com
+ * @Date: 2024-03-26 10:28:33
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-06-19 22:35:33
+ * @FilePath: /smart-web/src/views/master/person/main/index.vue
+ * @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+ <div class="frame-main">
+ <iframe :src="urlPath" frameborder="0" style="width: 100%;min-height: 500px"></iframe>
+ </div>
+</template>
+<script>
+ export default {
+ name: "urlpath",
+ data(){
+ return {
+ urlPath: ""
+ }
+ },
+ created(){
+
+ },
+ mounted(){
+ this.urlPath = `${this.$route.query.src}`;
+ },
+ components: {
+
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style scoped>
+ .frame-main {
+ background-color: #fff;
+ margin: 8px;
+ padding: 8px;
+ }
+</style>
--
Gitblit v1.9.3