Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/pages/Home/ChemCostComparison.js

@@ -95,6 +95,20 @@ export const ChemCost = ({ open, showTip = false }) => {
     end: defaultTime.e_time,
   };
 
+  const { data } = useRequest(getComparisonData, {
+    defaultParams: [
+      {
+        project_id: projectId,
+        start: curMonth,
+        end: curMonth,
+        type: 1,
+        flag: 1,
+      },
+    ],
+    formatResult(res) {
+      return res[0];
+    },
+  });
   const getValue = (str) => {
     const result = str?.match(/.*?(\d+(?:\.\d+)?)\D*$/);
     if (result && result[1]) return result[1];
@@ -316,16 +330,16 @@ export const ChemCost = ({ open, showTip = false }) => {
             <div className={styles.item}>
               <div className={styles.value}>
                 {open ? getValue(snapshot?.otc_unit || '') : '***'}
-                <span className={styles.unit}>kg/t</span>
+                <span className={styles.unit}>元/m³</span>
               </div>
-              <div className={styles.name}>近一小时吨水药耗</div>
+              <div className={styles.name}>近一小时吨水药成本</div>
             </div>
             <div className={styles.item}>
               <div className={styles.value}>
-                {open ? getValue(snapshot?.otc || '') : '***'}
-                <span className={styles.unit}>kg</span>
+                {open ? data?.value.toFixed(2) : '***'}
+                <span className={styles.unit}>元/m³</span>
               </div>
-              <div className={styles.name}>近一小时药量</div>
+              <div className={styles.name}>当月吨水药成本</div>
             </div>
           </div>
         </div>

src/pages/Home/index.js

@@ -354,7 +354,7 @@ const Medicine = (props) => {
       <ul>
         <li>
           <div className={styles.valueLong}>{open ? otc_cost : '*****'}</div>
-          <div className={styles.btn1}>吨水药耗(元/m³)</div>
+          <div className={styles.btn1}>吨水药成本(元/m³)</div>
         </li>
         <li>
           <div className={styles.valueLong}>

src/pages/SafetyManagement/Command/index.js

@@ -26,10 +26,13 @@ const CommandModal = () => {
     const pw = md5(value);
     const res = await checkPW({ pw });
     if (res) {
-      UnityAction.sendMsg();
+      UnityAction.sendMsg('CommandSuccess');
       // message.success('已切换成【控制模式】');
     }
   };
+  const handleClose = () => {
+    UnityAction.sendMsg('CommandClose');
+  };
   return (
     <div className={styles.modelMain}>
       <Modal
@@ -39,7 +42,8 @@ const CommandModal = () => {
         width={640}
         open={true}
         footer={null}
-        closable={false}
+        // closable={false}
+        onCancel={handleClose}
       >
         <div className={styles.upContent}>
           {new Array(8).fill('').map((item, idx) => (

src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -275,8 +275,8 @@ const DispatchTaskModal = (props: any) => {
       <Form
         form={form}
         layout="horizontal"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
+        labelCol={{ span: 8 }}
+        wrapperCol={{ span: 14 }}
       >
         <Form.Item
           label="工单类型"

src/pages/TaskManage/components/MandateDetail.js

@@ -592,8 +592,8 @@ const DispatchTaskModal = (props) => {
       <Form
         form={form}
         layout="horizontal"
-        labelCol={{ span: 6 }}
-        wrapperCol={{ span: 16 }}
+        labelCol={{ span: 8 }}
+        wrapperCol={{ span: 14 }}
       >
         <Form.Item
           label="工单类型"

src/pages/TaskManage/index.less

@@ -52,11 +52,13 @@
 
 .ant-select-clear {
   opacity: 1 !important;
-  margin-top: -0.12rem !important;
-  width: 0.36rem !important;
-  height: 0.24rem !important;
-  font-size: 0.24rem !important;
+  margin-top: -0.15rem !important;
+  width: auto !important;
+  height: auto !important;
+  font-size: 0.32rem !important;
   color: black !important;
+  border-radius: 50%;
+  display: block;
 }
 
 .antdSelect .ant-select-selection-item,

src/services/safety.js

@@ -37,6 +37,6 @@ export async function queryExceptionList(projectId) {
 export const checkPW = async (data) => {
   return await request(`/api/v1/user/check_automationPw`, {
     method: 'POST',
-    body: data,
+    data: data,
   });
 };