diff --git a/api/app/lib/controllers/data/index.js b/api/app/lib/controllers/data/index.js index 0a14e7a7..f4e2cbd1 100644 --- a/api/app/lib/controllers/data/index.js +++ b/api/app/lib/controllers/data/index.js @@ -1,27 +1,116 @@ 'use strict'; - -const { simpleExcelDown } = require('../../../../utils/xlsxDownload'); +const fs = require('fs'); +const xlsxDownload = require('../../../../utils/xlsxDownload.js'); +const moment = require('moment'); async function dataExport (ctx) { try { - // const models = ctx.fs.dc.models; - // const { userId } = ctx.fs.api - // const { ids } = ctx.query; + const models = ctx.fs.dc.models; + const { userId } = ctx.fs.api + const { ids } = ctx.query; + + const fileList = [ + { + n: '道路', + tableName: 'road', + defaultKey: ['level'], + defaultValue: ['村'], + }, + { + n: '道路', + tableName: 'road', + defaultKey: ['level'], + defaultValue: ['县'], + }, + { + n: '道路', + tableName: 'road', + defaultKey: ['level'], + defaultValue: ['乡'], + }, + { + n: '桥梁', + tableName: 'bridge' + }, + { + n: '运政车辆', + tableName: 'municipal_vehicle', + defaultKey: ['type'], + defaultValue: ['出租车'], + }, + { + n: '运政车辆', + tableName: 'municipal_vehicle', + defaultKey: ['type'], + defaultValue: ['危货'], + }, + { + n: '运政业户', + tableName: 'municipal_business', + defaultKey: ['type'], + defaultValue: ['出租车'], + }, + { + n: '运政业户', + tableName: 'municipal_business', + defaultKey: ['type'], + defaultValue: ['危货'], + }, + { + n: '工程一览', + tableName: 'project', + defaultKey: ['done', 'type'], + defaultValue: [false, 'road'], + }, + { + n: '工程一览', + tableName: 'project', + defaultKey: ['done', 'type'], + defaultValue: [false, 'bridge'], + }, + { + n: '治超', + tableName: 'overspeed', + }, + { + n: '公交线路', + tableName: 'bus_line', + }, + { + n: '公交车辆', + tableName: 'bus_car', + }, + ] + + let findOption = { + where: {} + } + if (ids) { + findOption.where.id = { $in: ids.split(',') } + } - // const exportData = await models.BusCar.destroy({ - // where: { - // id: { $in: ids.split(',') } - // } - // }) + const exportData = await models.BusCar.findAll(findOption) + const tableAttributes = models.BusCar.tableAttributes + let header = [] + for (let k in tableAttributes) { + if (k != 'id') { + header.push({ + title: tableAttributes[k].comment || '-', + key: k, + index: tableAttributes[k].index, + }) + } + } + header.sort((a, b) => { return a.index - b.index }) - // const fileName = `摄像头信息列表_${userId}_${moment().format('YYYYMMDDHHmmss')}` + '.csv' - // const filePath = await simpleExcelDown({ data: exportData, header, fileName: fileName }) - // const fileData = fs.readFileSync(filePath); + const fileName = `摄像头信息列表_${moment().format('YYYYMMDDHHmmss')}` + '.csv' + const filePath = await xlsxDownload.simpleExcelDown({ data: exportData, header, fileName: fileName }) + const fileData = fs.readFileSync(filePath); - // ctx.status = 200; - // ctx.set('Content-Type', 'application/x-xls'); - // ctx.set('Content-disposition', 'attachment; filename=' + encodeURI(fileName)); - // ctx.body = fileData; + ctx.status = 200; + ctx.set('Content-Type', 'application/x-xls'); + ctx.set('Content-disposition', 'attachment; filename=' + encodeURI(fileName)); + ctx.body = fileData; } catch (error) { ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.status = 400; diff --git a/api/app/lib/controllers/data/road.js b/api/app/lib/controllers/data/road.js index e457d1ff..71ece58e 100644 --- a/api/app/lib/controllers/data/road.js +++ b/api/app/lib/controllers/data/road.js @@ -48,9 +48,8 @@ async function get (ctx) { if (road || sectionStart || sectionEnd) { findOption.where['$or'] = {} if (road) { - findOption.where['$or'].push = { - routeName: { $like: `%${road}%` } - } + findOption.where['$or']. + routeName = { $like: `%${road}%` } } if (sectionStart) { findOption.where['$or']. diff --git a/api/app/lib/controllers/organization/department.js b/api/app/lib/controllers/organization/department.js index 640a80b7..9f85b83d 100644 --- a/api/app/lib/controllers/organization/department.js +++ b/api/app/lib/controllers/organization/department.js @@ -59,14 +59,20 @@ async function editDep (ctx) { }, }) if (!dep) { - ctx.status = 400; - ctx.body = { - "message": "上级部门不存在" - } - return + throw "上级部门不存在" } } if (depId) { + const repeatNameCount = await models.Department.count({ + where: { + dependence: dependence || null, + name: name, + id: { $ne: depId }, + } + }) + if (repeatNameCount) { + throw "部门名称重复" + } await models.Department.update({ name: name, dependence: dependence || null, @@ -76,6 +82,15 @@ async function editDep (ctx) { } }) } else { + const repeatNameCount = await models.Department.count({ + where: { + dependence: dependence || null, + name: name, + } + }) + if (repeatNameCount) { + throw '部门名称重复' + } await models.Department.create({ name: name, delete: false, @@ -86,7 +101,9 @@ async function editDep (ctx) { } catch (error) { ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.status = 400; - ctx.body = {} + ctx.body = { + message: typeof error == 'string' ? error : undefined + } } } diff --git a/api/app/lib/controllers/overview/management.js b/api/app/lib/controllers/overview/management.js index 3d5098b1..fdece6e6 100644 --- a/api/app/lib/controllers/overview/management.js +++ b/api/app/lib/controllers/overview/management.js @@ -10,6 +10,11 @@ async function overSpeedList (ctx) { attributes: ['id', 'licensePlate', 'overrunRate', 'deductPoints', 'fine', 'processingTime', 'testTime'], order: [['testTime', 'DESC']], limit: limit || 120, + where: { + processingTime: { $ne: null }, + testTime: { $ne: null }, + }, + order: [['testTime', 'DESC']], }) const overSpeedProcessedCount = await models.Overspeed.count({ diff --git a/api/app/lib/controllers/overview/operation.js b/api/app/lib/controllers/overview/operation.js index 4d6e84b8..975760d3 100644 --- a/api/app/lib/controllers/overview/operation.js +++ b/api/app/lib/controllers/overview/operation.js @@ -7,10 +7,10 @@ async function busCarLevelList (ctx) { let data = [] const busCarRes = await models.BusCar.findAll({ - attributes: ['id', 'company', 'fleet', 'vehicleLicensePlateNumber'], + attributes: ['id', 'company', 'fleet', 'vehicleLicensePlateNumber', 'line'], }) for (let c of busCarRes) { - const { company, fleet } = c + const { company, fleet, line } = c const corCompany = data.find(d => d.name === company) if (!corCompany) { data.push({ diff --git a/api/app/lib/models/bridge.js b/api/app/lib/models/bridge.js index 39c6bb44..7cac1b1b 100644 --- a/api/app/lib/models/bridge.js +++ b/api/app/lib/models/bridge.js @@ -2,897 +2,995 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const Bridge = sequelize.define("bridge", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "bridge_id_uindex" - }, - bridgeCode: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥梁代码", - primaryKey: false, - field: "bridge_code", - autoIncrement: false - }, - bridgeName: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥梁名称", - primaryKey: false, - field: "bridge_name", - autoIncrement: false - }, - centralStation: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "中心桩号", - primaryKey: false, - field: "central_station", - autoIncrement: false - }, - crossingFigureType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨越地物类型", - primaryKey: false, - field: "crossing_figure_type", - autoIncrement: false - }, - crossingFigureName: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨越地物名称", - primaryKey: false, - field: "crossing_figure_name", - autoIncrement: false - }, - natureOfCharges: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "收费性质", - primaryKey: false, - field: "nature_of_charges", - autoIncrement: false - }, - rampCode: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "匝道编码", - primaryKey: false, - field: "ramp_code", - autoIncrement: false - }, - sectionType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "路段类型", - primaryKey: false, - field: "section_type", - autoIncrement: false - }, - crossingFigureType1: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨越地物类型1", - primaryKey: false, - field: "crossing_figure_type_1", - autoIncrement: false - }, - crossingFigureName1: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨越地物名称1", - primaryKey: false, - field: "crossing_figure_name_1", - autoIncrement: false - }, - originalBridgeCode: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "原桥梁代码", - primaryKey: false, - field: "original_bridge_code", - autoIncrement: false - }, - whetherWideRoadAndNarrowBridge: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否宽路窄桥", - primaryKey: false, - field: "whether_wide_road_and_narrow_bridge", - autoIncrement: false - }, - isItInTheDirectoryOfLongAndLongBridges: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否在长大桥梁目录中", - primaryKey: false, - field: "is_it_in_the_directory_of_long_and_long_bridges", - autoIncrement: false - }, - whetherItIsACrossProvincialBridge: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否跨省桥梁", - primaryKey: false, - field: "whether_it_is_a_cross_provincial_bridge", - autoIncrement: false - }, - interworkingType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "互通类型", - primaryKey: false, - field: "interworking_type", - autoIncrement: false - }, - interworkingForm: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "互通形式", - primaryKey: false, - field: "interworking_form", - autoIncrement: false - }, - interworkingAndCrossoverMode: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "互通交叉方式", - primaryKey: false, - field: "interworking_and_crossover_mode", - autoIncrement: false - }, - bridgeClassification: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥梁分类", - primaryKey: false, - field: "bridge_classification", - autoIncrement: false - }, - totalLengthOfBridge: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥梁全长", - primaryKey: false, - field: "total_length_of_bridge", - autoIncrement: false - }, - totalSpanLength: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨径总长", - primaryKey: false, - field: "total_span_length", - autoIncrement: false - }, - mainSpanOfMainBridge: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "主桥主跨", - primaryKey: false, - field: "main_span_of_main_bridge", - autoIncrement: false - }, - numberOfMainBridgeHoles: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "主桥孔数", - primaryKey: false, - field: "number_of_main_bridge_holes", - autoIncrement: false - }, - spanCombination: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨径组合", - primaryKey: false, - field: "span_combination", - autoIncrement: false - }, - bridgeProperties: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥梁性质", - primaryKey: false, - field: "bridge_properties", - autoIncrement: false - }, - designLoadClass: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "设计荷载等级", - primaryKey: false, - field: "design_load_class", - autoIncrement: false - }, - superstructure: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "上部结构", - primaryKey: false, - field: "superstructure", - autoIncrement: false - }, - superstructureMaterials: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "上部结构材料", - primaryKey: false, - field: "superstructure_materials", - autoIncrement: false - }, - bridgeDeckPavementType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥面铺装类型", - primaryKey: false, - field: "bridge_deck_pavement_type", - autoIncrement: false - }, - bridgeDeckWidth: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥面宽", - primaryKey: false, - field: "bridge_deck_width", - autoIncrement: false - }, - clearWidthOfBridgeDeck: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥面净宽", - primaryKey: false, - field: "clear_width_of_bridge_deck", - autoIncrement: false - }, - clearanceUnderBridge: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥下净空", - primaryKey: false, - field: "clearance_under_bridge", - autoIncrement: false - }, - seismicGrade: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "抗震等级", - primaryKey: false, - field: "seismic_grade", - autoIncrement: false - }, - navigationClass: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "通航等级", - primaryKey: false, - field: "navigation_class", - autoIncrement: false - }, - abutmentType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥台类型", - primaryKey: false, - field: "abutment_type", - autoIncrement: false - }, - pierType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥墩类型", - primaryKey: false, - field: "pier_type", - autoIncrement: false - }, - typesOfPierAndAbutmentAntiCollisionFacilities: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "墩台防撞设施类型", - primaryKey: false, - field: "types_of_pier_and_abutment_anti_collision_facilities", - autoIncrement: false - }, - expansionJointType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "伸缩缝类型", - primaryKey: false, - field: "expansion_joint_type", - autoIncrement: false - }, - supportType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "支座类型", - primaryKey: false, - field: "support_type", - autoIncrement: false - }, - characteristicsOfCurvedSlope: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "弯坡斜特征", - primaryKey: false, - field: "characteristics_of_curved_slope", - autoIncrement: false - }, - bridgeHeight: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "桥梁高度", - primaryKey: false, - field: "bridge_height", - autoIncrement: false - }, - sidewalkWidth: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "人行道宽度", - primaryKey: false, - field: "sidewalk_width", - autoIncrement: false - }, - constructionUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "建设单位", - primaryKey: false, - field: "construction_unit", - autoIncrement: false - }, - completionTime: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "建成时间", - primaryKey: false, - field: "completion_time", - autoIncrement: false - }, - openingDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "通车日期", - primaryKey: false, - field: "opening_date", - autoIncrement: false - }, - reconstructionTime: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "改建时间", - primaryKey: false, - field: "reconstruction_time", - autoIncrement: false - }, - totalCost: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "总造价", - primaryKey: false, - field: "total_cost", - autoIncrement: false - }, - nameOfDesignUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "设计单位名称", - primaryKey: false, - field: "name_of_design_unit", - autoIncrement: false - }, - nameOfConstructionUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "施工单位名称", - primaryKey: false, - field: "name_of_construction_unit", - autoIncrement: false - }, - nameOfSupervisionUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "监理单位名称", - primaryKey: false, - field: "name_of_supervision_unit", - autoIncrement: false - }, - natureOfConstruction: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "建设性质", - primaryKey: false, - field: "nature_of_construction", - autoIncrement: false - }, - evaluationDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "评定日期", - primaryKey: false, - field: "evaluation_date", - autoIncrement: false - }, - technicalConditionEvaluation: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "技术状况评定", - primaryKey: false, - field: "technical_condition_evaluation", - autoIncrement: false - }, - assessmentUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "评定单位", - primaryKey: false, - field: "assessment_unit", - autoIncrement: false - }, - locationOfMajorDiseases: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "主要病害位置", - primaryKey: false, - field: "location_of_major_diseases", - autoIncrement: false - }, - diseaseDescription: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "病害描述", - primaryKey: false, - field: "disease_description", - autoIncrement: false - }, - takeControlMeasures: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "采取管制措施", - primaryKey: false, - field: "take_control_measures", - autoIncrement: false - }, - dateOfLastPeriodicInspection: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "最近定期检查日期", - primaryKey: false, - field: "date_of_last_periodic_inspection", - autoIncrement: false - }, - natureOfManagementAndMaintenanceUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "管养单位性质", - primaryKey: false, - field: "nature_of_management_and_maintenance_unit", - autoIncrement: false - }, - managementAndMaintenanceUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "管养单位", - primaryKey: false, - field: "management_and_maintenance_unit", - autoIncrement: false - }, - supervisionUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "监管单位", - primaryKey: false, - field: "supervision_unit", - autoIncrement: false - }, - reconstructionConstructionUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "改造施工单位", - primaryKey: false, - field: "reconstruction_construction_unit", - autoIncrement: false - }, - whetherItIsASubsidyProjectOfTheMinistry: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否部补助项目", - primaryKey: false, - field: "whether_it_is_a_subsidy_project_of_the_ministry", - autoIncrement: false - }, - engineeringProperties: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "工程性质", - primaryKey: false, - field: "engineering_properties", - autoIncrement: false - }, - reconstructionPart: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "改造部位", - primaryKey: false, - field: "reconstruction_part", - autoIncrement: false - }, - modificationCompletionDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "改造完工日期", - primaryKey: false, - field: "modification_completion_date", - autoIncrement: false - }, - year1: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "年份1", - primaryKey: false, - field: "year_1", - autoIncrement: false - }, - spanCombination1: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨径组合1", - primaryKey: false, - field: "span_combination_1", - autoIncrement: false - }, - investment1: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "投资1", - primaryKey: false, - field: "investment_1", - autoIncrement: false - }, - year2: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "年份2", - primaryKey: false, - field: "year_2", - autoIncrement: false - }, - spanCombination2: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨径组合2", - primaryKey: false, - field: "span_combination_2", - autoIncrement: false - }, - investment2: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "投资2", - primaryKey: false, - field: "investment_2", - autoIncrement: false - }, - year3: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "年份3", - primaryKey: false, - field: "year_3", - autoIncrement: false - }, - spanCombination3: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨径组合3", - primaryKey: false, - field: "span_combination_3", - autoIncrement: false - }, - investment3: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "投资3", - primaryKey: false, - field: "investment_3", - autoIncrement: false - }, - year4: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "年份4", - primaryKey: false, - field: "year_4", - autoIncrement: false - }, - spanCombination4: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨径组合4", - primaryKey: false, - field: "span_combination_4", - autoIncrement: false - }, - investment4: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "投资4", - primaryKey: false, - field: "investment_4", - autoIncrement: false - }, - year5: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "年份5", - primaryKey: false, - field: "year_5", - autoIncrement: false - }, - spanCombination5: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "跨径组合5", - primaryKey: false, - field: "span_combination_5", - autoIncrement: false - }, - investment5: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "投资5", - primaryKey: false, - field: "investment_5", - autoIncrement: false - }, - plannedFundCategory: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "计划资金类别", - primaryKey: false, - field: "planned_fund_category", - autoIncrement: false - }, - plannedYear: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "计划年度", - primaryKey: false, - field: "planned_year", - autoIncrement: false - }, - planDocumentNo: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "计划文号", - primaryKey: false, - field: "plan_document_no", - autoIncrement: false - }, - planItemUniqueCode: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "计划项目唯一编码", - primaryKey: false, - field: "plan_item_unique_code", - autoIncrement: false - }, - plannedProjectType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "计划项目类型", - primaryKey: false, - field: "planned_project_type", - autoIncrement: false - }, - planProjectName: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "计划项目名称", - primaryKey: false, - field: "plan_project_name", - autoIncrement: false - }, - completionStatus: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "完工情况", - primaryKey: false, - field: "completion_status", - autoIncrement: false - }, - yearOfCompletion: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "完工年度", - primaryKey: false, - field: "year_of_completion", - autoIncrement: false - }, - reasonForChange: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "变更原因", - primaryKey: false, - field: "reason_for_change", - autoIncrement: false - }, - changeTime: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "变更时间", - primaryKey: false, - field: "change_time", - autoIncrement: false - }, - reportingUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "填报单位", - primaryKey: false, - field: "reporting_unit", - autoIncrement: false - }, - remarks: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "备注", - primaryKey: false, - field: "remarks", - autoIncrement: false - }, - whetherOverpassBridge: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否跨线桥", - primaryKey: false, - field: "whether_overpass_bridge", - autoIncrement: false - }, - offLineBridgeOrNot: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否线外桥", - primaryKey: false, - field: "off_line_bridge_or_not", - autoIncrement: false - }, - whetherDangerousBridgeReconstruction: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否危桥改造", - primaryKey: false, - field: "whether_dangerous_bridge_reconstruction", - autoIncrement: false - }, - districtcounty: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "所在区县", - primaryKey: false, - field: "districtcounty", - autoIncrement: false - }, - locationCity: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "所在地市", - primaryKey: false, - field: "location_city", - autoIncrement: false - } - }, { - tableName: "bridge", - comment: "", - indexes: [] - }); - dc.models.Bridge = Bridge; - return Bridge; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const Bridge = sequelize.define("bridge", { + id: { + index: 1, + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "bridge_id_uindex" + }, + bridgeCode: { + index: 2, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥梁代码", + primaryKey: false, + field: "bridge_code", + autoIncrement: false + }, + bridgeName: { + index: 3, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥梁名称", + primaryKey: false, + field: "bridge_name", + autoIncrement: false + }, + centralStation: { + index: 4, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "中心桩号", + primaryKey: false, + field: "central_station", + autoIncrement: false + }, + crossingFigureType: { + index: 5, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨越地物类型", + primaryKey: false, + field: "crossing_figure_type", + autoIncrement: false + }, + crossingFigureName: { + index: 6, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨越地物名称", + primaryKey: false, + field: "crossing_figure_name", + autoIncrement: false + }, + natureOfCharges: { + index: 7, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "收费性质", + primaryKey: false, + field: "nature_of_charges", + autoIncrement: false + }, + rampCode: { + index: 8, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "匝道编码", + primaryKey: false, + field: "ramp_code", + autoIncrement: false + }, + sectionType: { + index: 9, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "路段类型", + primaryKey: false, + field: "section_type", + autoIncrement: false + }, + crossingFigureType1: { + index: 10, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨越地物类型1", + primaryKey: false, + field: "crossing_figure_type_1", + autoIncrement: false + }, + crossingFigureName1: { + index: 11, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨越地物名称1", + primaryKey: false, + field: "crossing_figure_name_1", + autoIncrement: false + }, + originalBridgeCode: { + index: 12, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "原桥梁代码", + primaryKey: false, + field: "original_bridge_code", + autoIncrement: false + }, + whetherWideRoadAndNarrowBridge: { + index: 13, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否宽路窄桥", + primaryKey: false, + field: "whether_wide_road_and_narrow_bridge", + autoIncrement: false + }, + isItInTheDirectoryOfLongAndLongBridges: { + index: 14, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否在长大桥梁目录中", + primaryKey: false, + field: "is_it_in_the_directory_of_long_and_long_bridges", + autoIncrement: false + }, + whetherItIsACrossProvincialBridge: { + index: 15, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否跨省桥梁", + primaryKey: false, + field: "whether_it_is_a_cross_provincial_bridge", + autoIncrement: false + }, + interworkingType: { + index: 16, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "互通类型", + primaryKey: false, + field: "interworking_type", + autoIncrement: false + }, + interworkingForm: { + index: 17, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "互通形式", + primaryKey: false, + field: "interworking_form", + autoIncrement: false + }, + interworkingAndCrossoverMode: { + index: 18, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "互通交叉方式", + primaryKey: false, + field: "interworking_and_crossover_mode", + autoIncrement: false + }, + bridgeClassification: { + index: 19, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥梁分类", + primaryKey: false, + field: "bridge_classification", + autoIncrement: false + }, + totalLengthOfBridge: { + index: 20, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥梁全长", + primaryKey: false, + field: "total_length_of_bridge", + autoIncrement: false + }, + totalSpanLength: { + index: 21, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨径总长", + primaryKey: false, + field: "total_span_length", + autoIncrement: false + }, + mainSpanOfMainBridge: { + index: 22, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "主桥主跨", + primaryKey: false, + field: "main_span_of_main_bridge", + autoIncrement: false + }, + numberOfMainBridgeHoles: { + index: 23, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "主桥孔数", + primaryKey: false, + field: "number_of_main_bridge_holes", + autoIncrement: false + }, + spanCombination: { + index: 24, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨径组合", + primaryKey: false, + field: "span_combination", + autoIncrement: false + }, + bridgeProperties: { + index: 25, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥梁性质", + primaryKey: false, + field: "bridge_properties", + autoIncrement: false + }, + designLoadClass: { + index: 26, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "设计荷载等级", + primaryKey: false, + field: "design_load_class", + autoIncrement: false + }, + superstructure: { + index: 27, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "上部结构", + primaryKey: false, + field: "superstructure", + autoIncrement: false + }, + superstructureMaterials: { + index: 28, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "上部结构材料", + primaryKey: false, + field: "superstructure_materials", + autoIncrement: false + }, + bridgeDeckPavementType: { + index: 29, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥面铺装类型", + primaryKey: false, + field: "bridge_deck_pavement_type", + autoIncrement: false + }, + bridgeDeckWidth: { + index: 30, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥面宽", + primaryKey: false, + field: "bridge_deck_width", + autoIncrement: false + }, + clearWidthOfBridgeDeck: { + index: 31, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥面净宽", + primaryKey: false, + field: "clear_width_of_bridge_deck", + autoIncrement: false + }, + clearanceUnderBridge: { + index: 32, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥下净空", + primaryKey: false, + field: "clearance_under_bridge", + autoIncrement: false + }, + seismicGrade: { + index: 33, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "抗震等级", + primaryKey: false, + field: "seismic_grade", + autoIncrement: false + }, + navigationClass: { + index: 34, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "通航等级", + primaryKey: false, + field: "navigation_class", + autoIncrement: false + }, + abutmentType: { + index: 35, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥台类型", + primaryKey: false, + field: "abutment_type", + autoIncrement: false + }, + pierType: { + index: 36, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥墩类型", + primaryKey: false, + field: "pier_type", + autoIncrement: false + }, + typesOfPierAndAbutmentAntiCollisionFacilities: { + index: 37, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "墩台防撞设施类型", + primaryKey: false, + field: "types_of_pier_and_abutment_anti_collision_facilities", + autoIncrement: false + }, + expansionJointType: { + index: 38, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "伸缩缝类型", + primaryKey: false, + field: "expansion_joint_type", + autoIncrement: false + }, + supportType: { + index: 39, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "支座类型", + primaryKey: false, + field: "support_type", + autoIncrement: false + }, + characteristicsOfCurvedSlope: { + index: 40, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "弯坡斜特征", + primaryKey: false, + field: "characteristics_of_curved_slope", + autoIncrement: false + }, + bridgeHeight: { + index: 41, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥梁高度", + primaryKey: false, + field: "bridge_height", + autoIncrement: false + }, + sidewalkWidth: { + index: 42, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "人行道宽度", + primaryKey: false, + field: "sidewalk_width", + autoIncrement: false + }, + constructionUnit: { + index: 43, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "建设单位", + primaryKey: false, + field: "construction_unit", + autoIncrement: false + }, + completionTime: { + index: 44, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "建成时间", + primaryKey: false, + field: "completion_time", + autoIncrement: false + }, + openingDate: { + index: 45, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "通车日期", + primaryKey: false, + field: "opening_date", + autoIncrement: false + }, + reconstructionTime: { + index: 46, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "改建时间", + primaryKey: false, + field: "reconstruction_time", + autoIncrement: false + }, + totalCost: { + index: 47, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "总造价", + primaryKey: false, + field: "total_cost", + autoIncrement: false + }, + nameOfDesignUnit: { + index: 48, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "设计单位名称", + primaryKey: false, + field: "name_of_design_unit", + autoIncrement: false + }, + nameOfConstructionUnit: { + index: 49, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "施工单位名称", + primaryKey: false, + field: "name_of_construction_unit", + autoIncrement: false + }, + nameOfSupervisionUnit: { + index: 50, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "监理单位名称", + primaryKey: false, + field: "name_of_supervision_unit", + autoIncrement: false + }, + natureOfConstruction: { + index: 51, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "建设性质", + primaryKey: false, + field: "nature_of_construction", + autoIncrement: false + }, + evaluationDate: { + index: 52, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "评定日期", + primaryKey: false, + field: "evaluation_date", + autoIncrement: false + }, + technicalConditionEvaluation: { + index: 53, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "技术状况评定", + primaryKey: false, + field: "technical_condition_evaluation", + autoIncrement: false + }, + assessmentUnit: { + index: 54, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "评定单位", + primaryKey: false, + field: "assessment_unit", + autoIncrement: false + }, + locationOfMajorDiseases: { + index: 55, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "主要病害位置", + primaryKey: false, + field: "location_of_major_diseases", + autoIncrement: false + }, + diseaseDescription: { + index: 56, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "病害描述", + primaryKey: false, + field: "disease_description", + autoIncrement: false + }, + takeControlMeasures: { + index: 57, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "采取管制措施", + primaryKey: false, + field: "take_control_measures", + autoIncrement: false + }, + dateOfLastPeriodicInspection: { + index: 58, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "最近定期检查日期", + primaryKey: false, + field: "date_of_last_periodic_inspection", + autoIncrement: false + }, + natureOfManagementAndMaintenanceUnit: { + index: 59, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "管养单位性质", + primaryKey: false, + field: "nature_of_management_and_maintenance_unit", + autoIncrement: false + }, + managementAndMaintenanceUnit: { + index: 60, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "管养单位", + primaryKey: false, + field: "management_and_maintenance_unit", + autoIncrement: false + }, + supervisionUnit: { + index: 61, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "监管单位", + primaryKey: false, + field: "supervision_unit", + autoIncrement: false + }, + reconstructionConstructionUnit: { + index: 62, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "改造施工单位", + primaryKey: false, + field: "reconstruction_construction_unit", + autoIncrement: false + }, + whetherItIsASubsidyProjectOfTheMinistry: { + index: 63, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否部补助项目", + primaryKey: false, + field: "whether_it_is_a_subsidy_project_of_the_ministry", + autoIncrement: false + }, + engineeringProperties: { + index: 64, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "工程性质", + primaryKey: false, + field: "engineering_properties", + autoIncrement: false + }, + reconstructionPart: { + index: 65, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "改造部位", + primaryKey: false, + field: "reconstruction_part", + autoIncrement: false + }, + modificationCompletionDate: { + index: 66, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "改造完工日期", + primaryKey: false, + field: "modification_completion_date", + autoIncrement: false + }, + year1: { + index: 67, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "年份1", + primaryKey: false, + field: "year_1", + autoIncrement: false + }, + spanCombination1: { + index: 68, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨径组合1", + primaryKey: false, + field: "span_combination_1", + autoIncrement: false + }, + investment1: { + index: 69, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "投资1", + primaryKey: false, + field: "investment_1", + autoIncrement: false + }, + year2: { + index: 70, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "年份2", + primaryKey: false, + field: "year_2", + autoIncrement: false + }, + spanCombination2: { + index: 71, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨径组合2", + primaryKey: false, + field: "span_combination_2", + autoIncrement: false + }, + investment2: { + index: 72, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "投资2", + primaryKey: false, + field: "investment_2", + autoIncrement: false + }, + year3: { + index: 73, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "年份3", + primaryKey: false, + field: "year_3", + autoIncrement: false + }, + spanCombination3: { + index: 74, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨径组合3", + primaryKey: false, + field: "span_combination_3", + autoIncrement: false + }, + investment3: { + index: 75, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "投资3", + primaryKey: false, + field: "investment_3", + autoIncrement: false + }, + year4: { + index: 76, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "年份4", + primaryKey: false, + field: "year_4", + autoIncrement: false + }, + spanCombination4: { + index: 77, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨径组合4", + primaryKey: false, + field: "span_combination_4", + autoIncrement: false + }, + investment4: { + index: 78, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "投资4", + primaryKey: false, + field: "investment_4", + autoIncrement: false + }, + year5: { + index: 79, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "年份5", + primaryKey: false, + field: "year_5", + autoIncrement: false + }, + spanCombination5: { + index: 80, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "跨径组合5", + primaryKey: false, + field: "span_combination_5", + autoIncrement: false + }, + investment5: { + index: 81, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "投资5", + primaryKey: false, + field: "investment_5", + autoIncrement: false + }, + plannedFundCategory: { + index: 82, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "计划资金类别", + primaryKey: false, + field: "planned_fund_category", + autoIncrement: false + }, + plannedYear: { + index: 83, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "计划年度", + primaryKey: false, + field: "planned_year", + autoIncrement: false + }, + planDocumentNo: { + index: 84, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "计划文号", + primaryKey: false, + field: "plan_document_no", + autoIncrement: false + }, + planItemUniqueCode: { + index: 85, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "计划项目唯一编码", + primaryKey: false, + field: "plan_item_unique_code", + autoIncrement: false + }, + plannedProjectType: { + index: 86, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "计划项目类型", + primaryKey: false, + field: "planned_project_type", + autoIncrement: false + }, + planProjectName: { + index: 87, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "计划项目名称", + primaryKey: false, + field: "plan_project_name", + autoIncrement: false + }, + completionStatus: { + index: 88, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "完工情况", + primaryKey: false, + field: "completion_status", + autoIncrement: false + }, + yearOfCompletion: { + index: 89, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "完工年度", + primaryKey: false, + field: "year_of_completion", + autoIncrement: false + }, + reasonForChange: { + index: 90, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "变更原因", + primaryKey: false, + field: "reason_for_change", + autoIncrement: false + }, + changeTime: { + index: 91, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "变更时间", + primaryKey: false, + field: "change_time", + autoIncrement: false + }, + reportingUnit: { + index: 92, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "填报单位", + primaryKey: false, + field: "reporting_unit", + autoIncrement: false + }, + remarks: { + index: 93, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "备注", + primaryKey: false, + field: "remarks", + autoIncrement: false + }, + whetherOverpassBridge: { + index: 94, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否跨线桥", + primaryKey: false, + field: "whether_overpass_bridge", + autoIncrement: false + }, + offLineBridgeOrNot: { + index: 95, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否线外桥", + primaryKey: false, + field: "off_line_bridge_or_not", + autoIncrement: false + }, + whetherDangerousBridgeReconstruction: { + index: 96, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否危桥改造", + primaryKey: false, + field: "whether_dangerous_bridge_reconstruction", + autoIncrement: false + }, + districtcounty: { + index: 97, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "所在区县", + primaryKey: false, + field: "districtcounty", + autoIncrement: false + }, + locationCity: { + index: 98, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "所在地市", + primaryKey: false, + field: "location_city", + autoIncrement: false + } + }, { + tableName: "bridge", + comment: "", + indexes: [] + }); + dc.models.Bridge = Bridge; + return Bridge; }; \ No newline at end of file diff --git a/api/app/lib/models/bus_car.js b/api/app/lib/models/bus_car.js index b338764c..7805b7c2 100644 --- a/api/app/lib/models/bus_car.js +++ b/api/app/lib/models/bus_car.js @@ -2,492 +2,545 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const BusCar = sequelize.define("busCar", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "bus_car_id_uindex" - }, - company: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "所属公司", - primaryKey: false, - field: "company", - autoIncrement: false - }, - fleet: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "所属车队", - primaryKey: false, - field: "fleet", - autoIncrement: false - }, - line: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "所属线路", - primaryKey: false, - field: "line", - autoIncrement: false - }, - vehicleNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆编号", - primaryKey: false, - field: "vehicle_number", - autoIncrement: false - }, - vehicleLicensePlateNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆牌照号", - primaryKey: false, - field: "vehicle_license_plate_number", - autoIncrement: false - }, - operationCategory: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "运营类别", - primaryKey: false, - field: "operation_category", - autoIncrement: false - }, - serviceLife: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "已使用年限", - primaryKey: false, - field: "service_life", - autoIncrement: false - }, - engineModel: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "发动机型号", - primaryKey: false, - field: "engine_model", - autoIncrement: false - }, - vehicleModel: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆型号", - primaryKey: false, - field: "vehicle_model", - autoIncrement: false - }, - vehicleCategory: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆类别", - primaryKey: false, - field: "vehicle_category", - autoIncrement: false - }, - vehicleStatus: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆状态", - primaryKey: false, - field: "vehicle_status", - autoIncrement: false - }, - dateOfEntry: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "入户日期", - primaryKey: false, - field: "date_of_entry", - autoIncrement: false - }, - purchaseDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "购进日期", - primaryKey: false, - field: "purchase_date", - autoIncrement: false - }, - energyConsumptionType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "能耗类型", - primaryKey: false, - field: "energy_consumption_type", - autoIncrement: false - }, - numberOfStandardUnits: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "标台数", - primaryKey: false, - field: "number_of_standard_units", - autoIncrement: false - }, - maintenanceUnit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "维保单位", - primaryKey: false, - field: "maintenance_unit", - autoIncrement: false - }, - vehicleType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆类型", - primaryKey: false, - field: "vehicle_type", - autoIncrement: false - }, - brandAndModel: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "厂牌型号", - primaryKey: false, - field: "brand_and_model", - autoIncrement: false - }, - manufacturer: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "生产厂家", - primaryKey: false, - field: "manufacturer", - autoIncrement: false - }, - drivingLicenseNo: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "行驶证编号", - primaryKey: false, - field: "driving_license_no", - autoIncrement: false - }, - engineNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "发动机编号", - primaryKey: false, - field: "engine_number", - autoIncrement: false - }, - mainEnergyConsumption: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "主能耗", - primaryKey: false, - field: "main_energy_consumption", - autoIncrement: false - }, - secondaryEnergyConsumption: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "副能耗", - primaryKey: false, - field: "secondary_energy_consumption", - autoIncrement: false - }, - emissionStandard: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "排放标准", - primaryKey: false, - field: "emission_standard", - autoIncrement: false - }, - startDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "启用日期", - primaryKey: false, - field: "start_date", - autoIncrement: false - }, - lastTransferDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "最近一次调动日期", - primaryKey: false, - field: "last_transfer_date", - autoIncrement: false - }, - conductor: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车长", - primaryKey: false, - field: "conductor", - autoIncrement: false - }, - vehicleWidth: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车宽", - primaryKey: false, - field: "vehicle_width", - autoIncrement: false - }, - carHeight: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车高", - primaryKey: false, - field: "car_height", - autoIncrement: false - }, - approvedPassengerCapacity: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "核定载客数", - primaryKey: false, - field: "approved_passenger_capacity", - autoIncrement: false - }, - vehicleIdentificationNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆识别号", - primaryKey: false, - field: "vehicle_identification_number", - autoIncrement: false - }, - gearboxBrand: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "变速箱品牌", - primaryKey: false, - field: "gearbox_brand", - autoIncrement: false - }, - manualCarWashingFee: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "人工洗车费", - primaryKey: false, - field: "manual_car_washing_fee", - autoIncrement: false - }, - laborCost: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "劳务费", - primaryKey: false, - field: "labor_cost", - autoIncrement: false - }, - curbWeight: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "整备质量", - primaryKey: false, - field: "curb_weight", - autoIncrement: false - }, - totalMass: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "总质量", - primaryKey: false, - field: "total_mass", - autoIncrement: false - }, - airConditioningTemperature: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "空调温度", - primaryKey: false, - field: "air_conditioning_temperature", - autoIncrement: false - }, - airConditionedCarOrNot: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "是否空调车", - primaryKey: false, - field: "air_conditioned_car_or_not", - autoIncrement: false - }, - turnOnTheAirConditioningTemperature: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "开空调温度", - primaryKey: false, - field: "turn_on_the_air_conditioning_temperature", - autoIncrement: false - }, - power: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "功率", - primaryKey: false, - field: "power", - autoIncrement: false - }, - transmission: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "变速器", - primaryKey: false, - field: "transmission", - autoIncrement: false - }, - seatingCapacity: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "座位数", - primaryKey: false, - field: "seating_capacity", - autoIncrement: false - }, - airConditioningBrand: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "空调品牌", - primaryKey: false, - field: "air_conditioning_brand", - autoIncrement: false - }, - seatType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "座椅类型", - primaryKey: false, - field: "seat_type", - autoIncrement: false - }, - tireSpecifications: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "轮胎规格", - primaryKey: false, - field: "tire_specifications", - autoIncrement: false - }, - roadTransportCertificateNo: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "道路运输证号", - primaryKey: false, - field: "road_transport_certificate_no", - autoIncrement: false - }, - parkingPoint: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "停放点", - primaryKey: false, - field: "parking_point", - autoIncrement: false - }, - carWashingType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "洗车类型", - primaryKey: false, - field: "car_washing_type", - autoIncrement: false - }, - maintenanceFreeWheelEnd: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "免维护轮端", - primaryKey: false, - field: "maintenance_free_wheel_end", - autoIncrement: false - }, - firstGuaranteeDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "首保日期", - primaryKey: false, - field: "first_guarantee_date", - autoIncrement: false - }, - dateOfRenovation: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "整修日期", - primaryKey: false, - field: "date_of_renovation", - autoIncrement: false - }, - motorVehicleOwner: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "机动车所有人", - primaryKey: false, - field: "motor_vehicle_owner", - autoIncrement: false - } - }, { - tableName: "bus_car", - comment: "", - indexes: [] - }); - dc.models.BusCar = BusCar; - return BusCar; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const BusCar = sequelize.define("busCar", { + id: { + index: 1, + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "bus_car_id_uindex" + }, + company: { + index: 2, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "所属公司", + primaryKey: false, + field: "company", + autoIncrement: false + }, + fleet: { + index: 3, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "所属车队", + primaryKey: false, + field: "fleet", + autoIncrement: false + }, + line: { + index: 4, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "所属线路", + primaryKey: false, + field: "line", + autoIncrement: false + }, + vehicleNumber: { + index: 5, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆编号", + primaryKey: false, + field: "vehicle_number", + autoIncrement: false + }, + vehicleLicensePlateNumber: { + index: 6, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆牌照号", + primaryKey: false, + field: "vehicle_license_plate_number", + autoIncrement: false + }, + operationCategory: { + index: 7, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "运营类别", + primaryKey: false, + field: "operation_category", + autoIncrement: false + }, + serviceLife: { + index: 8, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "已使用年限", + primaryKey: false, + field: "service_life", + autoIncrement: false + }, + engineModel: { + index: 9, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "发动机型号", + primaryKey: false, + field: "engine_model", + autoIncrement: false + }, + vehicleModel: { + index: 10, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆型号", + primaryKey: false, + field: "vehicle_model", + autoIncrement: false + }, + vehicleCategory: { + index: 11, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆类别", + primaryKey: false, + field: "vehicle_category", + autoIncrement: false + }, + vehicleStatus: { + index: 12, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆状态", + primaryKey: false, + field: "vehicle_status", + autoIncrement: false + }, + dateOfEntry: { + index: 13, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "入户日期", + primaryKey: false, + field: "date_of_entry", + autoIncrement: false + }, + purchaseDate: { + index: 14, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "购进日期", + primaryKey: false, + field: "purchase_date", + autoIncrement: false + }, + energyConsumptionType: { + index: 15, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "能耗类型", + primaryKey: false, + field: "energy_consumption_type", + autoIncrement: false + }, + numberOfStandardUnits: { + index: 16, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "标台数", + primaryKey: false, + field: "number_of_standard_units", + autoIncrement: false + }, + maintenanceUnit: { + index: 17, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "维保单位", + primaryKey: false, + field: "maintenance_unit", + autoIncrement: false + }, + vehicleType: { + index: 18, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆类型", + primaryKey: false, + field: "vehicle_type", + autoIncrement: false + }, + brandAndModel: { + index: 19, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "厂牌型号", + primaryKey: false, + field: "brand_and_model", + autoIncrement: false + }, + manufacturer: { + index: 20, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "生产厂家", + primaryKey: false, + field: "manufacturer", + autoIncrement: false + }, + drivingLicenseNo: { + index: 21, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "行驶证编号", + primaryKey: false, + field: "driving_license_no", + autoIncrement: false + }, + engineNumber: { + index: 22, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "发动机编号", + primaryKey: false, + field: "engine_number", + autoIncrement: false + }, + mainEnergyConsumption: { + index: 23, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "主能耗", + primaryKey: false, + field: "main_energy_consumption", + autoIncrement: false + }, + secondaryEnergyConsumption: { + index: 24, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "副能耗", + primaryKey: false, + field: "secondary_energy_consumption", + autoIncrement: false + }, + emissionStandard: { + index: 25, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "排放标准", + primaryKey: false, + field: "emission_standard", + autoIncrement: false + }, + startDate: { + index: 26, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "启用日期", + primaryKey: false, + field: "start_date", + autoIncrement: false + }, + lastTransferDate: { + index: 27, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "最近一次调动日期", + primaryKey: false, + field: "last_transfer_date", + autoIncrement: false + }, + conductor: { + index: 28, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车长", + primaryKey: false, + field: "conductor", + autoIncrement: false + }, + vehicleWidth: { + index: 29, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车宽", + primaryKey: false, + field: "vehicle_width", + autoIncrement: false + }, + carHeight: { + index: 30, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车高", + primaryKey: false, + field: "car_height", + autoIncrement: false + }, + approvedPassengerCapacity: { + index: 31, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "核定载客数", + primaryKey: false, + field: "approved_passenger_capacity", + autoIncrement: false + }, + vehicleIdentificationNumber: { + index: 32, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆识别号", + primaryKey: false, + field: "vehicle_identification_number", + autoIncrement: false + }, + gearboxBrand: { + index: 33, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "变速箱品牌", + primaryKey: false, + field: "gearbox_brand", + autoIncrement: false + }, + manualCarWashingFee: { + index: 34, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "人工洗车费", + primaryKey: false, + field: "manual_car_washing_fee", + autoIncrement: false + }, + laborCost: { + index: 35, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "劳务费", + primaryKey: false, + field: "labor_cost", + autoIncrement: false + }, + curbWeight: { + index: 36, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "整备质量", + primaryKey: false, + field: "curb_weight", + autoIncrement: false + }, + totalMass: { + index: 37, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "总质量", + primaryKey: false, + field: "total_mass", + autoIncrement: false + }, + airConditioningTemperature: { + index: 38, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "空调温度", + primaryKey: false, + field: "air_conditioning_temperature", + autoIncrement: false + }, + airConditionedCarOrNot: { + index: 39, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "是否空调车", + primaryKey: false, + field: "air_conditioned_car_or_not", + autoIncrement: false + }, + turnOnTheAirConditioningTemperature: { + index: 40, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "开空调温度", + primaryKey: false, + field: "turn_on_the_air_conditioning_temperature", + autoIncrement: false + }, + power: { + index: 41, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "功率", + primaryKey: false, + field: "power", + autoIncrement: false + }, + transmission: { + index: 42, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "变速器", + primaryKey: false, + field: "transmission", + autoIncrement: false + }, + seatingCapacity: { + index: 43, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "座位数", + primaryKey: false, + field: "seating_capacity", + autoIncrement: false + }, + airConditioningBrand: { + index: 44, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "空调品牌", + primaryKey: false, + field: "air_conditioning_brand", + autoIncrement: false + }, + seatType: { + index: 45, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "座椅类型", + primaryKey: false, + field: "seat_type", + autoIncrement: false + }, + tireSpecifications: { + index: 46, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "轮胎规格", + primaryKey: false, + field: "tire_specifications", + autoIncrement: false + }, + roadTransportCertificateNo: { + index: 47, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "道路运输证号", + primaryKey: false, + field: "road_transport_certificate_no", + autoIncrement: false + }, + parkingPoint: { + index: 48, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "停放点", + primaryKey: false, + field: "parking_point", + autoIncrement: false + }, + carWashingType: { + index: 49, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "洗车类型", + primaryKey: false, + field: "car_washing_type", + autoIncrement: false + }, + maintenanceFreeWheelEnd: { + index: 50, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "免维护轮端", + primaryKey: false, + field: "maintenance_free_wheel_end", + autoIncrement: false + }, + firstGuaranteeDate: { + index: 51, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "首保日期", + primaryKey: false, + field: "first_guarantee_date", + autoIncrement: false + }, + dateOfRenovation: { + index: 52, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "整修日期", + primaryKey: false, + field: "date_of_renovation", + autoIncrement: false + }, + motorVehicleOwner: { + index: 53, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "机动车所有人", + primaryKey: false, + field: "motor_vehicle_owner", + autoIncrement: false + } + }, { + tableName: "bus_car", + comment: "", + indexes: [] + }); + dc.models.BusCar = BusCar; + return BusCar; }; \ No newline at end of file diff --git a/api/app/lib/models/bus_line.js b/api/app/lib/models/bus_line.js index 32aa8c9d..e6be07ac 100644 --- a/api/app/lib/models/bus_line.js +++ b/api/app/lib/models/bus_line.js @@ -2,231 +2,255 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const BusLine = sequelize.define("busLine", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "bus_line_id_uindex" - }, - company: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "公司", - primaryKey: false, - field: "company", - autoIncrement: false - }, - fleet: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车队", - primaryKey: false, - field: "fleet", - autoIncrement: false - }, - carCaptain: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车队长", - primaryKey: false, - field: "car_captain", - autoIncrement: false - }, - assistantCarCaptain: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "副车队长", - primaryKey: false, - field: "assistant_car_captain", - autoIncrement: false - }, - officeLocation: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "办公地点", - primaryKey: false, - field: "office_location", - autoIncrement: false - }, - lineName: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "线路名称", - primaryKey: false, - field: "line_name", - autoIncrement: false - }, - lineType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "线路类型", - primaryKey: false, - field: "line_type", - autoIncrement: false - }, - lineDivision: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "线路划分", - primaryKey: false, - field: "line_division", - autoIncrement: false - }, - gpsNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "GPS编号", - primaryKey: false, - field: "gps_number", - autoIncrement: false - }, - startingPointEndPoint: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "起点终点", - primaryKey: false, - field: "starting_point_end_point", - autoIncrement: false - }, - numberOfVehicles: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆数", - primaryKey: false, - field: "number_of_vehicles", - autoIncrement: false - }, - totalKilometers: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "全程公里数", - primaryKey: false, - field: "total_kilometers", - autoIncrement: false - }, - ticketPrice: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "票价", - primaryKey: false, - field: "ticket_price", - autoIncrement: false - }, - openingTime: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "开通时间", - primaryKey: false, - field: "opening_time", - autoIncrement: false - }, - runningTime: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "运行时间", - primaryKey: false, - field: "running_time", - autoIncrement: false - }, - openingTimeSummer: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "开班时间夏令", - primaryKey: false, - field: "opening_time_summer", - autoIncrement: false - }, - shiftClosingTimeSummer: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "收班时间夏令", - primaryKey: false, - field: "shift_closing_time_summer", - autoIncrement: false - }, - openingTimeWinter: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "开班时间冬令", - primaryKey: false, - field: "opening_time_winter", - autoIncrement: false - }, - shiftClosingTimeWinter: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "收班时间冬令", - primaryKey: false, - field: "shift_closing_time_winter", - autoIncrement: false - }, - uplinkOfStationsAlongTheWay: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "沿途站点上行", - primaryKey: false, - field: "uplink_of_stations_along_the_way", - autoIncrement: false - }, - downlinkOfStationsAlongTheWay: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "沿途站点下行", - primaryKey: false, - field: "downlink_of_stations_along_the_way", - autoIncrement: false - }, - area: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "所属区域", - primaryKey: false, - field: "area", - autoIncrement: false - }, - remarks: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "备注", - primaryKey: false, - field: "remarks", - autoIncrement: false - } - }, { - tableName: "bus_line", - comment: "", - indexes: [] - }); - dc.models.BusLine = BusLine; - return BusLine; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const BusLine = sequelize.define("busLine", { + id: { + index: 1, + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "bus_line_id_uindex" + }, + company: { + index: 2, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "公司", + primaryKey: false, + field: "company", + autoIncrement: false + }, + fleet: { + index: 3, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车队", + primaryKey: false, + field: "fleet", + autoIncrement: false + }, + carCaptain: { + index: 4, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车队长", + primaryKey: false, + field: "car_captain", + autoIncrement: false + }, + assistantCarCaptain: { + index: 5, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "副车队长", + primaryKey: false, + field: "assistant_car_captain", + autoIncrement: false + }, + officeLocation: { + index: 6, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "办公地点", + primaryKey: false, + field: "office_location", + autoIncrement: false + }, + lineName: { + index: 7, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "线路名称", + primaryKey: false, + field: "line_name", + autoIncrement: false + }, + lineType: { + index: 8, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "线路类型", + primaryKey: false, + field: "line_type", + autoIncrement: false + }, + lineDivision: { + index: 9, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "线路划分", + primaryKey: false, + field: "line_division", + autoIncrement: false + }, + gpsNumber: { + index: 10, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "GPS编号", + primaryKey: false, + field: "gps_number", + autoIncrement: false + }, + startingPointEndPoint: { + index: 11, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "起点终点", + primaryKey: false, + field: "starting_point_end_point", + autoIncrement: false + }, + numberOfVehicles: { + index: 12, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆数", + primaryKey: false, + field: "number_of_vehicles", + autoIncrement: false + }, + totalKilometers: { + index: 13, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "全程公里数", + primaryKey: false, + field: "total_kilometers", + autoIncrement: false + }, + ticketPrice: { + index: 14, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "票价", + primaryKey: false, + field: "ticket_price", + autoIncrement: false + }, + openingTime: { + index: 15, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "开通时间", + primaryKey: false, + field: "opening_time", + autoIncrement: false + }, + runningTime: { + index: 16, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "运行时间", + primaryKey: false, + field: "running_time", + autoIncrement: false + }, + openingTimeSummer: { + index: 17, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "开班时间夏令", + primaryKey: false, + field: "opening_time_summer", + autoIncrement: false + }, + shiftClosingTimeSummer: { + index: 18, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "收班时间夏令", + primaryKey: false, + field: "shift_closing_time_summer", + autoIncrement: false + }, + openingTimeWinter: { + index: 19, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "开班时间冬令", + primaryKey: false, + field: "opening_time_winter", + autoIncrement: false + }, + shiftClosingTimeWinter: { + index: 20, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "收班时间冬令", + primaryKey: false, + field: "shift_closing_time_winter", + autoIncrement: false + }, + uplinkOfStationsAlongTheWay: { + index: 21, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "沿途站点上行", + primaryKey: false, + field: "uplink_of_stations_along_the_way", + autoIncrement: false + }, + downlinkOfStationsAlongTheWay: { + index: 22, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "沿途站点下行", + primaryKey: false, + field: "downlink_of_stations_along_the_way", + autoIncrement: false + }, + area: { + index: 23, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "所属区域", + primaryKey: false, + field: "area", + autoIncrement: false + }, + remarks: { + index: 24, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "备注", + primaryKey: false, + field: "remarks", + autoIncrement: false + } + }, { + tableName: "bus_line", + comment: "", + indexes: [] + }); + dc.models.BusLine = BusLine; + return BusLine; }; \ No newline at end of file diff --git a/api/app/lib/models/municipal_business.js b/api/app/lib/models/municipal_business.js index e0b8cc42..e0bb16d5 100644 --- a/api/app/lib/models/municipal_business.js +++ b/api/app/lib/models/municipal_business.js @@ -2,285 +2,315 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const MunicipalBusiness = sequelize.define("municipalBusiness", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "municipal_business_id_uindex" - }, - nameOfBusinessOwner: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "业户名称", - primaryKey: false, - field: "name_of_business_owner", - autoIncrement: false - }, - productName: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "品名", - primaryKey: false, - field: "product_name", - autoIncrement: false - }, - creditSocialCode: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "信用社会代码", - primaryKey: false, - field: "credit_social_code", - autoIncrement: false - }, - administrativeDivision: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "行政区划", - primaryKey: false, - field: "administrative_division", - autoIncrement: false - }, - economicNature: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经济性质", - primaryKey: false, - field: "economic_nature", - autoIncrement: false - }, - address: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "地址", - primaryKey: false, - field: "address", - autoIncrement: false - }, - contactNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "联系电话", - primaryKey: false, - field: "contact_number", - autoIncrement: false - }, - email: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "电子邮箱", - primaryKey: false, - field: "email", - autoIncrement: false - }, - legalRepresentative: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "法定代表人", - primaryKey: false, - field: "legal_representative", - autoIncrement: false - }, - typeOfLegalPersonCertificate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "法人证件类型", - primaryKey: false, - field: "type_of_legal_person_certificate", - autoIncrement: false - }, - natureOfTransportation: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "运输性质", - primaryKey: false, - field: "nature_of_transportation", - autoIncrement: false - }, - legalPersonCertificateNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "法人证件号码", - primaryKey: false, - field: "legal_person_certificate_number", - autoIncrement: false - }, - telephoneNumberOfLegalRepresentative: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "法定代表人电话", - primaryKey: false, - field: "telephone_number_of_legal_representative", - autoIncrement: false - }, - nameOfThePersonInChargeOfTheBusiness: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营业户负责人姓名", - primaryKey: false, - field: "name_of_the_person_in_charge_of_the_business", - autoIncrement: false - }, - telephoneNumberOfThePersonInChargeOfTheBusiness: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营业户负责人电话号码", - primaryKey: false, - field: "telephone_number_of_the_person_in_charge_of_the_business", - autoIncrement: false - }, - handledBy: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经办人", - primaryKey: false, - field: "handled_by", - autoIncrement: false - }, - phoneNumberOfHandler: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经办人电话", - primaryKey: false, - field: "phone_number_of_handler", - autoIncrement: false - }, - natureOfBusiness: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营范围", - primaryKey: false, - field: "nature_of_business", - autoIncrement: false - }, - businessStatus: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营状态", - primaryKey: false, - field: "business_status", - autoIncrement: false - }, - businessLicenseNo: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营许可证号", - primaryKey: false, - field: "business_license_no", - autoIncrement: false - }, - fromTheExpiryDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "有效期起", - primaryKey: false, - field: "from_the_expiry_date", - autoIncrement: false - }, - expiryDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "有效期止", - primaryKey: false, - field: "expiry_date", - autoIncrement: false - }, - issuingAuthority: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "发证机构", - primaryKey: false, - field: "issuing_authority", - autoIncrement: false - }, - dateOfIssuance: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "核发日期", - primaryKey: false, - field: "date_of_issuance", - autoIncrement: false - }, - licenseCategory: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "证照类别", - primaryKey: false, - field: "license_category", - autoIncrement: false - }, - licenseIssuanceType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "证照发放类型", - primaryKey: false, - field: "license_issuance_type", - autoIncrement: false - }, - numberOfSharedVehicles: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "共有车辆数", - primaryKey: false, - field: "number_of_shared_vehicles", - autoIncrement: false - }, - creationDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "创建日期", - primaryKey: false, - field: "creation_date", - autoIncrement: false - }, - type: { - type: DataTypes.STRING, - allowNull: false, - defaultValue: null, - comment: "类型 出租车/危货", - primaryKey: false, - field: "type", - autoIncrement: false - } - }, { - tableName: "municipal_business", - comment: "", - indexes: [] - }); - dc.models.MunicipalBusiness = MunicipalBusiness; - return MunicipalBusiness; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const MunicipalBusiness = sequelize.define("municipalBusiness", { + id: { + index: 1, + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "municipal_business_id_uindex" + }, + nameOfBusinessOwner: { + index: 2, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "业户名称", + primaryKey: false, + field: "name_of_business_owner", + autoIncrement: false + }, + productName: { + index: 3, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "品名", + primaryKey: false, + field: "product_name", + autoIncrement: false + }, + creditSocialCode: { + index: 4, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "信用社会代码", + primaryKey: false, + field: "credit_social_code", + autoIncrement: false + }, + administrativeDivision: { + index: 5, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "行政区划", + primaryKey: false, + field: "administrative_division", + autoIncrement: false + }, + economicNature: { + index: 6, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经济性质", + primaryKey: false, + field: "economic_nature", + autoIncrement: false + }, + address: { + index: 7, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "地址", + primaryKey: false, + field: "address", + autoIncrement: false + }, + contactNumber: { + index: 8, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "联系电话", + primaryKey: false, + field: "contact_number", + autoIncrement: false + }, + email: { + index: 9, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "电子邮箱", + primaryKey: false, + field: "email", + autoIncrement: false + }, + legalRepresentative: { + index: 10, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "法定代表人", + primaryKey: false, + field: "legal_representative", + autoIncrement: false + }, + typeOfLegalPersonCertificate: { + index: 11, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "法人证件类型", + primaryKey: false, + field: "type_of_legal_person_certificate", + autoIncrement: false + }, + natureOfTransportation: { + index: 12, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "运输性质", + primaryKey: false, + field: "nature_of_transportation", + autoIncrement: false + }, + legalPersonCertificateNumber: { + index: 13, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "法人证件号码", + primaryKey: false, + field: "legal_person_certificate_number", + autoIncrement: false + }, + telephoneNumberOfLegalRepresentative: { + index: 14, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "法定代表人电话", + primaryKey: false, + field: "telephone_number_of_legal_representative", + autoIncrement: false + }, + nameOfThePersonInChargeOfTheBusiness: { + index: 15, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营业户负责人姓名", + primaryKey: false, + field: "name_of_the_person_in_charge_of_the_business", + autoIncrement: false + }, + telephoneNumberOfThePersonInChargeOfTheBusiness: { + index: 16, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营业户负责人电话号码", + primaryKey: false, + field: "telephone_number_of_the_person_in_charge_of_the_business", + autoIncrement: false + }, + handledBy: { + index: 17, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经办人", + primaryKey: false, + field: "handled_by", + autoIncrement: false + }, + phoneNumberOfHandler: { + index: 18, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经办人电话", + primaryKey: false, + field: "phone_number_of_handler", + autoIncrement: false + }, + natureOfBusiness: { + index: 19, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营范围", + primaryKey: false, + field: "nature_of_business", + autoIncrement: false + }, + businessStatus: { + index: 20, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营状态", + primaryKey: false, + field: "business_status", + autoIncrement: false + }, + businessLicenseNo: { + index: 21, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营许可证号", + primaryKey: false, + field: "business_license_no", + autoIncrement: false + }, + fromTheExpiryDate: { + index: 22, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "有效期起", + primaryKey: false, + field: "from_the_expiry_date", + autoIncrement: false + }, + expiryDate: { + index: 23, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "有效期止", + primaryKey: false, + field: "expiry_date", + autoIncrement: false + }, + issuingAuthority: { + index: 24, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "发证机构", + primaryKey: false, + field: "issuing_authority", + autoIncrement: false + }, + dateOfIssuance: { + index: 25, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "核发日期", + primaryKey: false, + field: "date_of_issuance", + autoIncrement: false + }, + licenseCategory: { + index: 26, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "证照类别", + primaryKey: false, + field: "license_category", + autoIncrement: false + }, + licenseIssuanceType: { + index: 27, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "证照发放类型", + primaryKey: false, + field: "license_issuance_type", + autoIncrement: false + }, + numberOfSharedVehicles: { + index: 28, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "共有车辆数", + primaryKey: false, + field: "number_of_shared_vehicles", + autoIncrement: false + }, + creationDate: { + index: 29, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "创建日期", + primaryKey: false, + field: "creation_date", + autoIncrement: false + }, + type: { + index: 30, + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: "类型 出租车/危货", + primaryKey: false, + field: "type", + autoIncrement: false + } + }, { + tableName: "municipal_business", + comment: "", + indexes: [] + }); + dc.models.MunicipalBusiness = MunicipalBusiness; + return MunicipalBusiness; }; \ No newline at end of file diff --git a/api/app/lib/models/municipal_vehicle.js b/api/app/lib/models/municipal_vehicle.js index 95a64e96..f937f649 100644 --- a/api/app/lib/models/municipal_vehicle.js +++ b/api/app/lib/models/municipal_vehicle.js @@ -2,384 +2,425 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const MunicipalVehicle = sequelize.define("municipalVehicle", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "municipal_vehicle_id_uindex" - }, - nameOfBusinessOwner: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "业户名称", - primaryKey: false, - field: "name_of_business_owner", - autoIncrement: false - }, - productName: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "品名", - primaryKey: false, - field: "product_name", - autoIncrement: false - }, - vehicleRegistry: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车籍地", - primaryKey: false, - field: "vehicle_registry", - autoIncrement: false - }, - licensePlateNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车牌号", - primaryKey: false, - field: "license_plate_number", - autoIncrement: false - }, - fuelType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "燃料类型", - primaryKey: false, - field: "fuel_type", - autoIncrement: false - }, - address: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "住址", - primaryKey: false, - field: "address", - autoIncrement: false - }, - economicNature: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经济性质", - primaryKey: false, - field: "economic_nature", - autoIncrement: false - }, - approvedPassengerCapacity: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "核定载客位数", - primaryKey: false, - field: "approved_passenger_capacity", - autoIncrement: false - }, - approvedLoadMass: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "核定载质量", - primaryKey: false, - field: "approved_load_mass", - autoIncrement: false - }, - numberOfVehicleAxles: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆车轴数", - primaryKey: false, - field: "number_of_vehicle_axles", - autoIncrement: false - }, - vehicleBrand: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆厂牌", - primaryKey: false, - field: "vehicle_brand", - autoIncrement: false - }, - natureOfBusiness: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营范围", - primaryKey: false, - field: "nature_of_business", - autoIncrement: false - }, - vehicleOperationStatus: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆营运状态", - primaryKey: false, - field: "vehicle_operation_status", - autoIncrement: false - }, - busTypeAndClass: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "客车类型与等级", - primaryKey: false, - field: "bus_type_and_class", - autoIncrement: false - }, - annualReviewResults: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "年审结果", - primaryKey: false, - field: "annual_review_results", - autoIncrement: false - }, - dateOfThisAnnualReview: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "本次年审日期", - primaryKey: false, - field: "date_of_this_annual_review", - autoIncrement: false - }, - dateOfNextAnnualReview: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "下次年审日期", - primaryKey: false, - field: "date_of_next_annual_review", - autoIncrement: false - }, - dateOfRegistration: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "注册登记日期", - primaryKey: false, - field: "date_of_registration", - autoIncrement: false - }, - sourceOfTransportationCapacity: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "运力来源", - primaryKey: false, - field: "source_of_transportation_capacity", - autoIncrement: false - }, - fromTheExpiryDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "有效期起", - primaryKey: false, - field: "from_the_expiry_date", - autoIncrement: false - }, - expiryDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "有效期止", - primaryKey: false, - field: "expiry_date", - autoIncrement: false - }, - engineDisplacement: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "发动机排量", - primaryKey: false, - field: "engine_displacement", - autoIncrement: false - }, - engineNumber: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "发动机号", - primaryKey: false, - field: "engine_number", - autoIncrement: false - }, - vehicleEnginePower: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆发动机功率", - primaryKey: false, - field: "vehicle_engine_power", - autoIncrement: false - }, - businessLicenseNo: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营许可证号", - primaryKey: false, - field: "business_license_no", - autoIncrement: false - }, - licensePlateColor: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车牌颜色", - primaryKey: false, - field: "license_plate_color", - autoIncrement: false - }, - totalVehicleMass: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆总质量", - primaryKey: false, - field: "total_vehicle_mass", - autoIncrement: false - }, - totalQuasiTractionMassOfVehicle: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆准牵引总质量", - primaryKey: false, - field: "total_quasi_traction_mass_of_vehicle", - autoIncrement: false - }, - roadTransportCertificateNo: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "道路运输证号", - primaryKey: false, - field: "road_transport_certificate_no", - autoIncrement: false - }, - vehicleHeight: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆车高", - primaryKey: false, - field: "vehicle_height", - autoIncrement: false - }, - vehicleConductor: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆车长", - primaryKey: false, - field: "vehicle_conductor", - autoIncrement: false - }, - vehicleWidth: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆车宽", - primaryKey: false, - field: "vehicle_width", - autoIncrement: false - }, - vehicleType: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆类型", - primaryKey: false, - field: "vehicle_type", - autoIncrement: false - }, - vehicleTypeWithDrivingLicense: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "行驶证车辆类型", - primaryKey: false, - field: "vehicle_type_with_driving_license", - autoIncrement: false - }, - vehicleWheelbase: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车辆轴距", - primaryKey: false, - field: "vehicle_wheelbase", - autoIncrement: false - }, - ratingDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "等级评定日期", - primaryKey: false, - field: "rating_date", - autoIncrement: false - }, - technicalEvaluationGrade: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "技术评定等级", - primaryKey: false, - field: "technical_evaluation_grade", - autoIncrement: false - }, - nextRatingDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "下次等级评定日期", - primaryKey: false, - field: "next_rating_date", - autoIncrement: false - }, - creationDate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "创建日期", - primaryKey: false, - field: "creation_date", - autoIncrement: false - }, - type: { - type: DataTypes.STRING, - allowNull: false, - defaultValue: null, - comment: "类型 出租车/危货", - primaryKey: false, - field: "type", - autoIncrement: false - } - }, { - tableName: "municipal_vehicle", - comment: "", - indexes: [] - }); - dc.models.MunicipalVehicle = MunicipalVehicle; - return MunicipalVehicle; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const MunicipalVehicle = sequelize.define("municipalVehicle", { + id: { + index: 1, + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "municipal_vehicle_id_uindex" + }, + nameOfBusinessOwner: { + index: 2, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "业户名称", + primaryKey: false, + field: "name_of_business_owner", + autoIncrement: false + }, + productName: { + index: 3, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "品名", + primaryKey: false, + field: "product_name", + autoIncrement: false + }, + vehicleRegistry: { + index: 4, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车籍地", + primaryKey: false, + field: "vehicle_registry", + autoIncrement: false + }, + licensePlateNumber: { + index: 5, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车牌号", + primaryKey: false, + field: "license_plate_number", + autoIncrement: false + }, + fuelType: { + index: 6, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "燃料类型", + primaryKey: false, + field: "fuel_type", + autoIncrement: false + }, + address: { + index: 7, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "住址", + primaryKey: false, + field: "address", + autoIncrement: false + }, + economicNature: { + index: 8, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经济性质", + primaryKey: false, + field: "economic_nature", + autoIncrement: false + }, + approvedPassengerCapacity: { + index: 9, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "核定载客位数", + primaryKey: false, + field: "approved_passenger_capacity", + autoIncrement: false + }, + approvedLoadMass: { + index: 10, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "核定载质量", + primaryKey: false, + field: "approved_load_mass", + autoIncrement: false + }, + numberOfVehicleAxles: { + index: 11, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆车轴数", + primaryKey: false, + field: "number_of_vehicle_axles", + autoIncrement: false + }, + vehicleBrand: { + index: 12, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆厂牌", + primaryKey: false, + field: "vehicle_brand", + autoIncrement: false + }, + natureOfBusiness: { + index: 13, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营范围", + primaryKey: false, + field: "nature_of_business", + autoIncrement: false + }, + vehicleOperationStatus: { + index: 14, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆营运状态", + primaryKey: false, + field: "vehicle_operation_status", + autoIncrement: false + }, + busTypeAndClass: { + index: 15, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "客车类型与等级", + primaryKey: false, + field: "bus_type_and_class", + autoIncrement: false + }, + annualReviewResults: { + index: 16, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "年审结果", + primaryKey: false, + field: "annual_review_results", + autoIncrement: false + }, + dateOfThisAnnualReview: { + index: 17, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "本次年审日期", + primaryKey: false, + field: "date_of_this_annual_review", + autoIncrement: false + }, + dateOfNextAnnualReview: { + index: 18, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "下次年审日期", + primaryKey: false, + field: "date_of_next_annual_review", + autoIncrement: false + }, + dateOfRegistration: { + index: 19, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "注册登记日期", + primaryKey: false, + field: "date_of_registration", + autoIncrement: false + }, + sourceOfTransportationCapacity: { + index: 20, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "运力来源", + primaryKey: false, + field: "source_of_transportation_capacity", + autoIncrement: false + }, + fromTheExpiryDate: { + index: 21, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "有效期起", + primaryKey: false, + field: "from_the_expiry_date", + autoIncrement: false + }, + expiryDate: { + index: 22, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "有效期止", + primaryKey: false, + field: "expiry_date", + autoIncrement: false + }, + engineDisplacement: { + index: 23, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "发动机排量", + primaryKey: false, + field: "engine_displacement", + autoIncrement: false + }, + engineNumber: { + index: 24, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "发动机号", + primaryKey: false, + field: "engine_number", + autoIncrement: false + }, + vehicleEnginePower: { + index: 25, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆发动机功率", + primaryKey: false, + field: "vehicle_engine_power", + autoIncrement: false + }, + businessLicenseNo: { + index: 26, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营许可证号", + primaryKey: false, + field: "business_license_no", + autoIncrement: false + }, + licensePlateColor: { + index: 27, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车牌颜色", + primaryKey: false, + field: "license_plate_color", + autoIncrement: false + }, + totalVehicleMass: { + index: 28, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆总质量", + primaryKey: false, + field: "total_vehicle_mass", + autoIncrement: false + }, + totalQuasiTractionMassOfVehicle: { + index: 29, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆准牵引总质量", + primaryKey: false, + field: "total_quasi_traction_mass_of_vehicle", + autoIncrement: false + }, + roadTransportCertificateNo: { + index: 30, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "道路运输证号", + primaryKey: false, + field: "road_transport_certificate_no", + autoIncrement: false + }, + vehicleHeight: { + index: 31, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆车高", + primaryKey: false, + field: "vehicle_height", + autoIncrement: false + }, + vehicleConductor: { + index: 32, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆车长", + primaryKey: false, + field: "vehicle_conductor", + autoIncrement: false + }, + vehicleWidth: { + index: 33, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆车宽", + primaryKey: false, + field: "vehicle_width", + autoIncrement: false + }, + vehicleType: { + index: 34, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆类型", + primaryKey: false, + field: "vehicle_type", + autoIncrement: false + }, + vehicleTypeWithDrivingLicense: { + index: 35, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "行驶证车辆类型", + primaryKey: false, + field: "vehicle_type_with_driving_license", + autoIncrement: false + }, + vehicleWheelbase: { + index: 36, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车辆轴距", + primaryKey: false, + field: "vehicle_wheelbase", + autoIncrement: false + }, + ratingDate: { + index: 37, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "等级评定日期", + primaryKey: false, + field: "rating_date", + autoIncrement: false + }, + technicalEvaluationGrade: { + index: 38, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "技术评定等级", + primaryKey: false, + field: "technical_evaluation_grade", + autoIncrement: false + }, + nextRatingDate: { + index: 39, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "下次等级评定日期", + primaryKey: false, + field: "next_rating_date", + autoIncrement: false + }, + creationDate: { + index: 40, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "创建日期", + primaryKey: false, + field: "creation_date", + autoIncrement: false + }, + type: { + index: 41, + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: "类型 出租车/危货", + primaryKey: false, + field: "type", + autoIncrement: false + } + }, { + tableName: "municipal_vehicle", + comment: "", + indexes: [] + }); + dc.models.MunicipalVehicle = MunicipalVehicle; + return MunicipalVehicle; }; \ No newline at end of file diff --git a/api/app/lib/models/overspeed.js b/api/app/lib/models/overspeed.js index fa95d5b3..71f68134 100644 --- a/api/app/lib/models/overspeed.js +++ b/api/app/lib/models/overspeed.js @@ -2,186 +2,205 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const Overspeed = sequelize.define("overspeed", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "overspeed_id_uindex" - }, - districtcounty: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "区/县", - primaryKey: false, - field: "districtcounty", - autoIncrement: false - }, - nameOfInspectionPoint: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "检测点名称", - primaryKey: false, - field: "name_of_inspection_point", - autoIncrement: false - }, - licensePlate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车牌号码", - primaryKey: false, - field: "license_plate", - autoIncrement: false - }, - numberOfAxles: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车轴数", - primaryKey: false, - field: "number_of_axles", - autoIncrement: false - }, - overrunRate: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "超限率", - primaryKey: false, - field: "overrun_rate", - autoIncrement: false - }, - overrunWeight: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "超限重量", - primaryKey: false, - field: "overrun_weight", - autoIncrement: false - }, - grossVehicleWeight: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车货总重", - primaryKey: false, - field: "gross_vehicle_weight", - autoIncrement: false - }, - vehicleCargoWeightLimit: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "车货限重", - primaryKey: false, - field: "vehicle_cargo_weight_limit", - autoIncrement: false - }, - testTime: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "检测时间", - primaryKey: false, - field: "test_time", - autoIncrement: false - }, - nameOfBusinessOwner: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营业户名称", - primaryKey: false, - field: "name_of_business_owner", - autoIncrement: false - }, - businessAddress: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "经营业户地址", - primaryKey: false, - field: "business_address", - autoIncrement: false - }, - notifier: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "通知人", - primaryKey: false, - field: "notifier", - autoIncrement: false - }, - notificationMethod: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "通知方式", - primaryKey: false, - field: "notification_method", - autoIncrement: false - }, - notificationResults: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "通知结果", - primaryKey: false, - field: "notification_results", - autoIncrement: false - }, - processingTime: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "处理时间", - primaryKey: false, - field: "processing_time", - autoIncrement: false - }, - deductPoints: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "扣分", - primaryKey: false, - field: "deduct_points", - autoIncrement: false - }, - fine: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "罚款", - primaryKey: false, - field: "fine", - autoIncrement: false - }, - remarks: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: "备注", - primaryKey: false, - field: "remarks", - autoIncrement: false - } - }, { - tableName: "overspeed", - comment: "", - indexes: [] - }); - dc.models.Overspeed = Overspeed; - return Overspeed; + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const Overspeed = sequelize.define("overspeed", { + id: { + index: 1, + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "overspeed_id_uindex" + }, + districtcounty: { + index: 2, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "区/县", + primaryKey: false, + field: "districtcounty", + autoIncrement: false + }, + nameOfInspectionPoint: { + index: 3, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "检测点名称", + primaryKey: false, + field: "name_of_inspection_point", + autoIncrement: false + }, + licensePlate: { + index: 4, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车牌号码", + primaryKey: false, + field: "license_plate", + autoIncrement: false + }, + numberOfAxles: { + index: 5, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车轴数", + primaryKey: false, + field: "number_of_axles", + autoIncrement: false + }, + overrunRate: { + index: 6, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "超限率", + primaryKey: false, + field: "overrun_rate", + autoIncrement: false + }, + overrunWeight: { + index: 7, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "超限重量", + primaryKey: false, + field: "overrun_weight", + autoIncrement: false + }, + grossVehicleWeight: { + index: 8, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车货总重", + primaryKey: false, + field: "gross_vehicle_weight", + autoIncrement: false + }, + vehicleCargoWeightLimit: { + index: 9, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "车货限重", + primaryKey: false, + field: "vehicle_cargo_weight_limit", + autoIncrement: false + }, + testTime: { + index: 10, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "检测时间", + primaryKey: false, + field: "test_time", + autoIncrement: false + }, + nameOfBusinessOwner: { + index: 11, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营业户名称", + primaryKey: false, + field: "name_of_business_owner", + autoIncrement: false + }, + businessAddress: { + index: 12, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "经营业户地址", + primaryKey: false, + field: "business_address", + autoIncrement: false + }, + notifier: { + index: 13, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "通知人", + primaryKey: false, + field: "notifier", + autoIncrement: false + }, + notificationMethod: { + index: 14, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "通知方式", + primaryKey: false, + field: "notification_method", + autoIncrement: false + }, + notificationResults: { + index: 15, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "通知结果", + primaryKey: false, + field: "notification_results", + autoIncrement: false + }, + processingTime: { + index: 16, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "处理时间", + primaryKey: false, + field: "processing_time", + autoIncrement: false + }, + deductPoints: { + index: 17, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "扣分", + primaryKey: false, + field: "deduct_points", + autoIncrement: false + }, + fine: { + index: 18, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "罚款", + primaryKey: false, + field: "fine", + autoIncrement: false + }, + remarks: { + index: 19, + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "备注", + primaryKey: false, + field: "remarks", + autoIncrement: false + } + }, { + tableName: "overspeed", + comment: "", + indexes: [] + }); + dc.models.Overspeed = Overspeed; + return Overspeed; }; \ No newline at end of file diff --git a/api/app/lib/routes/data/index.js b/api/app/lib/routes/data/index.js index 7b761592..c49cce4b 100644 --- a/api/app/lib/routes/data/index.js +++ b/api/app/lib/routes/data/index.js @@ -7,13 +7,13 @@ const project = require('../../controllers/data/project'); const overspeed = require('../../controllers/data/overspeed'); const bus = require('../../controllers/data/bus'); const publicity = require('../../controllers/data/publicity'); -const data = require('../../controllers/data'); +const dataIndex = require('../../controllers/data/index'); module.exports = function (app, router, opts) { // 数据导出 app.fs.api.logAttr['GET/data/export'] = { content: '导出数据', visible: true }; - router.get('/data/export', data.dataExport); + router.get('/data/export', dataIndex.dataExport); // 运政 //客运车 diff --git a/api/log/development.log b/api/log/development.log index e84a8c6b..405078ef 100644 --- a/api/log/development.log +++ b/api/log/development.log @@ -8602,3 +8602,1400 @@ 2022-07-26 17:14:08.171 - debug: [FS-LOGGER] Init. 2022-07-26 17:14:08.304 - info: [FS-ATTACHMENT] Inject attachment mw into router. 2022-07-26 17:14:08.305 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:03:30.770 - debug: [FS-LOGGER] Init. +2022-07-27 11:03:30.964 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:03:30.964 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:03:31.045 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:06:03.813 - debug: [FS-LOGGER] Init. +2022-07-27 11:06:03.950 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:06:03.950 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:06:04.044 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:07:30.786 - debug: [FS-LOGGER] Init. +2022-07-27 11:07:30.928 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:07:30.928 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:07:31.069 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:08:10.903 - debug: [FS-LOGGER] Init. +2022-07-27 11:08:11.039 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:08:11.039 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:08:11.137 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:15:06.439 - debug: [FS-LOGGER] Init. +2022-07-27 11:15:06.592 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:15:06.593 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:15:06.702 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:15:24.296 - debug: [FS-LOGGER] Init. +2022-07-27 11:15:24.430 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:15:24.430 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:15:24.525 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:15:55.135 - debug: [FS-LOGGER] Init. +2022-07-27 11:15:55.272 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:15:55.272 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:15:55.363 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:18:01.476 - debug: [FS-LOGGER] Init. +2022-07-27 11:18:01.620 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:18:01.620 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:18:01.717 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:22:16.529 - debug: [FS-LOGGER] Init. +2022-07-27 11:22:16.685 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:22:16.686 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:22:16.790 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:22:32.744 - debug: [FS-LOGGER] Init. +2022-07-27 11:22:32.882 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:22:32.882 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:22:32.975 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:22:48.461 - debug: [FS-LOGGER] Init. +2022-07-27 11:22:48.595 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:22:48.595 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:22:48.694 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 11:23:33.711 - debug: [FS-LOGGER] Init. +2022-07-27 11:23:33.856 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:23:33.857 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:24:50.408 - debug: [FS-LOGGER] Init. +2022-07-27 11:24:50.546 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:24:50.547 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:25:15.593 - debug: [FS-LOGGER] Init. +2022-07-27 11:25:15.729 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:25:15.729 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:25:32.631 - debug: [FS-LOGGER] Init. +2022-07-27 11:25:32.762 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:25:32.762 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:25:43.695 - debug: [FS-LOGGER] Init. +2022-07-27 11:25:43.838 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:25:43.838 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:27:28.054 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:27:28.736 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:27:28.909 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:27:28.915 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:27:28.915 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:27:28.918 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:27:28.921 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:29:07.124 - error: path: /road, error: Error: Invalid value { route_name: { [Symbol(like)]: '%不能%' } } +2022-07-27 11:29:11.157 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:29:12.325 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:29:12.325 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:29:12.340 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:29:12.340 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:29:12.340 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:29:12.351 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:30:21.764 - error: path: /road, error: Error: Invalid value { route_name: { [Symbol(like)]: '%123%' } } +2022-07-27 11:30:34.723 - error: path: /road, error: Error: Invalid value { route_name: { [Symbol(like)]: '%123%' } } +2022-07-27 11:32:15.295 - error: path: /road, error: Error: Invalid value { route_name: { [Symbol(like)]: '%123%' } } +2022-07-27 11:33:21.340 - debug: [FS-LOGGER] Init. +2022-07-27 11:33:21.478 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:33:21.479 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:33:42.032 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:33:42.955 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:33:42.958 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:33:43.128 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:33:43.131 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:33:43.137 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:33:43.137 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:41:18.403 - debug: [FS-LOGGER] Init. +2022-07-27 11:41:18.538 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 11:41:18.538 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 11:42:01.496 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:42:02.413 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:42:03.254 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:42:03.261 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:42:03.261 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:42:03.265 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:42:03.662 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:18.264 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:18.311 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:21.085 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:21.102 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:21.115 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:21.115 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:21.135 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:23.449 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:51.489 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:54.899 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:54.899 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:54.909 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:54.909 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:54.909 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 11:44:55.780 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:33:56.170 - error: [FS-ERRHD] +{ + message: 'Unexpected token } in JSON at position 144', + stack: 'SyntaxError: Unexpected token } in JSON at position 144\n' + + ' at JSON.parse ()\n' + + ' at parse (c:\\_WorkCode\\四好公路\\api\\node_modules\\koa-bodyparser\\node_modules\\co-body\\lib\\json.js:62:17)\n' + + ' at c:\\_WorkCode\\四好公路\\api\\node_modules\\koa-bodyparser\\node_modules\\co-body\\lib\\json.js:45:22\n' + + ' at runMicrotasks ()\n' + + ' at processTicksAndRejections (internal/process/task_queues.js:97:5)', + status: 400, + body: '{\r\n' + + ' "name": "价化指农决团",\r\n' + + ' "video": [\r\n' + + ' "70",\r\n' + + ' "1",\r\n' + + ' "12",\r\n' + + ' "6",\r\n' + + ' "26"\r\n' + + ' ],\r\n' + + ' "enable": false,\r\n' + + '}' +} +2022-07-27 13:37:34.816 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:37:51.150 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:37:51.151 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:37:52.518 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:37:52.519 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:37:52.519 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:37:52.519 - error: path: /publicity, error: SequelizeValidationError: notNull Violation: publicity.name cannot be null +2022-07-27 13:40:55.569 - debug: [FS-LOGGER] Init. +2022-07-27 13:40:55.726 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:40:55.726 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:41:39.301 - debug: [FS-LOGGER] Init. +2022-07-27 13:41:39.426 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:41:39.426 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:55:17.708 - debug: [FS-LOGGER] Init. +2022-07-27 13:55:17.844 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:55:17.845 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:57:58.186 - debug: [FS-LOGGER] Init. +2022-07-27 13:57:58.316 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:57:58.316 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:57:58.416 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 13:58:18.771 - debug: [FS-LOGGER] Init. +2022-07-27 13:58:18.904 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:58:18.905 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:58:19.015 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 13:58:35.745 - debug: [FS-LOGGER] Init. +2022-07-27 13:58:35.875 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:58:35.875 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:58:35.975 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 13:58:51.419 - debug: [FS-LOGGER] Init. +2022-07-27 13:58:51.544 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:58:51.545 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:59:30.681 - debug: [FS-LOGGER] Init. +2022-07-27 13:59:30.808 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:59:30.809 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 13:59:30.911 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 13:59:46.066 - debug: [FS-LOGGER] Init. +2022-07-27 13:59:46.189 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 13:59:46.189 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:00:44.183 - debug: [FS-LOGGER] Init. +2022-07-27 14:00:44.311 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:00:44.311 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:00:44.419 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:29)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 14:00:58.080 - debug: [FS-LOGGER] Init. +2022-07-27 14:00:58.209 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:00:58.209 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:01:56.663 - debug: [FS-LOGGER] Init. +2022-07-27 14:01:56.789 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:01:56.790 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:01:56.895 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:22)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 14:02:21.369 - debug: [FS-LOGGER] Init. +2022-07-27 14:02:21.495 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:02:21.495 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:03:33.768 - debug: [FS-LOGGER] Init. +2022-07-27 14:03:33.897 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:03:33.898 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:03:34.002 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:22)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 14:04:12.945 - debug: [FS-LOGGER] Init. +2022-07-27 14:04:13.091 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:04:13.091 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:06:11.749 - debug: [FS-LOGGER] Init. +2022-07-27 14:06:11.877 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:06:11.878 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:06:11.983 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:22)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 14:06:30.287 - debug: [FS-LOGGER] Init. +2022-07-27 14:06:30.417 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:06:30.417 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:07:42.820 - debug: [FS-LOGGER] Init. +2022-07-27 14:07:42.947 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:07:42.948 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:07:43.050 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:22)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 14:08:03.772 - debug: [FS-LOGGER] Init. +2022-07-27 14:08:03.905 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:08:03.905 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:10:17.266 - debug: [FS-LOGGER] Init. +2022-07-27 14:10:17.408 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:10:17.409 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:10:17.527 - error: [app] +{ + message: "Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js', + stack: "Error: Cannot find module 'better-xlsx'\n" + + 'Require stack:\n' + + '- c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\app\\index.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\config.js\n' + + '- c:\\_WorkCode\\四好公路\\api\\server.js\n' + + ' at Function.Module._resolveFilename (internal/modules/cjs/loader.js:815:15)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:667:27)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js:3:14)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js:3:22)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)\n' + + ' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' + + ' at Module.require (internal/modules/cjs/loader.js:887:19)\n' + + ' at require (internal/modules/cjs/helpers.js:74:18)\n' + + ' at Object. (c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' + + ' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' + + ' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' + + ' at Module.load (internal/modules/cjs/loader.js:863:32)', + code: 'MODULE_NOT_FOUND', + requireStack: [ + 'c:\\_WorkCode\\四好公路\\api\\utils\\xlsxDownload.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\controllers\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\data\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\routes\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\lib\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\app\\index.js', + 'c:\\_WorkCode\\四好公路\\api\\config.js', + 'c:\\_WorkCode\\四好公路\\api\\server.js' + ] +} +2022-07-27 14:10:37.875 - debug: [FS-LOGGER] Init. +2022-07-27 14:10:38.002 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:10:38.003 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:12:23.299 - debug: [FS-LOGGER] Init. +2022-07-27 14:12:23.430 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:12:23.430 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:14:27.299 - debug: [FS-LOGGER] Init. +2022-07-27 14:14:27.428 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:14:27.428 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:14:57.566 - debug: [FS-LOGGER] Init. +2022-07-27 14:14:57.693 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:14:57.693 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:16:29.316 - debug: [FS-LOGGER] Init. +2022-07-27 14:16:29.444 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:16:29.444 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:16:45.000 - error: path: /data/export, error: ReferenceError: moment is not defined +2022-07-27 14:16:57.856 - debug: [FS-LOGGER] Init. +2022-07-27 14:16:57.994 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:16:57.994 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:18:39.984 - debug: [FS-LOGGER] Init. +2022-07-27 14:18:40.112 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:18:40.112 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:18:50.588 - error: path: /data/export, error: ReferenceError: header is not defined +2022-07-27 14:20:01.935 - error: path: /data/export, error: ReferenceError: header is not defined +2022-07-27 14:37:49.813 - debug: [FS-LOGGER] Init. +2022-07-27 14:37:49.964 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:37:49.964 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:42:45.417 - debug: [FS-LOGGER] Init. +2022-07-27 14:42:45.566 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-27 14:42:45.566 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-27 14:42:48.376 - error: path: /data/export, error: ReferenceError: fs is not defined diff --git a/api/package.json b/api/package.json index b43ee0d0..4dab3cf4 100644 --- a/api/package.json +++ b/api/package.json @@ -17,6 +17,7 @@ "archiver": "3.0.0", "args": "^3.0.7", "async-busboy": "^0.7.0", + "better-xlsx": "^0.7.6", "crypto-js": "^4.0.0", "file-saver": "^2.0.2", "fs-web-server-scaffold": "^2.0.2", @@ -24,6 +25,7 @@ "kafka-node": "^2.2.3", "koa-convert": "^1.2.0", "koa-proxy": "^0.9.0", + "koa2-swagger-ui": "^5.3.0", "md5-node": "^1.0.1", "moment": "^2.24.0", "path": "^0.12.7", @@ -33,10 +35,9 @@ "request": "^2.88.2", "rimraf": "^3.0.2", "superagent": "^3.5.2", + "swagger-jsdoc": "^6.1.0", "uuid": "^3.3.2", - "xlsx": "^0.16.9", - "koa2-swagger-ui": "^5.3.0", - "swagger-jsdoc": "^6.1.0" + "xlsx": "^0.16.9" }, "devDependencies": { "mocha": "^6.0.2" diff --git a/api/utils/xlsxDownload.js b/api/utils/xlsxDownload.js index fd688bf6..08b51045 100644 --- a/api/utils/xlsxDownload.js +++ b/api/utils/xlsxDownload.js @@ -71,7 +71,7 @@ async function simpleExcelDown ({ data = [], header = [], fileName = moment().fo }) return savePath } + module.exports = { - simpleExcelDown, - makeDir + simpleExcelDown } \ No newline at end of file diff --git a/api/yarn.lock b/api/yarn.lock index 6da0dc79..174933da 100644 --- a/api/yarn.lock +++ b/api/yarn.lock @@ -55,6 +55,13 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/runtime@^7.8.4": + version "7.18.9" + resolved "http://10.8.30.22:7000/@babel%2fruntime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a" + integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw== + dependencies: + regenerator-runtime "^0.13.4" + "@fs/attachment@^1.0.0": version "1.0.2" resolved "http://10.8.30.22:7000/@fs%2fattachment/-/attachment-1.0.2.tgz#5ea035b79defb08f86119cb873912747a6a1570d" @@ -528,6 +535,15 @@ better-assert@~1.0.0: dependencies: callsite "1.0.0" +better-xlsx@^0.7.6: + version "0.7.6" + resolved "http://10.8.30.22:7000/better-xlsx/-/better-xlsx-0.7.6.tgz#dc9bdbc303ecdb74823f9582c608d9f6879f4b51" + integrity sha1-3JvbwwPs23SCP5WCxgjZ9oefS1E= + dependencies: + "@babel/runtime" "^7.8.4" + jszip "^3.2.2" + kind-of "^6.0.3" + binary@~0.3.0: version "0.3.0" resolved "http://10.8.30.22:7000/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" @@ -1928,6 +1944,11 @@ ieee754@^1.1.13: resolved "http://10.8.30.22:7000/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha1-jrehCmP/8l0VpXsAFYbRd9Gw01I= +immediate@~3.0.5: + version "3.0.6" + resolved "http://10.8.30.22:7000/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + indexof@0.0.1: version "0.0.1" resolved "http://10.8.30.22:7000/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" @@ -2241,6 +2262,16 @@ jsprim@^1.2.2: json-schema "0.4.0" verror "1.10.0" +jszip@^3.2.2: + version "3.10.0" + resolved "http://10.8.30.22:7000/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061" + integrity sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q== + dependencies: + lie "~3.3.0" + pako "~1.0.2" + readable-stream "~2.3.6" + setimmediate "^1.0.5" + kafka-node@^2.2.3: version "2.6.1" resolved "http://10.8.30.22:7000/kafka-node/-/kafka-node-2.6.1.tgz#e8aee3b642105574fabaa718dc4e90d24767a64d" @@ -2269,6 +2300,11 @@ keygrip@~1.1.0: dependencies: tsscmp "1.0.6" +kind-of@^6.0.3: + version "6.0.3" + resolved "http://10.8.30.22:7000/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= + klaw@^1.0.0: version "1.3.1" resolved "http://10.8.30.22:7000/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" @@ -2440,6 +2476,13 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +lie@~3.3.0: + version "3.3.0" + resolved "http://10.8.30.22:7000/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" + integrity sha1-3Pgt7lRfRgdNryAMfBxaCOD0D2o= + dependencies: + immediate "~3.0.5" + lines-and-columns@^1.1.6: version "1.2.4" resolved "http://10.8.30.22:7000/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" @@ -2975,6 +3018,11 @@ packet-reader@1.0.0: resolved "http://10.8.30.22:7000/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" integrity sha1-kjjlSA3tq6z+H+PydxBj8WQVfXQ= +pako@~1.0.2: + version "1.0.11" + resolved "http://10.8.30.22:7000/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8= + parse-json@^5.0.0: version "5.2.0" resolved "http://10.8.30.22:7000/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -3346,7 +3394,7 @@ readable-stream@1.1.x: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "http://10.8.30.22:7000/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c= @@ -3395,6 +3443,11 @@ redis@^3.1.2: redis-errors "^1.2.0" redis-parser "^3.0.0" +regenerator-runtime@^0.13.4: + version "0.13.9" + resolved "http://10.8.30.22:7000/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I= + regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "http://10.8.30.22:7000/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -3549,6 +3602,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: resolved "http://10.8.30.22:7000/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= +setimmediate@^1.0.5: + version "1.0.5" + resolved "http://10.8.30.22:7000/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= + setprototypeof@1.1.0: version "1.1.0" resolved "http://10.8.30.22:7000/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" diff --git a/scripts/0.0.1/data/工具脚本(无需执行)/data/治超/非现场处罚总台账更新至2022.7.5(最新).xlsx b/scripts/0.0.1/data/工具脚本(无需执行)/data/治超/非现场处罚总台账更新至2022.7.5(最新).xlsx index c2cc10cf..3c0fe04b 100644 Binary files a/scripts/0.0.1/data/工具脚本(无需执行)/data/治超/非现场处罚总台账更新至2022.7.5(最新).xlsx and b/scripts/0.0.1/data/工具脚本(无需执行)/data/治超/非现场处罚总台账更新至2022.7.5(最新).xlsx differ diff --git a/weapp/src/packages/changePassword/index.jsx b/weapp/src/packages/changePassword/index.jsx index 04579469..69d57b4c 100644 --- a/weapp/src/packages/changePassword/index.jsx +++ b/weapp/src/packages/changePassword/index.jsx @@ -14,10 +14,10 @@ function Index() { function confirm() { if (!password) { - Taro.showToast({ title: '请输入密码' }) + Taro.showToast({ title: '请输入密码', icon: 'none' }) return } else if (password !== password2) { - Taro.showToast({ title: '两次输入的密码不一致' }) + Taro.showToast({ title: '两次输入的密码不一致', icon: 'none' }) return } else { Taro.showModal({ @@ -50,11 +50,11 @@ function Index() { 新的密码: - setPassword(e.detail.value)} /> + setPassword(e.detail.value)} /> 再次输入新的密码: - setPassword2(e.detail.value)} /> + setPassword2(e.detail.value)} /> 确认 diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx index e1e18170..d756cb2f 100644 --- a/weapp/src/packages/patrol/index.jsx +++ b/weapp/src/packages/patrol/index.jsx @@ -184,9 +184,7 @@ const Index = () => { if (res.statusCode == 200 || res.statusCode == 204) { Taro.showToast({ title: '上报成功', icon: 'none', duration: 1500 }) setTimeout(() => { - Taro.reLaunch({ - url: '/pages/home/index' - }); + Taro.navigateBack() }, 1500) } else { Taro.showToast({ title: res.data.message || '请求出错', icon: 'none' }) @@ -285,7 +283,7 @@ const Index = () => { return ( { - !isSuperAdmin && + (!isSuperAdmin || isView) && 上报类型 @@ -477,7 +475,7 @@ const Index = () => { } { isView ? - 删除 : + isSuperAdmin && 删除 : 上报 } diff --git a/weapp/src/packages/patrolView/index.config.js b/weapp/src/packages/patrolView/index.config.js index e69de29b..d4a27101 100644 --- a/weapp/src/packages/patrolView/index.config.js +++ b/weapp/src/packages/patrolView/index.config.js @@ -0,0 +1,3 @@ +export default { + onReachBottomDistance: 50 +} \ No newline at end of file diff --git a/weapp/src/packages/patrolView/index.jsx b/weapp/src/packages/patrolView/index.jsx index c78b6b07..44a05fb7 100644 --- a/weapp/src/packages/patrolView/index.jsx +++ b/weapp/src/packages/patrolView/index.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react' -import Taro, { useDidShow, useRouter } from '@tarojs/taro' +import Taro, { useDidShow, useRouter, useReachBottom } from '@tarojs/taro' import { View, Picker, Input, Image } from '@tarojs/components' import moment from 'moment' import './index.scss' @@ -17,22 +17,26 @@ import conserveActiveIcon from '../../static/img/patrolView/conserve-active.svg' function Index() { const userInfo = Taro.getStorageSync('userInfo') || {}; const router = useRouter() - const { params: { limit } } = router + const { params: { filter } } = router const [isPatrol, setIsPatrol] = useState(true) const [datePicker, setDatePicker] = useState(moment().format('YYYY-MM-DD')) const [listData, setListData] = useState([]) - const [showListData, setShowListData] = useState([]) const [filterText, setFilterText] = useState('') const [systemInfo, setSystemInfo] = useState('') + const [page, setPage] = useState(0) + const [num, setNum] = useState(Math.random()) + + const limit = 10 useEffect(() => { - getList() - }, [datePicker]) + setPage(0) + setNum(Math.random()) + }, [isPatrol, datePicker]) useEffect(() => { - setShowListData(listData.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve')) - }, [isPatrol]) + getList(page == 0 ? true : false) + }, [num]) function dealError(error) { Taro.showToast({ @@ -42,21 +46,29 @@ function Index() { }); throw new Error(error); } - const getList = () => { + const getList = (isInit) => { Taro.showLoading({ title: '加载中' }) - request.get( - getReportList(), - { startTime: datePicker + ' 00:00:00', endTime: datePicker + ' 23:59:59' } - ).then(res => { + const data = { + limit, + page, + startTime: datePicker + ' 00:00:00', + endTime: datePicker + ' 23:59:59', + keyword: filterText, + reportType: isPatrol ? 'patrol' : 'conserve', + userId: filter === 'my' ? userInfo.id : '', + } + request.get(getReportList(), data).then(res => { Taro.hideLoading() if (res.statusCode == 200) { - let { data } = res - if (limit === 'my') { - data = data.filter(item => item.user.name === userInfo.name) + if (res.data.length === 0) { + Taro.showToast({ + title: '没有更多了', + icon: 'none' + }) } - setListData(data) - setShowListData(data.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve')) - return data; + const temp = isInit ? [] : listData + const nextListData = temp.concat(res.data) + setListData(nextListData) } else { dealError(res.data.message || '请求出错'); } @@ -65,6 +77,12 @@ function Index() { }); } + // 监听上拉触底 + useReachBottom(() => { + setPage(page + 1) + setNum(Math.random()) + }) + useDidShow(() => { let refresh = Taro.getStorageSync('refresh'); // 返回列表需要刷新 if (refresh) { @@ -88,20 +106,20 @@ function Index() { } const handleConfirm = e => { - let nextList = listData.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve') - nextList = nextList.filter(item => item.road.includes(e.detail.value)) - setShowListData(nextList) + setPage(0) + setNum(Math.random()) } const handleInput = e => { setFilterText(e.detail.value); if (!e.detail.value) { - setShowListData(listData.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve')); + setPage(0) + setNum(Math.random()) } } const handleDetail = index => { - Taro.navigateTo({ url: `/packages/patrol/index?type=view&id=${showListData[index].id}` }) + Taro.navigateTo({ url: `/packages/patrol/index?type=view&id=${listData[index].id}` }) } return ( @@ -140,7 +158,7 @@ function Index() { { - showListData && showListData.length > 0 ? showListData && showListData.map((e, index) => { + listData && listData.length > 0 ? listData && listData.map((e, index) => { return ( handleDetail(index)}> diff --git a/weapp/src/pages/home/index.jsx b/weapp/src/pages/home/index.jsx index 30856ce5..3df1e359 100644 --- a/weapp/src/pages/home/index.jsx +++ b/weapp/src/pages/home/index.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useEffect } from 'react'; import Taro from '@tarojs/taro'; import { View } from '@tarojs/components'; import { useIndustry } from '@/actions/business'; @@ -6,8 +6,26 @@ import './index.scss'; const Index = () => { const userInfo = Taro.getStorageSync('userInfo') || {}; + const token = Taro.getStorageSync('token') || null; const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false + useEffect(() => { + if (!userInfo || !token) { + Taro.showModal({ + title: '提示', + content: '未获取用户信息,请重新登录', + showCancel: false, + success: (res) => { + if (res.confirm) { + Taro.reLaunch({ + url: '/pages/auth/login/login' + }); + } + } + }); + } + }, []) + function toPatrol() { Taro.navigateTo({ url: '/packages/patrol/index?type=edit' @@ -19,14 +37,25 @@ const Index = () => { }) } + function toVideo() { + + } + return ( - + 巡 查 养 护 {isSuperAdmin ? '查看' : '填报'} + { + isSuperAdmin && + + 视 频 监 控 + 查看 + + } ); } diff --git a/weapp/src/pages/home/index.scss b/weapp/src/pages/home/index.scss index d9f40d1e..ad17ea81 100644 --- a/weapp/src/pages/home/index.scss +++ b/weapp/src/pages/home/index.scss @@ -3,15 +3,23 @@ flex-direction: column; align-items: center; - .fill { + .card { margin-top: 30px; padding: 10px; width: 94%; height: 360px; + } + + .fill { background: url('../../static/img/home/fill-bg.svg') no-repeat; background-size: 100% 100%; } + .video { + background: url('../../static/img/home/video-bg.svg') no-repeat; + background-size: 100% 100%; + } + .title { margin: 50px 0 0 48px; color: #fff; diff --git a/weapp/src/pages/user/index.jsx b/weapp/src/pages/user/index.jsx index b2f24a95..7108d37e 100644 --- a/weapp/src/pages/user/index.jsx +++ b/weapp/src/pages/user/index.jsx @@ -24,7 +24,7 @@ const Index = ({ ...props }) => { const toMyReport = () => { Taro.navigateTo({ - url: '/packages/patrolView/index?limit=my' + url: '/packages/patrolView/index?filter=my' }) } diff --git a/weapp/src/static/img/home/video-bg.svg b/weapp/src/static/img/home/video-bg.svg new file mode 100644 index 00000000..b3c53501 --- /dev/null +++ b/weapp/src/static/img/home/video-bg.svg @@ -0,0 +1,88 @@ + + + 椭圆形 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/client/assets/color.less b/web/client/assets/color.less index 5ad7b392..0d45e9f2 100644 --- a/web/client/assets/color.less +++ b/web/client/assets/color.less @@ -174,7 +174,7 @@ button::-moz-focus-inner, [type='submit']::-moz-focus-inner {border-style: none;} fieldset {border: 0;} legend {color: inherit;} -mark {background-color: #feffe6;} +mark {background-color: color(~`colorPalette("@{modal-footer-border-color-split}", 1)`);} ::selection {color: #fff;background: @primary-color;} .anticon {color: inherit;} .ant-fade-enter, .ant-fade-appear {animation-fill-mode: both;} @@ -1149,11 +1149,18 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-mentions-dropdown-menu-item-active {background-color: @item-hover-bg;} .ant-menu-item-danger.ant-menu-item {color: #ff4d4f;} .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-item-danger.ant-menu-item-active {color: #ff4d4f;} +<<<<<<< Updated upstream .ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);} .ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;} .ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;} .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);} +======= +.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);} +.ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;} +.ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;} +.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);} +>>>>>>> Stashed changes .ant-menu-inline .ant-menu-item-danger.ant-menu-item::after {border-right-color: #ff4d4f;} .ant-menu-dark .ant-menu-item-danger.ant-menu-item, .ant-menu-dark .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-dark .ant-menu-item-danger.ant-menu-item > a {color: #ff4d4f;} .ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {color: #fff;background-color: #ff4d4f;} @@ -1723,14 +1730,18 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;} .ant-tag-checkable:active, .ant-tag-checkable-checked {color: #fff;} .ant-tag-checkable-checked {background-color: @primary-color;} .ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);} +<<<<<<< Updated upstream .ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{component-background}", 1)`);border-color: #ffadd2;} +======= +>>>>>>> Stashed changes .ant-tag-pink {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} .ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{component-background}", 1)`);border-color: #ffadd2;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} +<<<<<<< Updated upstream .ant-tag-red {color: #cf1322;background: #fff1f0;border-color: #ffa39e;} .ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{success-color-deprecated-bg}", 1)`);border-color: #ffadd2;} @@ -1739,21 +1750,25 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} .ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{modal-header-border-color-split}", 1)`);border-color: #ffa39e;} +======= +.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{segmented-label-hover-color}", 1)`);border-color: #ffa39e;} +>>>>>>> Stashed changes .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;} .ant-tag-volcano {color: #d4380d;background: #fff2e8;border-color: #ffbb96;} .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;} -.ant-tag-orange {color: #d46b08;background: #fff7e6;border-color: #ffd591;} +.ant-tag-orange {color: #d46b08;background: color(~`colorPalette("@{alert-warning-border-color}", 1)`);border-color: #ffd591;} .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;} -.ant-tag-yellow {color: #d4b106;background: #feffe6;border-color: #fffb8f;} +.ant-tag-yellow {color: #d4b106;background: color(~`colorPalette("@{modal-footer-border-color-split}", 1)`);border-color: #fffb8f;} .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;} .ant-tag-gold {color: #d48806;background: #fffbe6;border-color: #ffe58f;} .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;} .ant-tag-cyan {color: #08979c;background: #e6fffb;border-color: #87e8de;} .ant-tag-cyan-inverse {color: #fff;background: #13c2c2;border-color: #13c2c2;} -.ant-tag-lime {color: #7cb305;background: #fcffe6;border-color: #eaff8f;} +.ant-tag-lime {color: #7cb305;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #eaff8f;} .ant-tag-lime-inverse {color: #fff;background: #a0d911;border-color: #a0d911;} .ant-tag-green {color: #389e0d;background: #f6ffed;border-color: #b7eb8f;} .ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;} +<<<<<<< Updated upstream .ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;} .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} @@ -1766,6 +1781,13 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;} .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} .ant-tag-purple {color: #531dab;background: #f9f0ff;border-color: #d3adf7;} +======= +.ant-tag-blue {color: #096dd9;background: #e6f7ff;border-color: #91d5ff;} +.ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} +.ant-tag-geekblue {color: #1d39c4;background: color(~`colorPalette("@{dropdown-menu-submenu-disabled-bg}", 3)`);border-color: #adc6ff;} +.ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} +.ant-tag-purple {color: #531dab;background: color(~`colorPalette("@{alert-error-bg-color}", 1)`);border-color: #d3adf7;} +>>>>>>> Stashed changes .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;} .ant-tag-success {color: #52c41a;background: @success-color-deprecated-bg;border-color: @success-color-deprecated-border;} .ant-tag-processing {color: @primary-color;background: @info-color-deprecated-bg;border-color: @info-color-deprecated-border;} @@ -2003,11 +2025,15 @@ a.ant-typography.ant-typography-disabled:hover, .ant-typography a.ant-typography .ant-upload-list-picture .ant-upload-list-item-error, .ant-upload-list-picture-card .ant-upload-list-item-error {border-color: #ff4d4f;} .ant-upload-list-picture .ant-upload-list-item:hover .ant-upload-list-item-info, .ant-upload-list-picture-card .ant-upload-list-item:hover .ant-upload-list-item-info {background: transparent;} .ant-upload-list-picture .ant-upload-list-item-uploading, .ant-upload-list-picture-card .ant-upload-list-item-uploading {border-style: dashed;} +<<<<<<< Updated upstream .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;} .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;} +======= +.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: @error-color-deprecated-bg;} +>>>>>>> Stashed changes .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'] {fill: #ff4d4f;} .ant-upload-list-picture-card .ant-upload-list-item-info::before {background-color: rgba(0, 0, 0, 0.5);} .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-eye, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-download, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-delete {color: rgba(255, 255, 255, 0.85);} diff --git a/web/client/src/sections/quanju/containers/example.js b/web/client/src/sections/quanju/containers/example.js index bc93d538..1b17bc0f 100644 --- a/web/client/src/sections/quanju/containers/example.js +++ b/web/client/src/sections/quanju/containers/example.js @@ -24,44 +24,52 @@ const Example = (props) => { } - useEffect(() => { + // useEffect(() => { + + // const map = new AMap.Map(MAPID, { + // //resizeEnable: true, + // center: [115.912663, 28.543149],//地图中心点,初始定位加载显示楼块 + // // center: [115.857952, 28.683003],//地图中心点 + // zoom: 13,//地图显示的缩放级别 + // zooms: [8, 18], + // pitch: 65, // 地图俯仰角度,有效范围 0 度- 83 度 + // viewMode: '3D', // 地图模式 + // // rotation: 60 + // // showLabel: false + // }); + // let styleName = 'amap://styles/fb26776387242721c2fc32e2cb1daccc'; + // map.setMapStyle(styleName); + + // let mapComplete = false; + // let windowOnload = false; + // window.onload = function () { + // windowOnload = true; + // } + + - const map = new AMap.Map(MAPID, { - //resizeEnable: true, - center: [115.912663, 28.543149],//地图中心点,初始定位加载显示楼块 - // center: [115.857952, 28.683003],//地图中心点 - zoom: 13,//地图显示的缩放级别 - zooms: [8, 18], - pitch: 65, // 地图俯仰角度,有效范围 0 度- 83 度 - viewMode: '3D', // 地图模式 - // rotation: 60 - // showLabel: false - }); - let styleName = 'amap://styles/fb26776387242721c2fc32e2cb1daccc'; - map.setMapStyle(styleName); - let mapComplete = false; - let windowOnload = false; - window.onload = function () { - windowOnload = true; - } + // //主题样式 + // //主题样式 - //主题样式 + // return () => { + // const amapKeys = Object.keys(localStorage).filter(key => key.match(/^_AMap_/)) // 销毁地图 + // amapKeys.forEach(key => { + // localStorage.removeItem(key) + // }) + // map.clearMap(); + // if (map) map.destroy(); - return () => { - const amapKeys = Object.keys(localStorage).filter(key => key.match(/^_AMap_/)) // 销毁地图 - amapKeys.forEach(key => { - localStorage.removeItem(key) - }) - map.clearMap(); - if (map) map.destroy(); - } - }, []) + + // clearTimeout(timer) + + // } + // }, []) return ( @@ -72,20 +80,13 @@ const Example = (props) => { document.body.clientHeight / 1080 )})`, */ }}> -
+ {/*
*/}
- {/* <<<<<<< HEAD */}
- {/* ======= - -
-
->>>>>>> 385f017aeac33adc39a31e75faf6254a1a881d16 */}
- {/*
*/} diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js b/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js index f672f98a..e2b47bb4 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js @@ -96,7 +96,7 @@ class ReactCarousel extends Component { } */} -
+
{ this.previous(e) }}>左 { this.next(e) }}>右
@@ -119,7 +119,7 @@ class ReactCarousel extends Component { let { timer } = this.state; timer = setInterval(() => { this.next(); - }, 2000); + }, 300000); this.setState({ timer }) diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/left.less b/web/client/src/sections/quanju/containers/footer/leadership/right/left.less index bb7613be..1ae8c8f1 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/left.less +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/left.less @@ -9,22 +9,22 @@ li{ font-family: PingFangSC-Regular, PingFang SC !important; height: 25px !important; // line-height: 25px !important; -} -} - -.ant-select-selection-item{ +}.ant-select-selection-item{ line-height: 25px !important; } .anticon{ color: #fff !important; } +} + + .contain { position: relative; top: 5%; left: 45%; width: 100%; height: 100%; - transition: all 2s; + transition: all 30s; transform: translateX(-50%); color: #fff; overflow: hidden;