Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

api/app/lib/controllers/data/index.js

@@ -79,9 +79,13 @@ async function dataExport (ctx) {
         const tableAttributes = models[modalOption.tableName].tableAttributes
         let header = []
         for (let k in tableAttributes) {
-            if (k != 'id' && tableAttributes[k].comment) {
+            const comment = tableAttributes[k].comment
+            if (k != 'id' && comment) {
+                if (comment == '品名' && municipalType == '出租车') {
+                    continue
+                }
                 header.push({
-                    title: tableAttributes[k].comment || '-',
+                    title: comment || '-',
                     key: k,
                     index: tableAttributes[k].index,
                 })

api/app/lib/controllers/organization/department.js

@@ -89,6 +89,7 @@ async function editDep (ctx) {
                 where: {
                     dependence: dependence || null,
                     name: name,
+                    delete: false,
                 }
             })
             if (repeatNameCount) {

api/app/lib/controllers/report/index.js

@@ -1,7 +1,7 @@
 'use strict';
 const { QueryTypes } = require('sequelize');
 
-async function reportList(ctx) {
+async function reportList (ctx) {
     try {
         const models = ctx.fs.dc.models;
         const { limit, page, startTime, endTime, keyword, userId, reportType, isTop } = ctx.query
@@ -14,6 +14,7 @@ async function reportList(ctx) {
                 model: models.User,
                 attributes: ['name']
             }],
+            order: [['time', 'DESC']],
         }
         if (limit) {
             findOption.limit = limit
@@ -60,7 +61,7 @@ async function reportList(ctx) {
     }
 }
 
-async function reportPosition(ctx) {
+async function reportPosition (ctx) {
     try {
         const models = ctx.fs.dc.models;
         const { startTime, endTime, userId, reportType } = ctx.query
@@ -110,7 +111,7 @@ async function reportPosition(ctx) {
     }
 }
 
-async function reportDetail(ctx) {
+async function reportDetail (ctx) {
     try {
         const models = ctx.fs.dc.models;
         const { reportId } = ctx.params
@@ -132,7 +133,7 @@ async function reportDetail(ctx) {
     }
 }
 
-async function createReport(ctx) {
+async function createReport (ctx) {
     try {
         const { userId } = ctx.fs.api
         const models = ctx.fs.dc.models;
@@ -154,7 +155,7 @@ async function createReport(ctx) {
     }
 }
 
-async function deleteReport(ctx) {
+async function deleteReport (ctx) {
     try {
         const models = ctx.fs.dc.models;
         const { reportId } = ctx.params;

api/config.js

@@ -52,7 +52,7 @@ const product = {
                     accessKey: QINIU_AK,
                     secretKey: QINIU_SK
                 },
-                maxSize: 104857600, // 100M
+                maxSize: 104857600 * 2, // 100M * 2
             }
         }, {
             entry: require('./app').entry,

scripts/0.0.1/data/4_file_type_data.sql

@@ -0,0 +1,10 @@
+-- ----------------------------
+-- Records of file_type
+-- ----------------------------
+BEGIN;
+INSERT INTO "public"."file_type" VALUES (1, '前期资料', NULL);
+INSERT INTO "public"."file_type" VALUES (3, '竣工资料', NULL);
+INSERT INTO "public"."file_type" VALUES (4, '维修资料', NULL);
+INSERT INTO "public"."file_type" VALUES (5, '道路图片', NULL);
+INSERT INTO "public"."file_type" VALUES (2, '施工资料', NULL);
+COMMIT;

weapp/src/config.js

@@ -9,10 +9,10 @@ const baseConfig = {
 
 const development = {
   // baseUrl: 'http://221.230.55.29:31919',
-  baseUrl: 'https://c5a6-117-90-37-10.ap.ngrok.io',
+  baseUrl: 'https://d763-117-90-37-10.ap.ngrok.io',
   // webUrl: 'https://smartwater.anxinyun.cn',
   // pcode: 'fce4afe2-5b6a-408a-ab18-a2afa7fa027c',
-  imgUrl: 'http://test.resources.anxinyun.cn/',
+  imgUrl: 'http://rfkimpwbb.hn-bkt.clouddn.com/',
   // requestCache: true,    //开启异步请求缓存
   ...baseConfig
 };

weapp/src/packages/patrol/index.jsx

@@ -4,10 +4,14 @@ import { View, RadioGroup, Radio, Image, Input, Picker } from '@tarojs/component
 import { AtButton, AtTextarea, AtImagePicker } from 'taro-ui';
 import InputPicker from '../components/inputPicker';
 import request from '@/services/request';
-import { postReport, getReportDetail, delReport, getRoadSection } from '@/services/api';
+import environment from '../../config';
+import { getState } from '../../store/globalState';
+import { postReport, getReportDetail, delReport, getRoadSection, postImage } from '@/services/api';
 import './index.scss';
 import arrowIcon from '../../static/img/patrol/arrow-down.svg';
 
+const { baseUrl, imgUrl } = environment;
+
 const Index = () => {
   const userInfo = Taro.getStorageSync('userInfo') || {};
   const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false
@@ -30,15 +34,20 @@ const Index = () => {
   const [longitude, setLongitude] = useState(0) // 经度
   const [latitude, setLatitude] = useState(0) // 纬度
 
+  const [sceneImg, setSceneImg] = useState([]) // 现场图片七牛云url
+  const [conserveBeforeImg, setConserveBeforeImg] = useState([]) // 养护前图片
+  const [conserveUnderwayImg, setConserveUnderwayImg] = useState([]) // 养护中图片
+  const [conserveAfterImg, setConserveAfterImg] = useState([]) // 养护后图片
+
   const [sourceRoadSel, setSourceRoadSel] = useState([])
   const [sourceRoadStartSel, setSourceRoadStartSel] = useState([])
   const [sourceRoadEndSel, setSourceRoadEndSel] = useState([])
 
   const prjType = [
-    { text: '道路', value: 'road'},
-    { text: '桥梁', value: 'bridge'},
-    { text: '涵洞', value: 'culvert'},
-    { text: '其他', value: 'other'},
+    { text: '道路', value: 'road' },
+    { text: '桥梁', value: 'bridge' },
+    { text: '涵洞', value: 'culvert' },
+    { text: '其他', value: 'other' },
   ]
   const prjTypeSelector = ['道路', '桥梁', '涵洞', '其他']
   const [roadStartSel, setRoadStartSel] = useState([])
@@ -80,10 +89,10 @@ const Index = () => {
           setRoadSectionEnd(data.roadSectionEnd)
           setAddress(data.address)
           setContent(data.content)
-          setScenePic(data.scenePic ? data.scenePic.map(item => ({ url: item })) : [])
-          setConserveBeforePic(data.conserveBeforePic ? data.conserveBeforePic.map(item => ({ url: item })) : [])
-          setConserveUnderwayPic(data.conserveUnderwayPic ? data.conserveUnderwayPic.map(item => ({ url: item })) : [])
-          setConserveAfterPic(data.conserveAfterPic ? data.conserveAfterPic.map(item => ({ url: item })) : [])
+          setScenePic(data.scenePic ? data.scenePic.map(item => ({ url: imgUrl + item })) : [])
+          setConserveBeforePic(data.conserveBeforePic ? data.conserveBeforePic.map(item => ({ url: imgUrl + item })) : [])
+          setConserveUnderwayPic(data.conserveUnderwayPic ? data.conserveUnderwayPic.map(item => ({ url: imgUrl + item })) : [])
+          setConserveAfterPic(data.conserveAfterPic ? data.conserveAfterPic.map(item => ({ url: imgUrl + item })) : [])
         } else {
           Taro.showToast({ title: res.data.message || '请求出错', icon: 'none' })
         }
@@ -162,6 +171,10 @@ const Index = () => {
       Taro.showToast({ title: '工程类型错误', icon: 'none' })
       return
     }
+    if (content.length > 50) {
+      Taro.showToast({ title: '内容字数不能超过50', icon: 'none' })
+      return
+    }
     const reportProjectType = prjType[prjTypeSelector.indexOf(projectType)].value
 
     let data = {
@@ -176,11 +189,11 @@ const Index = () => {
       latitude
     }
     if (reportType === 'patrol') {
-      data['scenePic'] = scenePic.length > 0 ? scenePic.map(item => item.url) : null
+      data['scenePic'] = sceneImg
     } else {
-      data['conserveBeforePic'] = conserveBeforePic.length > 0 ? conserveBeforePic.map(item => item.url) : null
-      data['conserveUnderwayPic'] = conserveUnderwayPic.length > 0 ? conserveUnderwayPic.map(item => item.url) : null
-      data['conserveAfterPic'] = conserveAfterPic.length > 0 ? conserveAfterPic.map(item => item.url) : null
+      data['conserveBeforePic'] = conserveBeforeImg
+      data['conserveUnderwayPic'] = conserveUnderwayImg
+      data['conserveAfterPic'] = conserveAfterImg
     }
 
     Taro.showModal({
@@ -272,24 +285,97 @@ const Index = () => {
     setReportType(e.detail.value)
   }
 
-  function handleImgChange(files, type) {
-    switch (type) {
-      case 'scenePic':
-        setScenePic(files)
-        break;
-      case 'conserveBeforePic':
-        setConserveBeforePic(files)
-        break;
-      case 'conserveUnderwayPic':
-        setConserveUnderwayPic(files)
-        break;
-      case 'conserveAfterPic':
-        setConserveAfterPic(files)
-        break;
-      default:
-        break;
+  function handleImgChange(files, operationType, index, type) {
+    if (operationType === 'remove') {
+      setImg(false)
+    }
+    function setImg(isAdd, url) {
+      switch (type) {
+        case 'scenePic':
+          let nextImg = sceneImg
+          if (isAdd) {
+            nextImg.push(url)
+          } else {
+            nextImg.splice(index, 1)
+          }
+          setSceneImg(nextImg)
+          setScenePic(files)
+          break;
+        case 'conserveBeforePic':
+          let nextConserveBeforeImg = conserveBeforeImg
+          if (isAdd) {
+            nextConserveBeforeImg.push(url)
+          } else {
+            nextConserveBeforeImg.splice(index, 1)
+          }
+          setConserveBeforeImg(nextConserveBeforeImg)
+          setConserveBeforePic(files)
+          break;
+        case 'conserveUnderwayPic':
+          let nextConserveUnderwayImg = conserveUnderwayImg
+          if (isAdd) {
+            nextConserveUnderwayImg.push(url)
+          } else {
+            nextConserveUnderwayImg.splice(index, 1)
+          }
+          setConserveUnderwayImg(nextConserveUnderwayImg)
+          setConserveUnderwayPic(files)
+          break;
+        case 'conserveAfterPic':
+          let nextConserveAfterImg = conserveAfterImg
+          if (isAdd) {
+            nextConserveAfterImg.push(url)
+          } else {
+            nextConserveAfterImg.splice(index, 1)
+          }
+          setConserveAfterImg(nextConserveAfterImg)
+          setConserveAfterPic(files)
+          break;
+        default:
+          break;
+      }
+    }
+    if (operationType === 'add' && files.length > 0) {
+      Taro.showLoading({ title: '上传中' })
+      let i = 0
+      switch (type) {
+        case 'scenePic':
+          i = scenePic.length
+          break;
+        case 'conserveBeforePic':
+          i = conserveBeforePic.length
+          break;
+        case 'conserveUnderwayPic':
+          i = conserveUnderwayPic.length
+          break;
+        case 'conserveAfterPic':
+          i = conserveAfterPic.length
+          break;
+        default:
+          break;
+      }
+      for (i; i < files.length; i++) {
+        const tempFilePaths = files[i].url
+        let token = getState('token') || Taro.getStorageSync('token')
+        Taro.uploadFile({
+          url: `${baseUrl}${postImage()}?token=${token}`,
+          filePath: tempFilePaths,
+          name: 'file',
+          success: (res) => {
+            if (i === files.length) {
+              Taro.hideLoading();
+            }
+            if (res.statusCode == 200) {
+              setImg(true, JSON.parse(res.data).key)
+            } else {
+              Taro.showToast({ title: '上传失败，请重试', icon: 'error' })
+            }
+          }
+        });
+      }
     }
   }
+
   function handleImgClick(index, file) {
     Taro.previewImage({
       urls: [file.url] // 需要预览的图片http链接列表
@@ -397,7 +483,7 @@ const Index = () => {
 
       <AtTextarea
         title='巡查内容：'
-        placeholder={isView ? '' : '请输入巡查内容'}
+        placeholder={isView ? '' : '请输入具体内容'}
         value={content}
         onChange={(v, e) => handleInput(e, 'content')}
         disabled={isView}
@@ -419,7 +505,7 @@ const Index = () => {
                   count={3 - scenePic.length}
                   showAddBtn={scenePic.length >= 3 ? false : true}
                   files={scenePic}
-                  onChange={files => handleImgChange(files, 'scenePic')}
+                  onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'scenePic')}
                   onImageClick={handleImgClick}
                 />
             }
@@ -442,7 +528,7 @@ const Index = () => {
                   count={3 - conserveBeforePic.length}
                   showAddBtn={conserveBeforePic.length >= 3 ? false : true}
                   files={conserveBeforePic}
-                  onChange={files => handleImgChange(files, 'conserveBeforePic')}
+                  onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'conserveBeforePic')}
                   onImageClick={handleImgClick}
                 />
             }
@@ -462,7 +548,7 @@ const Index = () => {
                   count={3 - conserveUnderwayPic.length}
                   showAddBtn={conserveUnderwayPic.length >= 3 ? false : true}
                   files={conserveUnderwayPic}
-                  onChange={files => handleImgChange(files, 'conserveUnderwayPic')}
+                  onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'conserveUnderwayPic')}
                   onImageClick={handleImgClick}
                 />
             }
@@ -483,7 +569,7 @@ const Index = () => {
                   count={3 - conserveAfterPic.length}
                   showAddBtn={conserveAfterPic.length >= 3 ? false : true}
                   files={conserveAfterPic}
-                  onChange={files => handleImgChange(files, 'conserveAfterPic')}
+                  onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'conserveAfterPic')}
                   onImageClick={handleImgClick}
                 />
             }

weapp/src/services/api.js

@@ -37,6 +37,11 @@ export const getRoadSection = () => {
   return `/road/section`;
 };
 
+// 上传图片
+export const postImage = () => {
+  return `/attachments/report`;
+};
+
 //行业查询
 export const getIndustryUrl = () => {
   return `/elec/business/industry`

web/client/src/sections/fillion/components/bridgeTable.js

@@ -1534,13 +1534,13 @@ const BrideTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1717,13 +1717,13 @@ const BrideTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 

web/client/src/sections/fillion/components/highwaysTable.js

@@ -37,6 +37,7 @@ const hightModal = (type, record) => {
                 dataIndex: 'placeName',
                 fixed: 'left',
                 width: 120,
+                search: false,
                 options: 1,
                 backgroundColor: "#ffffff",
                 fieldProps: {
@@ -91,6 +92,9 @@ const hightModal = (type, record) => {
                     actionRef={ref}
                     scroll={{ x: 800 }}
                     options={false}
+                    form={{
+                        submitter:false 
+                    }}
                     // ref={c => { finishedProductTable = c; }}
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
                     rowKey='id'

web/client/src/sections/fillion/components/inforTable.js

@@ -381,13 +381,13 @@ const InForTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 

web/client/src/sections/fillion/components/maintenanceTable.js

@@ -119,7 +119,7 @@ const DetailList = (props) => {
             }
         },
         {
-            title: '缺陷名称',
+            title: '具体内容',
             key: 'content',
             dataIndex: 'content',
             align: 'center'
@@ -191,7 +191,14 @@ const DetailList = (props) => {
 const PatrolNameList = (props) => {
     const [users, setUsers] = useState([]);
     const { onChange, record, userList, loading } = props;
-    const { name } = record || { name: '' }
+    const [selectRoad, setSelectRoad] = useState();
+
+    useEffect(() => {
+        if (userList && userList instanceof Array && userList.length) {
+            setSelectRoad(userList[0].id)
+            // onChange(userList[0]);
+        }
+    }, [userList])
     const columns = [
         {
             title: '巡更人员',
@@ -230,7 +237,7 @@ const PatrolNameList = (props) => {
                 loading={loading}
                 rowKey="name"
                 rowClassName={(record) => {
-                    return record.patrolName === name ? styles['split-row-select-active'] : '';
+                    return record.id == selectRoad ? 'list-row-actived' : '';
                 }}
                 toolBarRender={() => [
                     <Input placeholder='输入养护人员名称' onChange={doUserNameSearch} ></Input>
@@ -242,7 +249,7 @@ const PatrolNameList = (props) => {
                     return {
                         onClick: () => {
                             if (record) {
-                                console.log('record:', record)
+                                setSelectRoad(record.id);
                                 onChange(record);
                             }
                         },

web/client/src/sections/fillion/components/operationalTable.js

@@ -723,7 +723,7 @@ const OperaTionalTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -731,7 +731,7 @@ const OperaTionalTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1356,7 +1356,7 @@ const OperaTionalTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1364,7 +1364,7 @@ const OperaTionalTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1826,7 +1826,7 @@ const OperaTionalTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1834,7 +1834,7 @@ const OperaTionalTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1848,6 +1848,9 @@ const OperaTionalTable = (props) => {
             <div className='protable-transpor'>
                 <ProTable
                     actionRef={ref}
+                    form={{
+                        submitter: rewkeys === 'keyun' ? false : true,
+                    }}
                     toolbar={{
                         multipleLine: true,
 
@@ -1887,8 +1890,8 @@ const OperaTionalTable = (props) => {
                                 }, {
                                     key: 'tab4',
                                     label: <span onClick={() => {
-                                            setDifferentiate('business')
-                                            setRewkeys('yehu')
+                                        setDifferentiate('business')
+                                        setRewkeys('yehu')
                                     }}>业户{activeKey === 'tab4'}</span>,
 
                                 },
@@ -1900,7 +1903,9 @@ const OperaTionalTable = (props) => {
                     ref={c => { finishedProductTable = c; }}
                     style={{ width: "100% ", overflow: "auto", height: '760px' }}
                     rowKey='id'
-                    rowSelection={{
+                    // alwaysShowAlert 
+                    // tableAlertRender={true}
+                    rowSelection={ rewkeys=='keyun'?false:{  
                         selectedRowKeys: rowSelected,
                         onChange: (selectedRowKeys) => {
                             setRowSelected(selectedRowKeys);
@@ -1966,7 +1971,7 @@ const OperaTionalTable = (props) => {
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
-                            ['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,differentiate,genre) }}>
+                            ['tab2', 'tab3', 'tab4'].includes(activeKey) ? <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, differentiate, genre) }}>
                                 <Button
                                 >
                                     导出

web/client/src/sections/fillion/components/patrolTable.js

@@ -122,7 +122,7 @@ const DetailList = (props) => {
             }
         },
         {
-            title: '缺陷名称',
+            title: '具体内容',
             key: 'content',
             dataIndex: 'content',
             align: 'center'
@@ -194,7 +194,15 @@ const DetailList = (props) => {
 const PatrolNameList = (props) => {
     const [users, setUsers] = useState([]);
     const { onChange, record, userList, loading } = props;
-    const { name } = record || { name: '' }
+    const [selectRoad, setSelectRoad] = useState();
+
+    useEffect(() => {
+        if (userList && userList instanceof Array && userList.length) {
+            setSelectRoad(userList[0].id)
+            // onChange(userList[0]);
+        }
+    }, [userList])
+
     const columns = [
         {
             title: '巡更人员',
@@ -232,7 +240,7 @@ const PatrolNameList = (props) => {
                 loading={loading}
                 rowKey="name"
                 rowClassName={(record) => {
-                    return record.patrolName === name ? styles['split-row-select-active'] : '';
+                    return record.id == selectRoad ? 'list-row-actived' : '';
                 }}
                 toolBarRender={() => [
                     <Input placeholder='输入巡更人员名称' onChange={doUserNameSearch} ></Input>
@@ -245,6 +253,7 @@ const PatrolNameList = (props) => {
                         onClick: () => {
                             if (record) {
                                 // console.log('record:', record)
+                                setSelectRoad(record.id);
                                 onChange(record);
                             }
                         },

web/client/src/sections/fillion/components/protable.less

@@ -10,8 +10,9 @@
 }
 
 .list-row-actived {
-  background-color: #7cafc6;
+  background-color: #e2f6ff;
   font-weight: 600;
+  color: #1E80FF
 }
 
 

web/client/src/sections/fillion/components/publicTable.js

@@ -434,7 +434,7 @@ const PublicTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -442,7 +442,7 @@ const PublicTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1129,7 +1129,7 @@ const PublicTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1137,7 +1137,7 @@ const PublicTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -1231,7 +1231,7 @@ const PublicTable = (props) => {
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
                             ...dom.reverse(),
-                            <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, counts) }}>
+                            <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected,rewkeys ) }}>
                                 <Button
                                 >
                                     导出

web/client/src/sections/fillion/components/transportationTable.js

@@ -1208,7 +1208,7 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -1216,7 +1216,7 @@ const TransporTationTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
                     );
                 },
@@ -2363,7 +2363,7 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -2371,7 +2371,7 @@ const TransporTationTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -3519,7 +3519,7 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
                                 onClick={() => {
@@ -3527,7 +3527,7 @@ const TransporTationTable = (props) => {
                                 }}
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 
@@ -3706,13 +3706,13 @@ const TransporTationTable = (props) => {
                         >
                             新增
                         </Button>
-                            <Button
+                            {/* <Button
                                 type="primary"
                                 style={{ width: "100px", marginLeft: 20 }}
 
                             >
                                 导入
-                            </Button>
+                            </Button> */}
                         </div>
 
 

web/client/src/sections/fillion/containers/public.js

@@ -9,17 +9,21 @@ const Public = (props) => {
   const [data, setData] = useState()
   useEffect(() => {
     // dispatch(getDepMessage())
-   
+
     setData(props)
   }, []);
-   //批量导出
-   const exports = (ids,counts) => {
-    console.log(counts);
-    let idas=ids.toString()
-            window.open(
-                '/_api/'+`data/export/?ids=${idas||''}&exp=${'overspeed'}&token=${user.token}`)
-     
-}
+  //批量导出
+  const exports = (ids, rewkeys) => {
+    let idas = ids.toString()
+    if (rewkeys === 'xianlu') {
+      window.open(
+        '/_api/' + `data/export/?ids=${idas || ''}&exp=${'busLine'}&token=${user.token}`)
+    }
+    if (rewkeys === 'cheliang') {
+      window.open(
+        '/_api/' + `data/export/?ids=${idas || ''}&exp=${'busCar'}&token=${user.token}`)
+    }
+  }
   return (
     <> <PublicTable data={data} exports={exports} />
     </>

web/client/src/sections/quanju/containers/footer/operation/right.js

@@ -1,32 +1,32 @@
 import React, { useState } from 'react'
-import { Carousel } from 'antd';
+// import { Carousel } from 'antd';
 import Module from '../../public/module'
 
 const Right = () => {
-    const [dataLists, setDataList] = useState([
-        {
-            route: '147',
-            plate: '赣APJ090'
-        }, {
-            route: '166',
-            plate: '赣APJ087'
-        }, {
-            route: '171',
-            plate: '赣APJ184'
-        }, {
-            route: '186',
-            plate: '赣APJ241'
-        }, {
-            route: '199',
-            plate: '赣APJ337'
-        }
-    ])
+    // const [dataLists, setDataList] = useState([
+    //     {
+    //         route: '147',
+    //         plate: '赣APJ090'
+    //     }, {
+    //         route: '166',
+    //         plate: '赣APJ087'
+    //     }, {
+    //         route: '171',
+    //         plate: '赣APJ184'
+    //     }, {
+    //         route: '186',
+    //         plate: '赣APJ241'
+    //     }, {
+    //         route: '199',
+    //         plate: '赣APJ337'
+    //     }
+    // ])
     const style = { height: "97%", marginTop: "3%" }
     return (
         <div style={{ position:'absolute',right:0, width: "23%", height: "100%", marginRight: "1%", }}>
             <Module style={style} customize={true} title={"车辆视频监控"}>
                 <div style={{ width: '90%', height: '96%', margin: '2% 5%', overflow: 'hidden' }}>
-                    <Carousel
+                    {/* <Carousel
                         autoplay
                         infinite
                         autoplaySpeed={300000}
@@ -62,7 +62,7 @@ const Right = () => {
                                 </div>
                             ))
                         }
-                    </Carousel>
+                    </Carousel> */}
                 </div>
             </Module>
         </div>

web/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "mocha",
     "start": "cross-env NODE_ENV=development npm run start-params",
-    "start-params": "node server -p 5000 -u http://localhost:4000 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
+    "start-params": "node server -p 5000 -u http://localhost:14000 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
     "deploy": "export NODE_ENV=production&&npm run color && npm run build && node server",
     "build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js",
     "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js",