diff --git a/src/api/common/api.ts b/src/api/common/api.ts index c09cdc8..1d687d1 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -15,7 +15,7 @@ enum Api { getDictItems = '/sys/dict/getDictItems/', getTableList = '/sys/user/queryUserComponentData', getCategoryData = '/sys/category/loadAllData', - getNuList = '/iot/cameraInfo/nuList',//后期调整 + getNuList = '/iot/tplink/cameraInfo/nuList',//后期调整 } /** diff --git a/src/assets/iot/a1.png b/src/assets/iot/a1.png new file mode 100644 index 0000000..8ae04dd Binary files /dev/null and b/src/assets/iot/a1.png differ diff --git a/src/assets/iot/a10.png b/src/assets/iot/a10.png new file mode 100644 index 0000000..d14400a Binary files /dev/null and b/src/assets/iot/a10.png differ diff --git a/src/assets/iot/a11.png b/src/assets/iot/a11.png new file mode 100644 index 0000000..6df1764 Binary files /dev/null and b/src/assets/iot/a11.png differ diff --git a/src/assets/iot/a2.png b/src/assets/iot/a2.png new file mode 100644 index 0000000..1a6bf6c Binary files /dev/null and b/src/assets/iot/a2.png differ diff --git a/src/assets/iot/a3.png b/src/assets/iot/a3.png new file mode 100644 index 0000000..a3de4ac Binary files /dev/null and b/src/assets/iot/a3.png differ diff --git a/src/assets/iot/a4.png b/src/assets/iot/a4.png new file mode 100644 index 0000000..0afa16d Binary files /dev/null and b/src/assets/iot/a4.png differ diff --git a/src/assets/iot/a5.png b/src/assets/iot/a5.png new file mode 100644 index 0000000..ed05722 Binary files /dev/null and b/src/assets/iot/a5.png differ diff --git a/src/assets/iot/a6.png b/src/assets/iot/a6.png new file mode 100644 index 0000000..81d4fe8 Binary files /dev/null and b/src/assets/iot/a6.png differ diff --git a/src/assets/iot/a7.png b/src/assets/iot/a7.png new file mode 100644 index 0000000..9a954d5 Binary files /dev/null and b/src/assets/iot/a7.png differ diff --git a/src/assets/iot/a8.png b/src/assets/iot/a8.png new file mode 100644 index 0000000..64be82c Binary files /dev/null and b/src/assets/iot/a8.png differ diff --git a/src/assets/iot/a9.png b/src/assets/iot/a9.png new file mode 100644 index 0000000..8a23cb0 Binary files /dev/null and b/src/assets/iot/a9.png differ diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts b/src/views/invoicing/jxc/JxcInfo.api.ts similarity index 74% rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts rename to src/views/invoicing/jxc/JxcInfo.api.ts index 66086fb..2b60dbf 100644 --- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.api.ts +++ b/src/views/invoicing/jxc/JxcInfo.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/list', - save='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/add', - edit='/nuIotTqApiRequestLog/nuIotTqApiRequestLog/edit', - deleteOne = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/delete', - deleteBatch = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/deleteBatch', - importExcel = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/importExcel', - exportXls = '/nuIotTqApiRequestLog/nuIotTqApiRequestLog/exportXls', + list = '/configMaterialInfo/configMaterialInfo/list', + save='/configMaterialInfo/configMaterialInfo/add', + edit='/configMaterialInfo/configMaterialInfo/edit', + deleteOne = '/configMaterialInfo/configMaterialInfo/delete', + deleteBatch = '/configMaterialInfo/configMaterialInfo/deleteBatch', + importExcel = '/configMaterialInfo/configMaterialInfo/importExcel', + exportXls = '/configMaterialInfo/configMaterialInfo/exportXls', } /** diff --git a/src/views/invoicing/jxc/JxcInfo.data.ts b/src/views/invoicing/jxc/JxcInfo.data.ts new file mode 100644 index 0000000..570f316 --- /dev/null +++ b/src/views/invoicing/jxc/JxcInfo.data.ts @@ -0,0 +1,109 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '货品名称', + align: "center", + dataIndex: 'materialName' + }, + { + title: '货品编码', + align: "center", + dataIndex: 'materialNo', + width:'100px' + }, + { + title: '规格型号', + align: "center", + dataIndex: 'specificationModel' + }, + { + title: '销售单价', + align: "center", + dataIndex: 'salesUnitPrice', + width:'100px' + }, + { + title: '参考单价', + align: "center", + dataIndex: 'referenceUnitPrice', + width:'100px' + }, + { + title: '货品单位', + align: "center", + dataIndex: 'materialUnits', + width:'100px' + }, + { + title: '供应商', + align: "center", + dataIndex: 'suppliers_dictText', + width:'200px' + }, + { + title: '物料类别', + align: "center", + dataIndex: 'categoryId_dictText', + width:'100px' + }, + { + title: '物料类型', + align: "center", + dataIndex: 'typeId_dictText', + width:'100px' + }, + { + title: '用药类型', + align: "center", + dataIndex: 'medicationId_dictText', + width:'100px' + }, + // { + // title: '物料图片', + // align: "center", + // dataIndex: 'materialImg', + // customRender: render.renderImage, + // }, + // { + // title: '物料标识', + // align: "center", + // dataIndex: 'materialIdent', + // customRender: render.renderImage, + // }, + { + title: '是否启用', + align: "center", + dataIndex: 'izEnabled_dictText', + width:'100px' + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + categoryId: {title: '物料类别',order: 0,view: 'radio', type: 'string',dictTable: "nu_config_material_category", dictCode: 'id', dictText: 'category_name',}, + typeId: {title: '物料类型',order: 1,view: 'radio', type: 'string',dictTable: "nu_config_material_type", dictCode: 'id', dictText: 'type_name',}, + medicationId: {title: '用药类型',order: 2,view: 'radio', type: 'string',dictTable: "nu_config_material_medication", dictCode: 'id', dictText: 'medication_name',}, + materialName: {title: '货品名称',order: 3,view: 'text', type: 'string',}, + materialNo: {title: '货品编码',order: 4,view: 'text', type: 'string',}, + specificationModel: {title: '规格型号',order: 5,view: 'text', type: 'string',}, + salesUnitPrice: {title: '销售单价',order: 6,view: 'number', type: 'number',}, + referenceUnitPrice: {title: '参考单价',order: 7,view: 'number', type: 'number',}, + materialUnits: {title: '货品单位',order: 8,view: 'text', type: 'string',}, + multiUnitSwitch: {title: '多单位开关',order: 9,view: 'switch', type: 'string',}, + oneUnit: {title: '父级单位',order: 10,view: 'text', type: 'string',}, + oneUnitProportion: {title: '父级单位兑换比例',order: 11,view: 'number', type: 'number',}, + oneUnitPrice: {title: '父级单位价格',order: 12,view: 'number', type: 'number',}, + twoUnit: {title: '爷级单位',order: 13,view: 'text', type: 'string',}, + twoUnitProportion: {title: '爷级单位兑换比例',order: 14,view: 'number', type: 'number',}, + twoUnitPrice: {title: '爷级单位价格',order: 15,view: 'number', type: 'number',}, + multiUnitType: {title: '多单位采购默认使用 0子集 1父级 2爷级',order: 16,view: 'text', type: 'string',}, + suppliers: {title: '供应商',order: 17,view: 'text', type: 'string',}, + materialImg: {title: '物料图片',order: 18,view: 'image', type: 'string',}, + materialIdent: {title: '物料标识',order: 19,view: 'image', type: 'string',}, + izEnabled: {title: '是否启用',order: 20,view: 'radio', type: 'string',dictCode: ' iz_enabled',}, +}; diff --git a/src/views/invoicing/jxc/QgdList.vue b/src/views/invoicing/jxc/QgdList.vue new file mode 100644 index 0000000..e5cca23 --- /dev/null +++ b/src/views/invoicing/jxc/QgdList.vue @@ -0,0 +1,302 @@ + + + + + diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts b/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.api.ts similarity index 71% rename from src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts rename to src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.api.ts index ec2b2f8..2c0d4d9 100644 --- a/src/views/iot/tq/nuIotTqElectricitySyncLog/NuIotTqElectricitySyncLog.api.ts +++ b/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.api.ts @@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/list', - save='/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/add', - edit='/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/edit', - deleteOne = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/delete', - deleteBatch = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/deleteBatch', - importExcel = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/importExcel', - exportXls = '/nuIotTqElectricitySyncLog/nuIotTqElectricitySyncLog/exportXls', + list = '/nuInvoicingQgdInfo/nuInvoicingQgdInfo/list', + save='/nuInvoicingQgdInfo/nuInvoicingQgdInfo/add', + edit='/nuInvoicingQgdInfo/nuInvoicingQgdInfo/edit', + deleteOne = '/nuInvoicingQgdInfo/nuInvoicingQgdInfo/delete', + deleteBatch = '/nuInvoicingQgdInfo/nuInvoicingQgdInfo/deleteBatch', + importExcel = '/nuInvoicingQgdInfo/nuInvoicingQgdInfo/importExcel', + exportXls = '/nuInvoicingQgdInfo/nuInvoicingQgdInfo/exportXls', } /** diff --git a/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.data.ts b/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.data.ts new file mode 100644 index 0000000..07b2cb6 --- /dev/null +++ b/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfo.data.ts @@ -0,0 +1,66 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '请购单编号', + align: "center", + dataIndex: 'mainNo' + }, + { + title: '物料编码', + align: "center", + dataIndex: 'wlMaterialNo' + }, + { + title: '物料名称', + align: "center", + dataIndex: 'wlName' + }, + { + title: '采购单位', + align: "center", + dataIndex: 'wlUnits' + }, + { + title: '规格型号', + align: "center", + dataIndex: 'wlSpecificationModel' + }, + { + title: '上限', + align: "center", + dataIndex: 'wlUpperLimit' + }, + { + title: '下限', + align: "center", + dataIndex: 'wlLowerLimit' + }, + { + title: '供应商名称', + align: "center", + dataIndex: 'suppliersName' + }, + { + title: '请购数量', + align: "center", + dataIndex: 'purchaseQuantity' + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + mainNo: {title: '请购单编号',order: 0,view: 'text', type: 'string',}, + wlMaterialNo: {title: '物料编码',order: 1,view: 'text', type: 'string',}, + wlName: {title: '物料名称',order: 2,view: 'text', type: 'string',}, + wlUnits: {title: '采购单位',order: 3,view: 'text', type: 'string',}, + wlSpecificationModel: {title: '规格型号',order: 4,view: 'text', type: 'string',}, + wlUpperLimit: {title: '上限',order: 5,view: 'text', type: 'string',}, + wlLowerLimit: {title: '下限',order: 6,view: 'text', type: 'string',}, + suppliersName: {title: '供应商名称',order: 7,view: 'text', type: 'string',}, + purchaseQuantity: {title: '请购数量',order: 8,view: 'number', type: 'number',}, +}; diff --git a/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfoList.vue b/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfoList.vue new file mode 100644 index 0000000..aa7d8e5 --- /dev/null +++ b/src/views/invoicing/nuInvoicingQgdInfo/NuInvoicingQgdInfoList.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogForm.vue b/src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoForm.vue similarity index 60% rename from src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogForm.vue rename to src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoForm.vue index 8606a52..d80d859 100644 --- a/src/views/iot/tq/nuIotTqElectricitySyncLog/components/NuIotTqElectricitySyncLogForm.vue +++ b/src/views/invoicing/nuInvoicingQgdInfo/components/NuInvoicingQgdInfoForm.vue @@ -2,46 +2,51 @@ @@ -76,7 +87,8 @@ getMultitransUrl, getPreviewUrl, setImageCommon, - testAudio + testAudio, + motionCtrl } from "../camera.api"; const props = defineProps({ @@ -328,6 +340,59 @@ izPhone.value = false; } + /** + * 缩放 + */ + function zoomInOut(type){ + let delayTime = 6000; + if(type == 'in'){ + formData.zoom = formData.zoom+0.4; + if(formData.zoom > 4){ + formData.zoom = 4; + } + formData.sliderValue = formData.zoom; + moveCtrl(10,1,1); + if(formData.sliderValue<=2){ + delayTime = 0.4*6000; + }else{ + delayTime = 0.2*6000; + } + delayExecute(moveCtrl,[10,0,1],delayTime); + }else{ + formData.zoom = formData.zoom-0.4; + if(formData.zoom < 1){ + formData.zoom = 1; + } + formData.sliderValue = formData.zoom; + moveCtrl(9,1,1); + if(formData.sliderValue<=2){ + delayTime = 0.4*6000; + }else{ + delayTime = 0.2*6000; + } + delayExecute(moveCtrl,[9,0,1],delayTime); + } + } + + /** + * 控制球机 + */ + function moveCtrl(direction,startOrNot,speed){ + let params = { + "deviceIndex": formData.deviceIndex, + "direction": direction, + "startOrNot": startOrNot, + "speed": speed, + }; + motionCtrl(params); + } + + function delayExecute(fn, args, delay) { + setTimeout(() => { + fn.apply(this,args) // 使用apply传递参数数组 + }, delay) + } + /** * 销毁 */ diff --git a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue index 8491d96..d7c6cea 100644 --- a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue +++ b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue @@ -63,5 +63,10 @@ .jee-hidden { display: none !important; } + + .ant-modal-body { + height: auto !important; + overflow: hidden !important; + } diff --git a/src/views/iot/tplink/plan/plan.api.ts b/src/views/iot/tplink/plan/plan.api.ts index 1567ff9..8209a67 100644 --- a/src/views/iot/tplink/plan/plan.api.ts +++ b/src/views/iot/tplink/plan/plan.api.ts @@ -2,16 +2,16 @@ import { defHttp } from '/@/utils/http/axios'; import {Modal} from "ant-design-vue"; enum Api { - queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync', - queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync', - queryTreeList = '/iot/cameraInfo/queryTreeList', - getStorageDevice = '/iot/cameraInfo/getStorageDevice', - getAllRecordPlans = '/iot/cameraInfo/getAllRecordPlans', - getRecordCfgs = '/iot/cameraInfo/getRecordCfgs', - addRecordCfgs = '/iot/cameraInfo/addRecordCfgs', - setRecordCfgs = '/iot/cameraInfo/setRecordCfgs', - delRecordCfgs = '/iot/cameraInfo/delRecordCfgs', - getBatchProgress = '/iot/cameraInfo/getBatchProgress', + queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync', + queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync', + queryTreeList = '/iot/tplink/cameraInfo/queryTreeList', + getStorageDevice = '/iot/tplink/cameraInfo/getStorageDevice', + getAllRecordPlans = '/iot/tplink/cameraInfo/getAllRecordPlans', + getRecordCfgs = '/iot/tplink/cameraInfo/getRecordCfgs', + addRecordCfgs = '/iot/tplink/cameraInfo/addRecordCfgs', + setRecordCfgs = '/iot/tplink/cameraInfo/setRecordCfgs', + delRecordCfgs = '/iot/tplink/cameraInfo/delRecordCfgs', + getBatchProgress = '/iot/tplink/cameraInfo/getBatchProgress', } /** diff --git a/src/views/iot/tplink/project/ProjectInfo.api.ts b/src/views/iot/tplink/project/ProjectInfo.api.ts index ace8090..09bcb52 100644 --- a/src/views/iot/tplink/project/ProjectInfo.api.ts +++ b/src/views/iot/tplink/project/ProjectInfo.api.ts @@ -1,11 +1,11 @@ import { defHttp } from '/@/utils/http/axios'; enum Api { - list = '/iot/projectInfo/list', - sync = '/iot/projectInfo/sync', - add = '/iot/projectInfo/add', - edit = '/iot/projectInfo/edit', - delete = '/iot/projectInfo/delete', + list = '/iot/tplink/projectInfo/list', + sync = '/iot/tplink/projectInfo/sync', + add = '/iot/tplink/projectInfo/add', + edit = '/iot/tplink/projectInfo/edit', + delete = '/iot/tplink/projectInfo/delete', } /** diff --git a/src/views/iot/tplink/region/RegionInfo.api.ts b/src/views/iot/tplink/region/RegionInfo.api.ts index dd74287..06284e3 100644 --- a/src/views/iot/tplink/region/RegionInfo.api.ts +++ b/src/views/iot/tplink/region/RegionInfo.api.ts @@ -1,16 +1,16 @@ import { defHttp } from '/@/utils/http/axios'; enum Api { - queryProjectTreeSync = '/iot/projectInfo/queryRegionTreeSync', - queryRegionTreeSync = '/iot/regionInfo/queryRegionTreeSync', - syncProject = '/iot/projectInfo/sync', - syncRegion = '/iot/regionInfo/sync', - syncRegionChildren = '/iot/regionInfo/syncChildren', - list = '/iot/regionInfo/list', - sync = '/iot/regionInfo/sync', - add = '/iot/regionInfo/add', - edit = '/iot/regionInfo/edit', - delete = '/iot/regionInfo/delete', + queryProjectTreeSync = '/iot/tplink/projectInfo/queryRegionTreeSync', + queryRegionTreeSync = '/iot/tplink/regionInfo/queryRegionTreeSync', + syncProject = '/iot/tplink/projectInfo/sync', + syncRegion = '/iot/tplink/regionInfo/sync', + syncRegionChildren = '/iot/tplink/regionInfo/syncChildren', + list = '/iot/tplink/regionInfo/list', + sync = '/iot/tplink/regionInfo/sync', + add = '/iot/tplink/regionInfo/add', + edit = '/iot/tplink/regionInfo/edit', + delete = '/iot/tplink/regionInfo/delete', queryChildrenByParentId = '/sys/sysDepart/queryChildrenByParentId', } diff --git a/src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts new file mode 100644 index 0000000..ca93ac0 --- /dev/null +++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/iot/tq/ApiRequestLog/list', + save='/iot/tq/ApiRequestLog/add', + edit='/iot/tq/ApiRequestLog/edit', + deleteOne = '/iot/tq/ApiRequestLog/delete', + deleteBatch = '/iot/tq/ApiRequestLog/deleteBatch', + importExcel = '/iot/tq/ApiRequestLog/importExcel', + exportXls = '/iot/tq/ApiRequestLog/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.data.ts similarity index 54% rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts rename to src/views/iot/tq/ApiRequestLog/ApiRequestLog.data.ts index 0c6787a..e231f57 100644 --- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLog.data.ts +++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLog.data.ts @@ -6,60 +6,104 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '表号', + title: 'SN', align: "center", dataIndex: 'address' }, + // { + // title: '类型', + // align: "center", + // dataIndex: 'type_dictText' + // }, { - title: '类型', - align: "center", - dataIndex: 'type_dictText' - }, - { - title: '请求时的值', - align: "center", - dataIndex: 'requestValue' - }, - { - title: '请求时间', + title: '操作时间', align: "center", dataIndex: 'requestTime' }, { - title: '请求状态', + title: '上次电表值', align: "center", - dataIndex: 'requestStatus_dictText' + dataIndex: 'requestValue' }, { - title: '请求描述', - align: "center", - dataIndex: 'requestRemark' - }, - { - title: '反馈值', + title: '电表值', align: "center", dataIndex: 'resolveValue' }, { - title: '反馈时间', + title: '状态', align: "center", - dataIndex: 'resolveTime' + dataIndex: 'resolveStatus' + }, + // { + // title: '本次反馈时间', + // align: "center", + // dataIndex: 'resolveTime' + // }, + // { + // title: '本次抄表状态', + // align: "center", + // dataIndex: 'resolveStatus_dictText' + // }, + // { + // title: '反馈描述', + // align: "center", + // dataIndex: 'resolveRemark', + // defaultHidden: true + // }, +]; + +//列表数据 +export const columns2: BasicColumn[] = [ + { + title: 'SN', + align: "center", + dataIndex: 'address' }, { - title: '反馈状态', + title: '操作时间', align: "center", - dataIndex: 'resolveStatus_dictText' + dataIndex: 'requestTime' }, { - title: '反馈描述', + title: '状态', align: "center", - dataIndex: 'resolveRemark' + dataIndex: 'resolveStatus' }, ]; + +//列表数据 +export const columns3: BasicColumn[] = [ + { + title: 'SN', + align: "center", + dataIndex: 'address' + }, + { + title: '操作时间', + align: "center", + dataIndex: 'requestTime' + }, + { + title: '上次水表值', + align: "center", + dataIndex: 'requestValue' + }, + { + title: '水表值', + align: "center", + dataIndex: 'resolveValue' + }, + { + title: '状态', + align: "center", + dataIndex: 'resolveStatus' + }, +]; // 高级查询数据 export const superQuerySchema = { - address: {title: '表号',order: 0,view: 'text', type: 'string',}, + address: {title: 'SN',order: 0,view: 'text', type: 'string',}, type: {title: '类型',order: 1,view: 'list', type: 'string',dictCode: 'dbsb_type',}, requestValue: {title: '请求时的值',order: 2,view: 'text', type: 'string',}, requestTime: {title: '请求时间',order: 3,view: 'text', type: 'string',}, diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue similarity index 72% rename from src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue rename to src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue index 464a5fe..820f826 100644 --- a/src/views/iot/tq/nuIotTqApiRequestLog/NuIotTqApiRequestLogList.vue +++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList.vue @@ -1,32 +1,5 @@ - + - + + diff --git a/src/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue new file mode 100644 index 0000000..1e09ba5 --- /dev/null +++ b/src/views/iot/tq/ApiRequestLog/ApiRequestLogList3.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue b/src/views/iot/tq/ApiRequestLog/components/ApiRequestLogForm.vue similarity index 86% rename from src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue rename to src/views/iot/tq/ApiRequestLog/components/ApiRequestLogForm.vue index 4fe0075..ce64985 100644 --- a/src/views/iot/tq/nuIotTqApiRequestLog/components/NuIotTqApiRequestLogForm.vue +++ b/src/views/iot/tq/ApiRequestLog/components/ApiRequestLogForm.vue @@ -2,55 +2,55 @@