Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

src/pages/ContentManagementSystem/InformationList/index.jsx

@@ -34,23 +34,15 @@ export default (props) => {
     })
   }
 
-  const handleOK = (record, data) => {
-    const titleCourse = record.status ? '您确定要禁用该用户吗? 禁用后该用户不能在后台登陆!' : '您确定要启用该用户吗? 启用后该用户将允许在后台登陆!';
-    Modal.confirm({
-      title: titleCourse,
-      okText: '确认',
-      cancelText: '取消',
-      onOk () {
-        publishNote(record.noteId, record.status ? 'off' : 'on').then(res => {
-          message.success('操作成功');
-          actionRef.current.reload()
-        })
-      },
-    });
-  }
+
   const actions = () => [
     <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>新增</Button>,
   ]
+
+
+
+
+
   const columns = [
     {
       title: '资讯分类',
@@ -66,8 +58,8 @@ export default (props) => {
       search: false,
     }, {
       title: '资讯内容',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'nam1e',
+      key: 'nam1e',
       search: false,
     },
     {

src/pages/GPSDevice/GPS/GPSEdit/index.jsx

@@ -21,6 +21,7 @@ export default (props) => {
   };
 
   const Submit = values => {
+    setLoading(false)
     console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
 
   };

src/pages/GPSDevice/GPS/index.jsx

@@ -1,7 +1,7 @@
 import { history, Link } from 'umi';
 import { useRef } from 'react';
-import { Button, Modal, message, Popconfirm, Tooltip } from 'antd';
-import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { Button, message, Popconfirm, } from 'antd';
+import { PlusOutlined, } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import ProTable, { TableDropdown } from '@ant-design/pro-table';
 
@@ -13,12 +13,12 @@ export default (props) => {
       key: '1',
       name: '胡彦斌',
       age: 32,
+      status: 1,
       zz: '西湖区湖底公园1号',
     },
 
   ];
 
-
   // 测试内容👆-------------------------
 
   const actionRef = useRef();
@@ -34,20 +34,6 @@ export default (props) => {
     })
   }
 
-  const handleOK = (record, data) => {
-    const titleCourse = record.status ? '您确定要禁用该用户吗? 禁用后该用户不能在后台登陆!' : '您确定要启用该用户吗? 启用后该用户将允许在后台登陆!';
-    Modal.confirm({
-      title: titleCourse,
-      okText: '确认',
-      cancelText: '取消',
-      onOk () {
-        publishNote(record.noteId, record.status ? 'off' : 'on').then(res => {
-          message.success('操作成功');
-          actionRef.current.reload()
-        })
-      },
-    });
-  }
   const actions = () => [
     <Button key='add' type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>新增</Button>,
   ]

src/pages/SystemManagement/BasicParameters/index.jsx

@@ -22,7 +22,6 @@ export default (props) => {
 
   const Submit = values => {
     console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
-
   };
 
   return (

src/pages/SystemManagement/MapExtent/index.jsx

@@ -92,7 +92,7 @@ export default () => {
               </Popconfirm>,
             ],
           },
-        }} />,
+        }} />
       <Modal title="套餐权重修改" visible={editModal} onCancel={onCancel} keyboard={false} maskClosable={false} destroyOnClose={true} footer={null}>
         < Form {...formItemLayout} onFinish={Submit} form={form2} >
           <FormItem label="范围名称" name="name" rules={[{ required: true, message: '请输入' }]}>

src/utils/request.js

@@ -1,12 +1,13 @@
+
 import { request } from 'umi';
 import { downloadBlob } from './download';
 
-function requestInterceptor(url, options) {
+function requestInterceptor (url, options) {
   const headers = options.headers || {};
   const token = localStorage.getItem('token')
     ? { 'X-Authorization-JWT': localStorage.getItem('token') }
     : // ? { 'Authorization': localStorage.getItem('token') }
-      {};
+    {};
   const prefix =
     process.env.NODE_ENV === 'production' ? 'http://sgl-v2.njyunzhi.com/api/admin' : '/api/admin';
 
@@ -22,7 +23,7 @@ function requestInterceptor(url, options) {
   };
 }
 
-async function responseInterceptor(response) {
+async function responseInterceptor (response) {
   const contextType = response.headers.get('content-type');
   if (contextType.indexOf('json') > -1) {
     const result = await response.clone().json();
@@ -64,7 +65,7 @@ export const requestConfig = {
 
 export default (...args) => request(...args).then((r) => r.data);
 
-export function queryTable(apiRequest) {
+export function queryTable (apiRequest) {
   return function (params) {
     return apiRequest({
       ...params,