Merge branch 'main' of http://47.122.43.22:3000/wjn/mh-sms-web

2024-02-02 11:11:33 +08:00 · 2024-02-02 11:11:33 +08:00 · 71440b6a7e
commit 71440b6a7e
parent 883b3698f7 b9bd5c168c
5 changed files with 2 additions and 182 deletions
--- a/src/files/edit/OG020.js
+++ b/src/files/edit/OG020.js
@ -1,34 +0,0 @@
-import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
-/**
- * @return {string}
- */
-// 编辑
-export default {
-  onBeforeSaveHandleRecord(params) {
-    params.record.TaskID = params.data.TaskID    //TaskID传递消息表ID
-    params.record.PUBLISH = params.customParams;
-  },
-  onBeforeEdit(params) {
-    const { isNew, dispatch, login, setFieldRequired,setFieldValueByBatch, setFieldEditable, getFieldValue,stateData } = params ? params : {};
-    if (isNew) {
-      let json = initFilter(login.OrgId);
-      dispatch({
-        type: 'app/getDataByPost',
-        payload: json,
-        url: 'OG/OGRelatedEstimate/FullGet',
-        onComplete: (ret) => {
-          if (ret) {
-            let temps = [];
-            ret.Nav_Details.forEach(element => {
-              element.ROW_NO=element.NUM;
-            });
-            temps.push({ field: 'ID', value: ret.ID })
-            temps.push({ field: 'RELATED_ID', value: ret.RELATED_ID })
-            temps.push({ field: 'Nav_Details', value: ret.Nav_Details })
-            setFieldValueByBatch(temps);
-          }
-        }
-      });
-    }
-  },
-}
--- a/src/layout/Header.js
+++ b/src/layout/Header.js
@ -138,7 +138,6 @@ const User = (props) => {
      payload: logJson,
    });
    localStorage.removeItem("accessToken");
-    localStorage.removeItem("currentMineTypeName");
    props.history.push({ pathname: "/login" });
  };

@ -210,105 +209,6 @@ const User = (props) => {
  );
 };
 const HeaderUser = withRouter(connect(({ login }) => ({ login }))(User));
-// 2023-10-08 生产单元
-const MineType = (props) => {
-  const [visible, setVisible] = useState(false);
-  let currUserMineType = localStorage.getItem("MineType");
-  if (currUserMineType == null || currUserMineType == undefined) {
-    localStorage.setItem("MineType", "30");
-    localStorage.setItem("currentMineTypeName", "露天矿");
-  } else {
-    if (localStorage.getItem("currentMineTypeName") == null) {
-      if (currUserMineType.indexOf(30) > -1) {
-        localStorage.setItem("currentMineType", 30);
-        localStorage.setItem("currentMineTypeName", "露天矿");
-      } else if (currUserMineType.indexOf(20) > -1) {
-        localStorage.setItem("currentMineType", 20);
-        localStorage.setItem("currentMineTypeName", "尾矿库");
-      } else if (currUserMineType.indexOf(10) > -1) {
-        localStorage.setItem("currentMineType", 10);
-        localStorage.setItem("currentMineTypeName", "选矿厂");
-      } else if (currUserMineType.indexOf(40) > -1) {
-        localStorage.setItem("currentMineType", 40);
-        localStorage.setItem("currentMineTypeName", "地下矿");
-      }
-    } else {
-      let currentMineType = localStorage.getItem("currentMineType");
-      if (currUserMineType.indexOf(currentMineType) > -1) {
-        if (currentMineType == 30) {
-          localStorage.setItem("currentMineTypeName", "露天矿");
-        } else if (currUserMineType == 20) {
-          localStorage.setItem("currentMineTypeName", "尾矿库");
-        } else if (currUserMineType == 10) {
-          localStorage.setItem("currentMineTypeName", "选矿厂");
-        } else if (currUserMineType == 40) {
-          localStorage.setItem("currentMineTypeName", "地下矿");
-        }
-      } else {
-        if (currUserMineType.indexOf(30) > -1) {
-          localStorage.setItem("currentMineTypeName", "露天矿");
-        } else if (currUserMineType.indexOf(20) > -1) {
-          localStorage.setItem("currentMineTypeName", "尾矿库");
-        } else if (currUserMineType.indexOf(10) > -1) {
-          localStorage.setItem("currentMineTypeName", "选矿厂");
-        } else if (currUserMineType.indexOf(40) > -1) {
-          localStorage.setItem("currentMineTypeName", "地下矿");
-        }
-      }
-    }
-  }
-
-  let currUserMineTypeArray = [];
-  if (currUserMineType.indexOf("30") > -1) {
-    currUserMineTypeArray.push({ key: "30", label: "露天矿" });
-  }
-  if (currUserMineType.indexOf("10") > -1) {
-    currUserMineTypeArray.push({ key: "10", label: "选矿厂" });
-  }
-  if (currUserMineType.indexOf("20") > -1) {
-    currUserMineTypeArray.push({ key: "20", label: "尾矿库" });
-  }
-  if (currUserMineType.indexOf("40") > -1) {
-    currUserMineTypeArray.push({ key: "40", label: "地下矿" });
-  }
-  const MineTypeMenu = () => {
-    return (
-      <Menu onClick={handleMineTypeClick}>
-        {currUserMineTypeArray.map((item) => (
-          <Menu.Item key={item.key}>{item.label}</Menu.Item>
-        ))}
-      </Menu>
-    );
-  };
-  /**
-   * 生产单元切换
-   * @param {*} evt
-   */
-  const handleMineTypeClick = (evt) => {
-    localStorage.setItem("currentMineType", evt.key);
-    localStorage.setItem("currentMineTypeName", evt.item.props.children);
-    setVisible(false);
-    window.location.reload();
-  };
-  if (window.navigator.userAgent.indexOf("Windows") < 1) {
-    return <div></div>;
-  } else {
-    return (
-      <Dropdown
-        visible={visible}
-        onVisibleChange={setVisible}
-        overlay={MineTypeMenu}
-      >
-        <a style={{ color: "#000000A6", marginLeft: "20px" }}>
-          <b>生产单元：{localStorage.getItem("currentMineTypeName")}</b>
-        </a>
-      </Dropdown>
-    );
-  }
-};
-const HeaderMineType = withRouter(
-  connect(({ login }) => ({ login }))(MineType)
-);
 const GuideCodePage = (props) => {
  const [showCanvas, setshowCanvas] = useState(false);
  const currVans = (val) => {
@ -443,7 +343,6 @@ function Header(props) {
          <HeaderDataV />
          <HeaderSearch />
          {/* style={{"color":"#f3eded"}} */}
-          <HeaderMineType />
          <HeaderUser />
          <b>
            {props.login.user.NAME}({props.login.user.CODE})
--- a/src/models/login.js
+++ b/src/models/login.js
@ -252,7 +252,6 @@ export default {
        storage("lacal").setItem("DataRule", ret.DataRule || []);
        storage("lacal").setItem("OrgRule", ret.OrgRule || []);
        storage("lacal").setItem("departmentId", ret.User.DEPARTMENT_ID);
-        storage("lacal").setItem("MineType", ret.User.MineType);
        storage("lacal").setItem("UserType", ret.UserType);
        const localStorage = window.localStorage;

@ -263,41 +262,6 @@ export default {
        const copyMenus = cloneDeep(ret.Menus);
        recurseMenu(copyMenus, undefined, flatMenus);
        ret.Menus = copyMenus;
-
-        const currentMineType = localStorage.getItem("currentMineType");
-        if (currentMineType) {
-          var filterObj = function (item) {
-              if (item.Node.MineType && item.Node.MineType.indexOf(currentMineType) > -1) {
-                if (item.Children.length !== 0) {
-                  item.Children = item.Children.filter(function (child) {
-                    if (child.Children.length !== 0) {
-                      return filterObj(child);
-                    } else {
-                      if (child.Node.MineType) {
-                        return child.Node.MineType.indexOf(currentMineType) > -1
-                      }
-                    }
-                  });
-                  if (item.Children.length > 0) {
-                    return true;
-                  }
-                } else {
-                  if (item.Node.MineType) {
-                    return item.Node.MineType.indexOf(currentMineType) > -1;
-                  }
-                  return;
-                }
-                return true;
-              }
-            
-          };
-          var filter = ret.Menus.filter(function (item) {
-            return filterObj(item);
-          });
-
-          ret.Menus = filter;
-        }
-
        // 存储 model state
        yield put({
          type: "save",
--- a/src/routes/Home.js
+++ b/src/routes/Home.js
@ -192,10 +192,6 @@ class Home extends React.Component {
        title: "",
      },
      taskSelects: [],
-      mineType:
-        localStorage.getItem("currentMineType") === "20"
-          ? "10"
-          : localStorage.getItem("currentMineType"),
    };
    // this.enums = [];
    this.reportType = "";
@ -512,7 +508,6 @@ class Home extends React.Component {
    else if (orgId == "8b3c41aa-51b1-7ce9-1879-248a038c1b5c") {
      this.setState({
        safetySloganOne: "安全方针：安全第一，预防为主，科学管理，持续改进。",
-        mineType: localStorage.getItem("currentMineType")
      });
    }
    //洛阳豫璐
@ -525,14 +520,12 @@ class Home extends React.Component {
    else if (orgId == "3efd5276-632b-e379-9ff3-7a7546591fca") {
      this.setState({
        safetySloganOne: "安全方针：安全第一、综合治理、控制风险、科学发展",
-        mineType: localStorage.getItem("currentMineType")
      });
    }
    //行洛坑
    else {
      this.setState({
        safetySloganOne: "安全方针：安全第一、综合治理、控制风险、科学发展",
-        mineType: localStorage.getItem("currentMineType")
      });
    }
    this.setState({
@ -555,13 +548,13 @@ class Home extends React.Component {
          this.departmentCompletion();
          this.workTicket(); //工作票完成率前十(统计图)
          this.riskLevel(); //岗位风险等级(饼图)
-          this.getStandardScore(ret.MineType); //获取标准化评分
+          this.getStandardScore(); //获取标准化评分
          this.hiddenDanger();
        }
      },
    });
  };
-  getStandardScore = (MineType) => {
+  getStandardScore = () => {
    //标准化得分
    var orgId = storage("lacal").getItem("webOrgId")?.val; //登录后有存储登录信息
    let json = "";
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -46,7 +46,6 @@ export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
  const RootOrgId = storage('lacal').getItem('RootOrgId').val
  const orgId = storage('lacal').getItem('webOrgId').val
  const depId = storage('lacal').getItem('departmentId').val
-  const mineType = storage('lacal').getItem('MineType').val
  const DataRule = storage('lacal').getItem('DataRule').val
  const headers = {
    'Content-Type': type === 'post' ? 'application/json' : 'application/x-www-form-urlencoded',
@ -54,7 +53,6 @@ export function getRequestHeaders(url, type = 'post', isIgnoreTenant) {
    userid: userId,
    username: user ? user.username : '',
    departmentId: depId,
-    MineType: mineType,
    RootOrgId,
    orgId,
    DataRule