shaogen1995 1 year ago
parent
commit
762d00349b

+ 19 - 18
src/pages/A1Project/A1Look/index.tsx

@@ -14,9 +14,9 @@ const A1Outer = React.lazy(() => import("../A1Outer"));
 
 
 const A1Tab = [
 const A1Tab = [
   { id: "1080", name: "项目介绍" },
   { id: "1080", name: "项目介绍" },
-  { id: "1111", name: "项目成果" },
+  { id: "1115", name: "项目成果" },
   { id: "1090", name: "项目文件" },
   { id: "1090", name: "项目文件" },
-  { id: "1101", name: "内控文件" },
+  { id: "1100", name: "内控文件" },
   { id: "1110", name: "项目成员" },
   { id: "1110", name: "项目成员" },
 ];
 ];
 
 
@@ -31,12 +31,17 @@ function A1Look({ pageType, closeFu, tabType, lookTit }: Props) {
   // 权限
   // 权限
   const authArr = useSelector((state: RootState) => state.A4Role.A4RoleAll);
   const authArr = useSelector((state: RootState) => state.A4Role.A4RoleAll);
 
 
-  // useEffect(() => {
-  //   if (authArr.includes("1080")) setTopType("1080");
-  //   else if (authArr.includes("1090")) setTopType("1090");
-  //   else if (authArr.includes("1101")) setTopType("1101");
-  //   else if (authArr.includes("1110")) setTopType("1110");
-  // }, [authArr]);
+  useEffect(() => {
+    if (authArr.includes("1080")) setTopType("1080");
+    else if (authArr.includes("1115")) setTopType("1115");
+    else if (authArr.includes("1090")) setTopType("1090");
+    else if (authArr.includes("1100")) setTopType("1100");
+    else if (authArr.includes("1110")) setTopType("1110");
+
+    setTimeout(() => {
+      if (tabType && authArr.includes("1100")) setTopType("1100");
+    }, 50);
+  }, [authArr, tabType]);
 
 
   // 动态改变顶部 title
   // 动态改变顶部 title
   const [myTitle, setMyTitle] = useState("");
   const [myTitle, setMyTitle] = useState("");
@@ -47,14 +52,10 @@ function A1Look({ pageType, closeFu, tabType, lookTit }: Props) {
 
 
   const [sonPageType, setSonPageType] = useState(pageType);
   const [sonPageType, setSonPageType] = useState(pageType);
 
 
-  const [topType, setTopType] = useState("1080");
-
-  useEffect(() => {
-    if (tabType && authArr.includes("1101")) setTopType("1101");
-  }, [authArr, tabType]);
+  const [topType, setTopType] = useState("");
 
 
   useEffect(() => {
   useEffect(() => {
-    if (["1080", "1111"].includes(topType)) {
+    if (["1080", "1115"].includes(topType)) {
       setSonPageType({ txt: "look", id: pageType.id });
       setSonPageType({ txt: "look", id: pageType.id });
     }
     }
   }, [pageType.id, topType]);
   }, [pageType.id, topType]);
@@ -84,7 +85,7 @@ function A1Look({ pageType, closeFu, tabType, lookTit }: Props) {
       </div>
       </div>
       <div className="A1LookTab">
       <div className="A1LookTab">
         {A1Tab.map((v) => (
         {A1Tab.map((v) => (
-          <AuthCom aId={v.id === "1101" ? "1101" : "-1"} key={v.id}>
+          <AuthCom aId={v.id} key={v.id}>
             <div
             <div
               onClick={() => setTopType(v.id)}
               onClick={() => setTopType(v.id)}
               className={classNames(
               className={classNames(
@@ -98,7 +99,7 @@ function A1Look({ pageType, closeFu, tabType, lookTit }: Props) {
         ))}
         ))}
       </div>
       </div>
       <div className="A1LookMain">
       <div className="A1LookMain">
-        {["1080", "1111"].includes(topType) && sonPageType.txt === "look" ? (
+        {["1080", "1115"].includes(topType) && sonPageType.txt === "look" ? (
           <AuthCom aId="1081">
           <AuthCom aId="1081">
             <div className="A1lrBtn">
             <div className="A1lrBtn">
               <Button
               <Button
@@ -121,7 +122,7 @@ function A1Look({ pageType, closeFu, tabType, lookTit }: Props) {
           />
           />
         ) : topType === "1090" ? (
         ) : topType === "1090" ? (
           <A1Outer projectId={pageType.id} projectName={myTitle} />
           <A1Outer projectId={pageType.id} projectName={myTitle} />
-        ) : topType === "1101" ? (
+        ) : topType === "1100" ? (
           <A1Inner
           <A1Inner
             projectId={pageType.id}
             projectId={pageType.id}
             myTitle={myTitle.split(" - ") ? myTitle.split(" - ")[0] : ""}
             myTitle={myTitle.split(" - ") ? myTitle.split(" - ")[0] : ""}
@@ -129,7 +130,7 @@ function A1Look({ pageType, closeFu, tabType, lookTit }: Props) {
           />
           />
         ) : topType === "1110" ? (
         ) : topType === "1110" ? (
           <A1User projectId={pageType.id} />
           <A1User projectId={pageType.id} />
-        ) : topType === "1111" ? (
+        ) : topType === "1115" ? (
           <A1Result
           <A1Result
             closeFu={tab1CloseFu}
             closeFu={tab1CloseFu}
             pageType={sonPageType}
             pageType={sonPageType}

+ 1 - 1
src/pages/A1Project/A1User/index.tsx

@@ -129,7 +129,7 @@ function A1User({ projectId }: Props) {
           />
           />
         </div>
         </div>
         <div className="A1Utop2">
         <div className="A1Utop2">
-          <AuthCom aId="1111">
+          <AuthCom aId="1115">
             <Button
             <Button
               type="primary"
               type="primary"
               onClick={() => setAddInfo({ id: -1, projectId } as A1UtableType)}
               onClick={() => setAddInfo({ id: -1, projectId } as A1UtableType)}

+ 18 - 2
src/pages/A1Project/index.tsx

@@ -150,6 +150,21 @@ function A1Project() {
     return ss1 + ss2 + ss3;
     return ss1 + ss2 + ss3;
   }, []);
   }, []);
 
 
+  // 如果 项目详情 -5个tab都没有设置权限
+  const tabFlag = useMemo(() => {
+    let flag = false;
+    if (
+      !authArr.includes("1080") &&
+      !authArr.includes("1115") &&
+      !authArr.includes("1090") &&
+      !authArr.includes("1100") &&
+      !authArr.includes("1110")
+    ) {
+      flag = true;
+    }
+    return flag;
+  }, [authArr]);
+
   const columns = useMemo(() => {
   const columns = useMemo(() => {
     const arr: any = [
     const arr: any = [
       {
       {
@@ -230,6 +245,7 @@ function A1Project() {
       render: (item: A1TableType) => (
       render: (item: A1TableType) => (
         <>
         <>
           <Button
           <Button
+            hidden={tabFlag}
             size="small"
             size="small"
             type="text"
             type="text"
             onClick={() => {
             onClick={() => {
@@ -247,7 +263,7 @@ function A1Project() {
             <>
             <>
               <AuthCom aId="1104">
               <AuthCom aId="1104">
                 <Button
                 <Button
-                  hidden={!authArr.includes("1101")}
+                  hidden={tabFlag}
                   size="small"
                   size="small"
                   type="text"
                   type="text"
                   onClick={() => {
                   onClick={() => {
@@ -298,7 +314,7 @@ function A1Project() {
     });
     });
 
 
     return arr;
     return arr;
-  }, [authArr, delById, pcsTxt, topType]);
+  }, [delById, pcsTxt, tabFlag, topType]);
 
 
   // 新增和查看
   // 新增和查看
   const [pageType, setPageType] = useState<{
   const [pageType, setPageType] = useState<{

+ 5 - 4
src/pages/A4Role/A4Auth/index.module.scss

@@ -114,12 +114,13 @@
       .A4A1Btn {
       .A4A1Btn {
         margin-bottom: 15px;
         margin-bottom: 15px;
         position: relative;
         position: relative;
-        .A4AMainTit{
+
+        .A4AMainTit {
+          left: 170px;
+          color: #ff4d4f;
+          font-size: 14px;
           position: absolute;
           position: absolute;
-          right: 373px;
           top: 77px;
           top: 77px;
-          font-size: 1px;
-          color: #ff4d4f;
         }
         }
       }
       }
 
 

+ 1 - 1
src/utils/authFilesLook.ts

@@ -124,7 +124,7 @@ export const authFilesLookFu = (
       : urlChangeFu(url, false, type);
       : urlChangeFu(url, false, type);
   }
   }
 
 
-  // ppt,doc,Excel使用插件
+  // docx xlsx使用插件
   const arr3: (".docx" | ".xlsx")[] = [".docx", ".xlsx"];
   const arr3: (".docx" | ".xlsx")[] = [".docx", ".xlsx"];
   arr3.forEach((v) => {
   arr3.forEach((v) => {
     if (nameRes.toLowerCase().endsWith(v)) {
     if (nameRes.toLowerCase().endsWith(v)) {

+ 6 - 6
src/utils/http.ts

@@ -7,12 +7,12 @@ import { domShowFu } from "./domShow";
 // 请求基地址
 // 请求基地址
 export const baseURL =
 export const baseURL =
   // 线下的图片地址需要加上/api/
   // 线下的图片地址需要加上/api/
-  // process.env.NODE_ENV === "development"
-  //   ? "http://192.168.20.61:8054/api/"
-  //   : "";
   process.env.NODE_ENV === "development"
   process.env.NODE_ENV === "development"
-    ? "https://sit-projectfile.4dage.com"
+    ? "http://192.168.20.61:8054/api/"
     : "";
     : "";
+  // process.env.NODE_ENV === "development"
+  //   ? "https://sit-projectfile.4dage.com"
+  //   : "";
 
 
 // 处理  类型“AxiosResponse<any, any>”上不存在属性“code”
 // 处理  类型“AxiosResponse<any, any>”上不存在属性“code”
 declare module "axios" {
 declare module "axios" {
@@ -27,10 +27,10 @@ export const baseUpUrl = baseURL + "/api/";
 // 创建 axios 实例
 // 创建 axios 实例
 const http = axios.create({
 const http = axios.create({
   // --------线下的地址不用加/api/
   // --------线下的地址不用加/api/
-  // baseURL: baseURL,
+  baseURL: baseURL,
 
 
   // --------打包或线上环境接口需要加上api/
   // --------打包或线上环境接口需要加上api/
-  baseURL: baseUpUrl,
+  // baseURL: baseUpUrl,
   timeout: 5000,
   timeout: 5000,
 });
 });