瀏覽代碼

feat:解决iframe嵌入协议问题

chenjiaxin 1 周之前
父節點
當前提交
0a92db861f

+ 11 - 2
src/api/auth/user.js

@@ -25,7 +25,7 @@ export function createUser(data) {
     data
     data
   })
   })
 }
 }
-// 更新职位信息
+// 更新用户信息
 export function updateUser(data) {
 export function updateUser(data) {
   return requestSys({
   return requestSys({
     url: '/user/edit',
     url: '/user/edit',
@@ -33,7 +33,7 @@ export function updateUser(data) {
     data
     data
   })
   })
 }
 }
-// 删除职位
+// 删除用户
 export function deleteUser(data) {
 export function deleteUser(data) {
   return requestSys({
   return requestSys({
     url: '/user/delete',
     url: '/user/delete',
@@ -42,6 +42,15 @@ export function deleteUser(data) {
   })
   })
 }
 }
 
 
+// 重置密码
+export function resetPwd(data) {
+  return requestSys({
+    url: '/user/resetPassword',
+    method: 'post',
+    data
+  })
+}
+
 
 
 
 
 
 

+ 0 - 3
src/layout/components/Navbar.vue

@@ -68,9 +68,6 @@ export default {
       helpswitch: true,
       helpswitch: true,
     };
     };
   },
   },
-  created() {
-    console.log(this.name,'name')
-  },
   methods: {
   methods: {
     clickopen() {
     clickopen() {
       this.$emit("helpcenterEvent", this.helpswitch);
       this.$emit("helpcenterEvent", this.helpswitch);

+ 1 - 1
src/router/index.js

@@ -38,8 +38,8 @@ import videoRouter from "./modules/video";
 import aiToolsRouter from "./modules/aiTools";
 import aiToolsRouter from "./modules/aiTools";
 
 
 export const asyncRoutes = [
 export const asyncRoutes = [
-  aiToolsRouter,
   videoRouter,
   videoRouter,
+  aiToolsRouter,
   // userAuthRouter,
   // userAuthRouter,
 ];
 ];
 
 

+ 3 - 3
src/views/ai-tools/cut-video.vue

@@ -17,7 +17,7 @@ export default {
   name: 'CutVideo',
   name: 'CutVideo',
   data() {
   data() {
     return {
     return {
-      iframeUrl: 'http://60.165.238.181:8189/'
+      iframeUrl: 'https://ai-app.gloria.com.cn/walk_show_cut/'
     }
     }
   },
   },
   mounted() {
   mounted() {
@@ -31,7 +31,7 @@ export default {
   methods: {
   methods: {
     handleMessage(event) {
     handleMessage(event) {
       // 验证消息来源
       // 验证消息来源
-      if (event.origin !== 'http://60.165.238.181:8189') {
+      if (event.origin !== 'https://ai-app.gloria.com.cn/walk_show_cut/') {
         return
         return
       }
       }
       // 处理来自iframe的消息
       // 处理来自iframe的消息
@@ -43,7 +43,7 @@ export default {
     sendMessageToIframe(message) {
     sendMessageToIframe(message) {
       const iframe = this.$refs.iframeRef
       const iframe = this.$refs.iframeRef
       if (iframe) {
       if (iframe) {
-        iframe.contentWindow.postMessage(message, 'http://60.165.238.181:8189')
+        iframe.contentWindow.postMessage(message, 'https://ai-app.gloria.com.cn/walk_show_cut/')
       }
       }
     }
     }
   }
   }

+ 0 - 1
src/views/auth/user/components/addUserEditDialog.vue

@@ -129,7 +129,6 @@ export default {
     },
     },
     handleOrgChange(value) {
     handleOrgChange(value) {
       // 选择组织后,自动选择所属组织的第一个职位
       // 选择组织后,自动选择所属组织的第一个职位
-      console.log(value);
       if (value && value.length > 0) {
       if (value && value.length > 0) {
         this.fetchPositionList(value);
         this.fetchPositionList(value);
       }
       }

+ 26 - 10
src/views/auth/user/index.vue

@@ -183,7 +183,7 @@
                     content="更多"
                     content="更多"
                     placement="top"
                     placement="top"
                   >
                   >
-                    <el-dropdown trigger="click">
+                    <el-dropdown trigger="click"  @command="(command) => handleMore(command, scope.row)">
                       <el-button
                       <el-button
                         size="mini"
                         size="mini"
                         type="primary"
                         type="primary"
@@ -192,13 +192,7 @@
                         title="更多"
                         title="更多"
                       />
                       />
                       <el-dropdown-menu class="dropdown-menu" slot="dropdown">
                       <el-dropdown-menu class="dropdown-menu" slot="dropdown">
-                        <el-dropdown-item>重置密码</el-dropdown-item>
-                        <el-popconfirm
-                          icon="el-icon-info"
-                          icon-color="red"
-                          title="确定要重置吗?"
-                        >
-                        </el-popconfirm>
+                        <el-dropdown-item  command="reset">重置密码</el-dropdown-item>
                       </el-dropdown-menu>
                       </el-dropdown-menu>
                     </el-dropdown>
                     </el-dropdown>
                   </el-tooltip>
                   </el-tooltip>
@@ -231,7 +225,7 @@
 import waves from "@/directive/waves";
 import waves from "@/directive/waves";
 import swPage from "@/views/common/swPage";
 import swPage from "@/views/common/swPage";
 import { dynamicTree } from "@/api/auth/position";
 import { dynamicTree } from "@/api/auth/position";
-import { fetchList, deleteUser } from "@/api/auth/user";
+import { fetchList, deleteUser,resetPwd } from "@/api/auth/user";
 import { positionCategory, userStatus } from "@/constants/index";
 import { positionCategory, userStatus } from "@/constants/index";
 import { getValueByKey } from "@/utils/index";
 import { getValueByKey } from "@/utils/index";
 import addUserEditDialog from "./components/addUserEditDialog";
 import addUserEditDialog from "./components/addUserEditDialog";
@@ -351,7 +345,6 @@ export default {
       this.addUserEditDialogDatas.visible = true;
       this.addUserEditDialogDatas.visible = true;
       this.addUserEditDialogDatas.orgData = row;
       this.addUserEditDialogDatas.orgData = row;
     },
     },
-
     handleDelete(row) {
     handleDelete(row) {
       //删除
       //删除
       this.$confirm("确定删除用户?", "提示", {
       this.$confirm("确定删除用户?", "提示", {
@@ -370,6 +363,29 @@ export default {
           this.list.splice(index, 1); //数值删除
           this.list.splice(index, 1); //数值删除
         });
         });
       });
       });
+    },
+    handleMore(command,row) {
+      //更多
+      if(command === 'reset') {
+        this.handleResetPwd(row)
+      }
+    },
+    handleResetPwd(row) {
+      //重置密码
+      this.$confirm("确定重置密码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        resetPwd([{ userId: row.id }]).then(() => {
+          this.$notify({
+            title: "成功",
+            message: "重置成功",
+            type: "success",
+            duration: 3000
+          });
+        });
+      });
     }
     }
   }
   }
 };
 };

+ 0 - 1
src/views/auth/user/userIndex.vue

@@ -478,7 +478,6 @@ export default {
     },
     },
 
 
     handleUpdate(row) {
     handleUpdate(row) {
-      console.log(row);
       this.dialogFormVisible = true;
       this.dialogFormVisible = true;
       this.resetMidData();
       this.resetMidData();
       this.isUpdate = true;
       this.isUpdate = true;

+ 9 - 3
vue.config.js

@@ -26,12 +26,18 @@ module.exports = {
     },
     },
     public: "0.0.0.0:9557", //可以实现热部署
     public: "0.0.0.0:9557", //可以实现热部署
     proxy: {
     proxy: {
-
-      "/": {
+      // "/video-service": {
+      //   target: "http://60.165.238.181:8189/",
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     "^/video-service": ""
+      //   }
+      // },
+      "/app": {
         // target: "http://10.41.3.106:9093",
         // target: "http://10.41.3.106:9093",
         target: "https://portal.gloria.com.cn",
         target: "https://portal.gloria.com.cn",
         changeOrigin: true
         changeOrigin: true
-      },
+      }
     }
     }
   },
   },
   // webpack配置
   // webpack配置