修改

.env.development

@@ -6,6 +6,7 @@ ENV = 'development'
 
 
 # 投选活动/开发环境
 # 投选活动/开发环境
 VUE_APP_BASE_API = '/dev-api'
 VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API2 = '/rz-api'
 
 
 # 路由懒加载
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -6,3 +6,4 @@ ENV = 'production'
 
 
 # 投选活动/生产环境
 # 投选活动/生产环境
 VUE_APP_BASE_API = '/tp-api'
 VUE_APP_BASE_API = '/tp-api'
+VUE_APP_BASE_API2 = '/rz-api'

src/api/rz.js

+import request from "@/utils/request2";
+
+// 查询投票单位列表
+export function querySlAppToken(query) {
+  return request({
+    url: "/verify",
+    method: "get",
+  });
+}
+// 查询投票单位列表
+export function querySlUserInfoByAccount(query) {
+  return request({
+    url: "/user/rest/querySlUserInfoByAccount",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询投票单位列表
+export function tc(query) {
+  return request({
+    url: "/logout",
+    method: "get",
+    params: query,
+  });
+}
+

src/main.js

@@ -38,6 +38,9 @@ import VueMeta from 'vue-meta'
 // 字典数据组件
 // 字典数据组件
 import DictData from '@/components/DictData'
 import DictData from '@/components/DictData'
 
 
+
+
+
 // 全局方法挂载
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.getConfigKey = getConfigKey

src/permission.js

@@ -8,7 +8,8 @@ import { isRelogin } from "@/utils/request";
 
 
 NProgress.configure({ showSpinner: false });
 NProgress.configure({ showSpinner: false });
 
 
-const whiteList = ["/login", "/register", "/rytp","/info"];
+const whiteList = ["/login", "/register","/info"];
+const whiteList2 = ["/rytp"];
 
 
 router.beforeEach((to, from, next) => {
 router.beforeEach((to, from, next) => {
   NProgress.start();
   NProgress.start();
@@ -49,6 +50,23 @@ router.beforeEach((to, from, next) => {
     if (whiteList.indexOf(to.path) !== -1) {
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
       // 在免登录白名单，直接进入
       next();
       next();
+    } else if(whiteList2.indexOf(to.path) !== -1){
+      console.log(to.query)
+      const eaiUatToken = to.query.eai_uat_token;
+      console.log(eaiUatToken)
+      if(eaiUatToken){
+        sessionStorage.setItem("eai_uat_token", eaiUatToken);
+        sessionStorage.setItem("eai_uat_token2", "Bearer "+eaiUatToken);
+      }
+      console.log(sessionStorage.getItem("eai_uat_token"),"sessionStorage.getItem")
+      var eai_uat_token=sessionStorage.getItem("eai_uat_token")
+      if (eai_uat_token) {
+        next()
+      } else {
+        const authUrl = `http://10.66.25.151:8092/eai/auth/verify?redirectUrl=http://10.66.1.17:9034/tp/rytp`;
+        window.location.href = authUrl; // 直接跳转到认证页面
+      }
+      // next()
     } else {
     } else {
       next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
       next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
       NProgress.done();
       NProgress.done();

src/utils/request2.js

+import axios from "axios";
+import { Notification, MessageBox, Message, Loading } from "element-ui";
+import store from "@/store";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
+import { tansParams, blobValidate } from "@/utils/ruoyi";
+import cache from "@/plugins/cache";
+import { saveAs } from "file-saver";
+var tokenrz=sessionStorage.getItem("eai_uat_token2")
+console.log(tokenrz,"tokenrz")
+let downloadLoadingInstance;
+// 是否显示重新登录
+export let isRelogin = { show: false };
+
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
+// 创建axios实例
+const service = axios.create({
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_BASE_API2,
+  // 超时
+  timeout: 10000,
+});
+
+// request拦截器
+service.interceptors.request.use(
+  (config) => {
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false;
+    // 是否需要防止数据重复提交
+    const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
+
+    config.headers["Authorization"] = tokenrz; // 让每个请求携带自定义token 请根据实际情况自行修改
+    // get请求映射params参数
+    if (config.method === "get" && config.params) {
+      let url = config.url + "?" + tansParams(config.params);
+      url = url.slice(0, -1);
+      config.params = {};
+      config.url = url;
+    }
+    if (
+      !isRepeatSubmit &&
+      (config.method === "post" || config.method === "put")
+    ) {
+      const requestObj = {
+        url: config.url,
+        data:
+          typeof config.data === "object"
+            ? JSON.stringify(config.data)
+            : config.data,
+        time: new Date().getTime(),
+      };
+      const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
+      const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
+      if (requestSize >= limitSize) {
+        console.warn(
+          `[${config.url}]: ` +
+            "请求数据大小超出允许的5M限制，无法进行防重复提交验证。"
+        );
+        return config;
+      }
+      const sessionObj = cache.session.getJSON("sessionObj");
+      if (
+        sessionObj === undefined ||
+        sessionObj === null ||
+        sessionObj === ""
+      ) {
+        cache.session.setJSON("sessionObj", requestObj);
+      } else {
+        const s_url = sessionObj.url; // 请求地址
+        const s_data = sessionObj.data; // 请求数据
+        const s_time = sessionObj.time; // 请求时间
+        const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
+        if (
+          s_data === requestObj.data &&
+          requestObj.time - s_time < interval &&
+          s_url === requestObj.url
+        ) {
+          const message = "数据正在处理，请勿重复提交";
+          console.warn(`[${s_url}]: ` + message);
+          return Promise.reject(new Error(message));
+        } else {
+          cache.session.setJSON("sessionObj", requestObj);
+        }
+      }
+    }
+    return config;
+  },
+  (error) => {
+    console.log(error);
+    Promise.reject(error);
+  }
+);
+
+// 响应拦截器
+service.interceptors.response.use(
+  (res) => {
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200;
+    // 获取错误信息
+    const msg = errorCode[code] || res.data.msg || errorCode["default"];
+    // 二进制数据则直接返回
+    if (
+      res.request.responseType === "blob" ||
+      res.request.responseType === "arraybuffer"
+    ) {
+      return res.data;
+    }
+    if (code === 401) {
+      if (!isRelogin.show) {
+        isRelogin.show = true;
+        MessageBox.confirm(
+          "登录状态已过期，您可以继续留在该页面，或者重新登录",
+          "系统提示",
+          {
+            confirmButtonText: "重新登录",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        )
+          .then(() => {
+            isRelogin.show = false;
+            store.dispatch("LogOut").then(() => {
+              location.href = "/tp/index";
+            });
+          })
+          .catch(() => {
+            isRelogin.show = false;
+          });
+      }
+      return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
+    } else if (code === 500) {
+      Message({ message: msg, type: "error" });
+      return Promise.reject(new Error(msg));
+    } else if (code === 601) {
+      Message({ message: msg, type: "warning" });
+      return Promise.reject("error");
+    } else if (code !== 200) {
+      Notification.error({ title: msg });
+      return Promise.reject("error");
+    } else {
+      return res.data;
+    }
+  },
+  (error) => {
+    console.log("err" + error);
+    let { message } = error;
+    if (message == "Network Error") {
+      message = "后端接口连接异常";
+    } else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    } else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({ message: message, type: "error", duration: 5 * 1000 });
+    return Promise.reject(error);
+  }
+);
+
+// 通用下载方法
+export function download(url, params, filename, config) {
+  downloadLoadingInstance = Loading.service({
+    text: "正在下载数据，请稍候",
+    spinner: "el-icon-loading",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
+  return service
+    .post(url, params, {
+      transformRequest: [
+        (params) => {
+          return tansParams(params);
+        },
+      ],
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      responseType: "blob",
+      ...config,
+    })
+    .then(async (data) => {
+      const isBlob = blobValidate(data);
+      if (isBlob) {
+        const blob = new Blob([data]);
+        saveAs(blob, filename);
+      } else {
+        const resText = await data.text();
+        const rspObj = JSON.parse(resText);
+        const errMsg =
+          errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
+        Message.error(errMsg);
+      }
+      downloadLoadingInstance.close();
+    })
+    .catch((r) => {
+      console.error(r);
+      Message.error("下载文件出现错误，请联系管理员！");
+      downloadLoadingInstance.close();
+    });
+}
+
+export default service;

src/views/info.vue

@@ -14,16 +14,17 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
-
+    var url="http://10.66.25.151:8092/eai/auth/verify?redirectUrl=http://10.66.1.17:9034/tp/rytp"
     let query = this.$route.query;
     let query = this.$route.query;
-    let tk = query.tk;
-    let url = "/rytp";
-    let to = {
-      path: url,
-      query: {tk:tk}
-    }
-
-    this.$router.push(to)
+    console.log(query)
+    // let tk = query.tk;
+    // let url = "/rytp";
+    // let to = {
+    //   path: url,
+    //   query: {tk:tk}
+    // }
+    //
+    // this.$router.push(to)
   },
   },
   methods: {
   methods: {
 
 

src/views/rytj/index.vue

@@ -8,10 +8,10 @@
                         :value="dict.value" />
                         :value="dict.value" />
                 </el-select>
                 </el-select>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="单位名称" prop="dwmc">
-                <el-input v-model="queryParams.dwmc" placeholder="请输入单位名称" clearable
-                    @keyup.enter.native="handleQuery" />
-            </el-form-item>
+<!--            <el-form-item label="单位名称" prop="dwmc">-->
+<!--                <el-input v-model="queryParams.dwmc" placeholder="请输入单位名称" clearable-->
+<!--                    @keyup.enter.native="handleQuery" />-->
+<!--            </el-form-item>-->
 
 
             <el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

src/views/rytptj/index.vue

@@ -5,8 +5,8 @@
             <el-form-item label="姓名" prop="name">
             <el-form-item label="姓名" prop="name">
                 <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
                 <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             </el-form-item>
-            <el-form-item label="AD账号" prop="ipdz">
-                <el-input v-model="queryParams.ipdz" placeholder="请输入AD账号" clearable
+            <el-form-item label="统一账号" prop="username">
+                <el-input v-model="queryParams.username" placeholder="请输入AD账号" clearable
                     @keyup.enter.native="handleQuery" />
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
             </el-form-item>
 
 
@@ -19,9 +19,9 @@
 
 
         <el-table v-loading="loading" border :data="tpInfoList" @selection-change="handleSelectionChange">
         <el-table v-loading="loading" border :data="tpInfoList" @selection-change="handleSelectionChange">
             <el-table-column label="姓名" align="center" width="150px" prop="name" />
             <el-table-column label="姓名" align="center" width="150px" prop="name" />
-            <el-table-column label="二级单位名称" align="center" prop="ejdwmc" width="200px" />
-            <el-table-column label="单位名称" align="center" prop="dwmc" width="180px" />
-            <el-table-column label="AD账号" align="center" prop="adzh" width="160px" />
+<!--            <el-table-column label="二级单位名称" align="center" prop="ejdwmc" width="200px" />-->
+<!--            <el-table-column label="单位名称" align="center" prop="dwmc" width="180px" />-->
+<!--            <el-table-column label="AD账号" align="center" prop="adzh" width="160px" />-->
             <el-table-column label="统一账号" align="center" prop="username" width="160px" />
             <el-table-column label="统一账号" align="center" prop="username" width="160px" />
             <el-table-column label="投票时间" align="center" prop="createTime" width="180px" />
             <el-table-column label="投票时间" align="center" prop="createTime" width="180px" />
             <el-table-column prop="tpry" label="投票人" align="left">
             <el-table-column prop="tpry" label="投票人" align="left">

vue.config.js

@@ -35,13 +35,20 @@ module.exports = {
     proxy: {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8889`,
-        target: `http://192.168.31.22:8889`,
+        target: `http://localhost:8889`,
+        // target: `http://192.168.31.22:8889`,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",
           ["^" + process.env.VUE_APP_BASE_API]: "",
         },
         },
       },
       },
+      [process.env.VUE_APP_BASE_API2]: {
+        target: `http://10.66.25.151:8092/eai/auth`,
+        changeOrigin: true,
+        pathRewrite: {
+          ["^" + process.env.VUE_APP_BASE_API2]: "",
+        },
+      },
     },
     },
     disableHostCheck: true,
     disableHostCheck: true,
   },
   },