Fork: 0
codedev / smart-metering-front
...
548 commits 223 files changed 0 commit comments 5 contributors
Commits on 2023-04-19
dutingting 删除流程管理 e6f2f36
dutingting first commit fba0e49
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 6b6d1b8
dutingting 装置到期提醒开发 1cced9a
bairujie 任务分发修改 f2b1ca2
Commits on 2023-04-18
bairujie 任务分发详情记录修改,bug修改 394be6b
dutingting 固定资产详情需求更改 793545f
dutingting 业务工作量分析、部门综合分析开发 26fb7c0
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 850c38c
Commits on 2023-04-17
dutingting 部门产值分析 1077250
bairujie 我的检测/部门检测以及pc问题清单部分bug修改 d135cfd
Commits on 2023-04-14
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b25881c
bairujie 任务分发bug修改,合同管理新增接口添加调试 40e3969
dutingting 业务看板样品超期提醒bug修复 7df2914
dutingting 流程管理编辑流程名称、关联业务等字段无法更新成功bug修复 070ab9a
dutingting 检定记录、检定证书bug修复 f6ec0c1
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ff7b445
dutingting 设备到期提醒列表页开发完成、实时工作统计接口联调 01c2eaa
bairujie 分包管理分包申请详情样品列表 c4fe382
Commits on 2023-04-13
dutingting 客户资源测试与bug修复 4c4a58c
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev f771f6b
dutingting 实时工作统计页面搭建、标准装置更换申请bug修复 05a7de2
Commits on 2023-04-12
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 5e8dab7
liyaguang feat(*): 文件配置管理 6ab4853
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev fd8e7b5
bairujie 分包管理详情 008dec9
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev fd8cce5
dutingting bug修复 7d9c579
Commits on 2023-04-11
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 2702640
bairujie 档案详情,验收详情页面 2b61aa5
dutingting 样品超期提醒检定记录和检定证书开发 82338c7
dutingting 设备检修列表修改 4ea50f7
dutingting 样品超期提醒开发、任务分发bug修复以及公共组件优化、新增委托书样品列表和设备交接单样品列表接口联调 4aff2ac
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev e79eab3
dutingting 更换申请、样品超期提醒 6c98325
bairujie 分包验收详情添加,档案详情部分添加,接口定义 9a9aed8
Commits on 2023-04-10
bairujie 合同管理详情路由搭建,按钮权限配置,合同申请详情编写 4da2c83
Commits on 2023-04-07
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ff2c5c7
dutingting 暂停申请、撤销申请、恢复申请、复查申请开发 d22de48
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 875ceff
liyaguang feat(*): websocket初始化/文件配置管理列表 9a2bb53
bairujie 分包管理页面修改接口添加 114298c
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 50a05d3
dutingting 任务分发路由重名问题 0c3b767
bairujie 合同管理页面接口 35933bd
Commits on 2023-04-04
dutingting 解决冲突 3bc6f27
bairujie 全局弹出层页数修改,高度调整,证书打印列表详情修改 cf8828c
dutingting 标准装置修改 79ebd5e
Commits on 2023-04-03
dutingting 菜单配置 2043231
bairujie 分包项目申请-列表接口调试 3701d8c
Commits on 2023-03-31
bairujie 业务管理分包管理页面编写,查询接口定义 4f6e0ca
Commits on 2023-03-30
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c8cad5f
dutingting 标准装置列表、到期提醒开发 5b2d9b6
bairujie 测量设备,固定资产,状态管理多文件上传,编辑页面修改 e7e6298
Commits on 2023-03-29
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev afbd3ab
bairujie 状态管理修改待测试 5c20ab2
liyaguang fix(*): 解决用户非计量人员菜单问题 6af40e7
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1b62ce6
dutingting 标准装置列表bug修改、增加上传多个文件功能 a85ee8e
bairujie 财务管理路由添加bug修改 74a3bfe
bairujie 财务管理路由配置页码编写 ee709d2
Commits on 2023-03-28
bairujie 分发选择人员弹出组件修改 441301e
dutingting 证书报告增加右上角菜单点击功能 656223d
dutingting bug修复 e9262f8
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ec705d6
dutingting 新增接口联调 9d10edf
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev dc64315
bairujie 任务分发修改 a16d04d
Commits on 2023-03-27
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 0a0ea67
dutingting 设备保险验收单开发完成 bb78818
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev f67cbe6
bairujie 显示null调整 079d72c
Commits on 2023-03-24
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b42c7a3
dutingting bug修复 248beea
bairujie 全局弹窗列表修改,按钮点击修改样式 2ca889e
Commits on 2023-03-23
bairujie 计量bug修改 dc5913a
Commits on 2023-03-20
bairujie 测量设备bug修改 bc27e3f
bairujie tab切换按钮权限接口修改 9bf1c7c
bairujie tab切换按钮权限接口修改 9df57d9
Commits on 2023-03-17
dutingting 测试设备领用和bug修改 852d93a
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ef3f43e
dutingting bug修复 6ed9eb3
Commits on 2023-03-16
bairujie 审批配置文件编写 65adcef
Commits on 2023-03-15
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 4f31c14
liyaguang fix(*): 原始证书模板下载功能修改 3c02b16
Commits on 2023-03-14
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c7942b9
bairujie 部门检测分发,详情接口联调 ae0e136
dutingting bug修复 81f7fe4
dutingting bug修复 85026cd
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev db6f500
liyaguang fix(*): 原始证书模板下载功能修改 e0a62e9
dutingting 设备检修列表和溯源供方的审批流程 5011020
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c12931f
dutingting bug修复、代码规范修改、接口联调 de38bf0
Commits on 2023-03-13
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 5e3633a
bairujie bug修改,删除按钮取消显示 1682177
Commits on 2023-03-10
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev bcfd357
dutingting 证书报告模块（完成95%）、一些bug修复 5aaeca9
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 06ff9d3
bairujie 接口调整,计量问题修改 138849b
liyaguang fix(*): 原始记录模板下载功能修改 d78004f
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 45fb822
liyaguang fix: 保存密码功能/区域管理新增修改 aeeccf6
Commits on 2023-03-09
dutingting 解决冲突 616e042
dutingting 原始记录完成、证书报告详情pending 1a13f3f
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 4255a55
bairujie 我的资源资源监测接口调试 d8a3b66
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 01649c0
liyaguang fix: 区域管理树形结构/文档模板下载功能 025140f
bairujie 证书打印,部门检测,我的检测列表,查询调试 e91545b
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1e604ae
bairujie 证书打印,任务分发添加按钮权限,接口调试 90750d2
Commits on 2023-03-08
liyaguang fix: 签名/签章 新建选择人员弹窗 706ef2d
Commits on 2023-03-07
dutingting 原始记录详情联调、证书报告列表页联调、bug修复 00dca6c
bairujie bug页面修改,接口文件归类 30b8eaa
Commits on 2023-03-06
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1cd86a4
dutingting 原始记录详情所用设备完成 fe041c5
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 7e660f3
bairujie bug修改,文件打印接口调试 d77b149
Commits on 2023-03-03
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c4f4ff0
dutingting 计量管理工作台 7ce1f87
Commits on 2023-03-02
bairujie 计量文件审批修改,证书到期提醒 58ba64c
bairujie 状态管理按钮权限修改,人员详情新增编辑接口参数修改 80541f4
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 19bf2fb
Commits on 2023-03-01
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c507ec6
dutingting 培训管理模块修改完成、计量管理工作台部门修改 3e74ab1
bairujie 设备借用 设备状态管理 页面接口修改 2841ac4
Commits on 2023-02-28
bairujie "代码规范修改" 262502b
bairujie 计量文件设备借用页面调整接口添加修改文件 204e082
dutingting 解决冲突 dd9118a
dutingting 细节优化、审批流程联调、bug修复 6f22587
Commits on 2023-02-27
liyaguang fix(修改计量人员部分规范): 042724e
bairujie 计量文件设备借用页面调整接口添加修改文件 8b62c0a
Commits on 2023-02-24
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 6d201b4
bairujie 计量文件设备借用页面调整接口添加 ba0649b
Stephanie feat<views>: 实验室检测联调 3acd926
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 222cf8d
Stephanie feat<views>: 实验室检测联调 44b8e78
dutingting bug修复 b934bbb
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 55e5e9d
dutingting 接口联调、ui统一、细节修改等等 34dd9c3
Commits on 2023-02-23
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 2aa3497
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 4494906
dutingting 设备交接单新建联调、样品列表字段修改、检查培训计划问题（列表缺少序号、ui、少一列负责人、代码标红、详情人员信息功能不对）pending dcfb119
Stephanie feat<views>: 任务分发相关联调 52c23a7
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 2806055
Stephanie feat<views>: 客户管理-客户建议联调 3f84a3a
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 42021cb
Commits on 2023-02-22
dutingting bug修复 4727793
bairujie 计量文件设备借用页面调整接口添加 f4fa212
Stephanie feat<views>: 计量组织-科室管理-编辑增加计量专业、是否为实验室、实验室能力 80a76e0
dutingting 检查代码规范-环境记录单、发现问题修改（导出功能未做、列表序号问题、未定义ts接口、增加注释、其他样式问题修改） 02fd7ac
Commits on 2023-02-21
dutingting bug修复 c798499
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 44422b5
dutingting 委托书终止功能完成、设备交接单列表页联调、原始记录检查问题修改（1.缺少ts接口定义、字典前端定义没有调接口问题、添加注释、功能缺少）、原始记录列表页联调 73889e2
bairujie 计量文件页面调整接口添加调试 0d66a8a
Commits on 2023-02-20
bairujie "状态管理修改" fd9f3c0
Commits on 2023-02-17
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b35ccf3
Stephanie feat<views>: 任务管理联调 f3de06e
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 3e072df
dutingting 委托书联调、设备交接单详情 a4ad3fe
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 7166d07
MrTan 价格库下拉框改成输入框 8c11405
Commits on 2023-02-16
dutingting 委托书部分接口联调、设备交接单列表页 c96a926
Commits on 2023-02-15
dutingting 测量设备-工作台-标准装置到期提醒修改 cd7633a
dutingting 细节优化 9dd4148
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c8b47de
dutingting 客户资源工作台已有接口联调完成、样品库已有接口联调、封装右上角按钮组组件 3f43801
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 4cc41bc
bairujie "签名管理，原始记录证书报告模板调试，设备类型模块列表获取接口添加参数，新增接口修改" 6346e9f
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 660ab09
dutingting 测试设备领用--bug修改 62b40f1
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 3b060c4
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev fe3d626
MrTan 修改项目代码爆红 26dfef2
bairujie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 72ef9dc
Commits on 2023-02-14
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 740b5ca
dutingting 走查问题修改完、样品列表、到期样品部分接口联调 cb5e683
Stephanie feat<views>: 客户管理联调, 地址下拉选择 7cbd4a5
Stephanie feat<views>: 客户管理联调 7e7119c
Commits on 2023-02-13
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev bbd7504
dutingting 测量设备工作台联调完成、委托书新建、编辑、详情完成 6cc3487
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev a3f6d3e
MrTan 修改环境记录BUG 8992186
bairujie 审批弹窗替换,无用代码删除,interface接口定义 f2debb5
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c3bfef7
Stephanie feat<views>: 任务分发弹窗 f725fba
dutingting 委托书新建、编辑、详情 065f6bf
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 403ce1f
dutingting bug修复 89f2616
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b6a2a30
dutingting bug修复 5f6249a
Stephanie feat<views>: 修改路由重名问题 eef68d0
Commits on 2023-02-10
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 4b8eb3a
dutingting 委托新建、编辑、详情pending c8a0a8c
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 9c1e6e1
MrTan 原始记录、证书报告 d85203f
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 645314a
Stephanie feat<views>: 证书打印详情 196d174
zhouyinan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 0b5ebdd
dutingting 设备领用处理接口联调、样品细节修改 f2038c2
zhouyinan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 234c047
brujie@163.com 申请参数修改 14f602b
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 0ab09cd
Stephanie fix<*>: 溯源供方联调 84e3946
Commits on 2023-02-09
dutingting 解决冲突 5891bcb
dutingting 走查问题修改、设备领用申请、设备领用处理逻辑修改与接口联调、审批记录组件封装 612b046
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 07c1cda
Stephanie fix<*>: 溯源供方联调 8feb17f
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 9cdf48e
MrTan 证书报告模块 c4d5c19
Stephanie feat<*>: 证书打印列表 a2ee05a
brujie@163.com "系统管理可使用人新增去除,测量设备申请等请求列表参数修改" 527dcd2
Commits on 2023-02-08
Stephanie feat<*>: 部门检测列表, 部门任务分发，检测记录，证书监控、证书列表组件抽取 60e5cae
Commits on 2023-02-07
Stephanie Merge remote-tracking branch 'origin/dev' into dev e30c266
Stephanie feat<views>: 部门检测列表 94b62b4
Stephanie feat<*>: 我的检测列表,退回弹窗，批量扫描弹窗 a59bc82
Stephanie feat<views>: 部门检测列表 8fd2dc0
Stephanie feat<*>: 我的检测列表,退回弹窗，批量扫描痰喘 c5d16ea
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into HEAD fecef60
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 0f378fe
MrTan 标准装置编辑底部列表修改 02d5e73
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 819bd78
Stephanie fix<*>: 优化代码 38045fe
Commits on 2023-02-06
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev a25a1b6
dutingting 流程无主管和可驳回问题、设备收发编辑详情完成、委托书列表 f76380e
Stephanie feat<*>: 标签绑定组件 b4de0da
Commits on 2023-02-03
Stephanie fix<*>: merge 选择人员组件 e0144b5
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev dae8f59
Stephanie fix<*>: 修改任务分发流程配置，选择人员 cb725ab
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1d232ca
MrTan 标准装置、设备维护打印以及权限添加 d0a52af
dutingting 新建流程成功返回列表以及细节修改 13cd296
dutingting 流程细节修改 88a9fb5
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev d147d1c
Stephanie fix<components>: 修改审批弹窗拒绝与驳回颠倒错误 26ba352
Commits on 2023-02-02
dutingting 业务管理-设备收发列表页完成 28a5b39
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1901e41
dutingting 编辑详情（pending） 24d3862
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 57fec46
Stephanie feat<*>: 任务分发-详情：样品详情、检定流程 65fa429
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 8a9537e
MrTan 业务管理-工作台 8b3832a
dutingting 设备收发列表完成 29c8ba9
dutingting 细节优化 56088b3
dutingting 设备领用导出打印等功能的统一 58f4bda
Commits on 2023-02-01
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 9ed75ca
dutingting 到期样品完成 f3705cb
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 4dce889
MrTan 设备检修保养验收单及新建 2d47c5c
Stephanie fix<components>: 增加字段过滤器和样式过滤器 997638e
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c576a45
dutingting 统计流程图空节点、检验流程配置功能 090c178
Commits on 2023-01-31
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 6a9abd0
MrTan 标准装置申请与检修列表 1efea9f
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev cebc169
Stephanie fix<*>: 新增业务管理部分菜单及空页面 a5c18c9
dutingting 工作流发起人完成 e2f7a4a
dutingting 样品详情问题修复、外检->自检 7202519
dutingting 审批名称问题 b93d4e3
Commits on 2023-01-30
dutingting nodeUserList区分成员角色问题，1成员2角色 9070808
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 3b795f1
dutingting 新建流程 f4e2926
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1adf33e
Stephanie fix<assets>: 变更element主题色 1d2a411
dutingting 修复流程标红问题、流程详情表单显示问题 0a6588c
dutingting 流程导出和打印、客户资源工作台客户关系更多跳转错误、流程导出打印权限 bdb1845
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 8d2b4b9
Stephanie fix<views>: 删除无用代码，修改错别字 f12e192
Stephanie fix<utils>: 增加设备维修审批formId a1f4582
Commits on 2023-01-29
MrTan 解决冲突 181e27f
MrTan 培训计划审批 ab1eda4
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 0e2d789
Stephanie fix<views>: 修改溯源供方提交逻辑 8e8cf2b
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ae14983
dutingting 样品列表完成 9af270c
Stephanie fix<views>: 增加临时参数，处理客户资源接口临时调用其他接口报错问题 d060ad2
Stephanie fix<views>: 修改测量设备逻辑问题 ad1c714
Commits on 2023-01-28
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 524b07d
Stephanie fix<views>: 用户角色问题修复 b1b66a3
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ad7389f
liyaguang 计量文件审批 7a6fd1b
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 60caff0
MrTan 标准装置表格 b9c69b6
Stephanie fix<views>: 溯源供方提交逻辑修改 b73f30e
Stephanie fix<views>: 测量设备formId定义 fd2c4dc
Commits on 2023-01-19
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 780ea80
dutingting 样品列表页面 2c3d589
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c27af30
liyaguang feat: 状态管理详情/打印功能 702e385
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 86a3863
dutingting 新增审批设置 f8fc59d
Commits on 2023-01-18
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 189d34f
Stephanie fix<views>: 处理路由重名问题，联调溯源供方审批相关功能，修复keepLive不能用问题 05b7138
liyaguang fix: 设备台账列表/状态管理列表 35bde89
dutingting bug修复 42fe02e
dutingting 代码规范 9cb3292
dutingting 流程管理列表筛选联调 f43a62e
Commits on 2023-01-17
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c790e8e
dutingting 工作台 a4f4739
Stephanie fix<views>: 处理路由重名问题 bd9df1b
Stephanie feat<views>: 完善客户列表、客户关系 49f884d
Stephanie feat<views>: 完善客户列表、客户关系 74af958
Commits on 2023-01-16
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev d3e7e29
Stephanie feat<views>: 客户列表编辑完善、客户关系列表页面新建 6cf98ee
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b99eacb
dutingting 筛选修改 61c288b
Commits on 2023-01-13
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 4a828ae
MrTan 设备管理点检查表列表以及新增页面 99c975d
Stephanie feat<views>: 客户资源路由及客户列表页面完善 558bd3d
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 23f5b9b
Stephanie feat<views>: 客户资源路由及客户列表页面完善 38d685f
Commits on 2023-01-12
Stephanie feat<views>: 新建客户资源路由 364a922
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 71839b0
MrTan 标准装置列表新增表格修改 3aed55d
Stephanie feat<views>: 新增客户管理，修改溯源供方 e3e8e9c
Commits on 2023-01-11
MrTan 解决冲突 d161183
MrTan 培训管理价格列表打印及导出修改 c5c8c37
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 98f6fbb
Stephanie feat<views>: 增加地址选择下拉框组件，修改溯源供方功能，设备台账增删改查功能 3cda05d
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 087007f
dutingting 流程条件开发 93c1547
Commits on 2023-01-09
Stephanie fix<views>: 引入print-js,修改溯源供方列表打印，详情展示 79c53e9
Commits on 2023-01-06
Stephanie fix<views>: 修改溯源供方接口引用 4eb5283
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev dd2decc
Stephanie fix<views>: 修改溯源供方审批 4788ea7
Commits on 2023-01-05
dutingting 流程定义详情 b0e4883
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 559bde9
dutingting 流程编辑接口联调 faceb82
Commits on 2023-01-04
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 0837898
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 20dd81d
dutingting 流程导出、删除、废止、列表 d9d1415
Commits on 2023-01-03
Stephanie fix<views>: 修改溯源供方审批列表 06b3dfb
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 5bde29e
Stephanie feat<views>: 统一审批弹窗 36f7967
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev cb7f238
liyaguang fix: 查询时间段/id导出/状态管理新建 7c0d3f6
MrTan 标准装置申请 b2e474e
MrTan 调整组件中对象类型 da11b87
Commits on 2022-12-30
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 3a963e1
MrTan 表格宽度调整 25c3d1b
liyaguang fix: 计量人员编辑-证书基本信息 ac9c2a0
Commits on 2022-12-29
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c6c7bdc
MrTan 标准装置申请新建 652bcae
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 8e7f20a
liyaguang feat: 设备借用申请列表详情编辑 5e02317
Commits on 2022-12-28
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ae4bb4a
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev e6ce0f5
MrTan 培训管理BUG修改、标准装置申请列表接口联调 9dab83a
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 7be197c
liyaguang feat: 设备借用申请列表新建 2d0082f
Stephanie feat<views>: 增加消息通知，仅样式，未联调 279d3f2
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 5edfa0e
dutingting 测量设备工作台搭建 b1a3176
Stephanie fix<components>:设置分页器必显示 de8e1ca
liyaguang fix(*): 修复路由跳转详情/新建,菜单不高亮问题 ef96cc7
Commits on 2022-12-27
MrTan 培训计划、记录新增改为路由、底部表格调整 fe67a8f
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev d4fcba3
liyaguang fix(*): 证书记录表格修改 bfd6f94
Stephanie feat<views>: 处理冲突 7b11f18
Stephanie feat<views>: 新增二维码弹窗 a573dc3
Stephanie fix<views>: 修改密码 4a85519
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 6e9d7b3
dutingting 细节优化以及选择设备接口联调 4c68a2d
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev e112815
liyaguang fix(*): 计量文件草稿箱/新建编辑路由跳转 4518686
dutingting 细节修复 90fe4a6
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 9ba8560
dutingting 流程管理和设备领用编辑、新建、查看改成路由形式，以及ui调整 cc3b6a9
Stephanie fix<views>: 修改新增溯源供方人员列表编辑交互 672a23f
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 6240188
Stephanie fix<views>: 修复培训考核处理数据问题 5a5114f
Commits on 2022-12-26
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev dec2830
liyaguang fix(*): 富文本回显/新建编辑form对齐/设备借用 11e338c
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 22c0964
dutingting 忽略 b9b1c36
Stephanie fix<store>: 修复菜单跳转问题 dcc621f
Stephanie fix<views>: 修复转树失败的情况 91ccc12
Stephanie fix<views>: 删除详情页面的权限校验 b21f4c8
Stephanie fix<views>: 修改价格列表与编辑页面的交互方式 7482934
Stephanie fix<views>: 调整文字按钮间距和宽度 a13e7a4
Stephanie fix<views>: 调整文字按钮间距和宽度 c10aab0
Commits on 2022-12-23
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 3d97a01
Stephanie fix<views>: 修复登录后默认没有进入第一个主菜单问题 7f14f63
dutingting 按钮-icon 57e366b
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev faa73c9
dutingting 选择设备 ec75774
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev a1b534a
Stephanie fix<views>: 优化样式 a8168d2
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 94f4256
liyaguang fix(*): 样式修改/设备借用路由/证书记录table改form a0a30e4
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 505f4d6
MrTan 新建页样式修改增加校验 109af59
Stephanie fix<views>: 修正ts问题 b62370f
Stephanie fix<views>: 修改UI问题 d59934f
Stephanie fix<views>: 调整工作台样式 21fde78
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c4ce692
dutingting 整理设备维护 e1480d5
Commits on 2022-12-22
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev a07978f
dutingting 设备领用 99c2d0d
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 5bbdb66
Stephanie fix<views>: 新增改新建 6f03c3f
Stephanie fix<views>: 新增详情页面分块样式 87e8747
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev d9408f1
MrTan 标准装置中各种申请 e8704f4
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b35affb
liyaguang feat(*): 状态管理新建,计量人员/文件详情修改 ef774f3
Stephanie fix<views>: 调整新增文件页面UI d1e899c
Stephanie feat<views>: 新增测量设备图标 4e1e98d
Stephanie feat<views>: 新增详情页面布局组件 bedccbb
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev bacc317
MrTan 更换申请页面 d7d17ad
Stephanie feat<views>: 修改按钮组件 a1c03a2
Stephanie feat<views>: 修改为按钮图标 32c1a3a
Stephanie feat<components>: 增加系统设置模块icon图标，增加自定义图标按钮组件 1b3a06e
Stephanie feat<components>: 修改全局UI 31412a4
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 6ccf5d4
MrTan 更换折线图和到期提醒 71ec475
Commits on 2022-12-21
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1380c04
Stephanie feat<components>: 增加垂直、水平柱状图组件，优化折线图、饼状图组件 bc00ec9
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev a05cdfd
liyaguang feat: 设备台账新建，标准状态静态 caac356
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 736336e
MrTan 计量管理工作台折线图 bba545b
Commits on 2022-12-20
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c16991f
liyaguang feat: 固定资产新建编辑 f0de83a
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 37bde6b
MrTan 计量管理工作台卡片封装 516ad14
Stephanie feat<components>:优化折线图饼状图参数 061cc8c
Stephanie feat<components>: 增加饼状图组件 38424c8
Stephanie feat<components>: 修正ts错误 f23857a
Stephanie feat<components>: 增加折线图组件 30c4079
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev c281cc4
Stephanie feat<assets>:打开切换主菜单切换页面开关 c11db8d
Commits on 2022-12-19
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 04b0f9d
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev f50158a
MrTan 标准装置列表新增、 6a3536e
liyaguang feat: 固定资产列表相关功能 a0d7dc4
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 80d80cc
Stephanie feat<assets>:倒计时图片 570b8d2
Commits on 2022-12-16
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev bab8820
MrTan 审批页面 4e0f0e2
dutingting 重置ui统一 1fee5a6
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev f165f76
dutingting 导出、打印、重置、数据配置 2ce91a0
liyaguang feat: 文件，图片预览 719bb1a
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 091c5e2
Stephanie feat<*>:增加echarts通用组件 3f02e31
Commits on 2022-12-15
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 35dce6a
liyaguang Merge branch 'liyaguang' into dev ab32dcd
liyaguang feat: 按钮权限，修改计量组织详情 526a821
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 78addd2
MrTan 工作台完成 72383e4
Commits on 2022-12-14
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 8fda016
liyaguang feat: 证书到期提醒 8a79560
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1fab0a9
MrTan 工作台折线图组件封装 f88f2b5
Commits on 2022-12-13
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 64e7003
liyaguang feat: 证书记录 152a523
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev a899da3
MrTan 溯源/价格库/培训按钮权限 3af796e
Commits on 2022-12-12
liyaguang fix: 计量人员-详情，常用工具-详情 2cd8bbf
liyaguang fix: 计量人员-详情，常用工具-详情 f478a10
MrTan 价格库 fb3b8e7
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 8dd28d5
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1cc7198
dutingting 固定发起人 3eb2ed3
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 6be384a
Commits on 2022-12-10
MrTan 培训记录 f7dbde6
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev e90d366
Stephanie feat<*>:修改组织管理调用接口 814933f
Commits on 2022-12-09
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 27ec3cf
liyaguang feat: 计量组织管理模块相关 1596321
Stephanie fixed: 处理合并异常 79e44de
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 1e1f528
dutingting 详情页搭建 ae74c1d
Stephanie feat<*>:暂时去掉打包的ts校验，升级element版本 a6a1e75
Stephanie feat<*>:新增测量设备路由，修改部分全局样式 dc47a22
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 93f0e96
dutingting 抄送人功能完成 584cf53
Commits on 2022-12-08
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 86e27c0
liyaguang feat: 计量人员列表-新增编辑-选择用户列表 48a68cf
dutingting 解决冲突 352889c
dutingting 成员功能、角色功能、审批设置到流程图里完成 8c3d1a9
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 0d66bfa
MrTan 培训计划/新增 4331d5d
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ca3316b
liyaguang feat: 计量人员列表 8af0967
Stephanie fix<*>:修改全局样式，修改系统管理多数功能样式 9e338f5
Stephanie fix<*>:给自定义header重命名，避免冲突 c193619
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b595e9c
Commits on 2022-12-07
liyaguang fix: 调整常用工具，通知公告，计量文件按钮样式 95daa96
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev b168471
liyaguang Merge branch 'liyaguang' into dev e5be2be
MrTan 登录页 d9ded26
liyaguang feat: 计量文件模块 3be3fe1
Stephanie fix<*>:登录接口调用在header中增加sid参数 544a7aa
Stephanie fix<*>:设置去掉默认控制台显示 ab3c4eb
Stephanie fix<*>:系统设置代码整理 2a72f3b
Stephanie fix<*>:调整日志样式，增加部门接口错误处理跳转登录页 c7a88d1
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev eec37db
MrTan 溯源供方列表新增 aab910d
Commits on 2022-12-06
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 2fb2960
dutingting 处理eslint语法问题 52316c5
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 306facc
liyaguang feat: 模板管理相关功能和导出到excel 712b4c3
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev f7b48e2
Stephanie fix<*>:给登录增加sid参数，调整系统路由，增加默认显示目录 2e0780b
liyaguang feat: 引入xlsx,filer-saver 和 vue3-print-nb插件 fa07e1e
Commits on 2022-12-05
dutingting 节点组件封装 efa7752
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 06c945f
Stephanie fix<*>:修改通知公告样式，及其他涉及table-container页面样式 a674808
Stephanie fix<*>:修改通知公告样式，及其他涉及table-container页面样式 011e9a2
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 2ab50c5
Stephanie fix<*>:修改系统管理中新增未清除输入框问题，并调整部分页面样式 e8987ab
dutingting 封装节点组件 96f8d4d
dutingting 节点 c7d5e26
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 9f4cfe7
liyaguang feat: 签章/签名管理相关功能 bfe9b37
MrTan Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 918cea2
MrTan 溯源供方列表以及新增页面搭建 66a727a
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev a61f3a9
Stephanie fix<*>:规范一些文件名及调整全局样式 ce265f5
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 946e139
dutingting 流程编辑搭建 09a99fe
liyaguang Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 67a6f29
liyaguang fix: 通知公告详情 bc1b651
dutingting 部分走查问题修改 379b4fb
Commits on 2022-12-02
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev f23646d
Stephanie fix<*>:修改全局样式，修复第一个菜单无法正常显示问题 d18bf02
liyaguang Merge branch 'dev' b1759a4
liyaguang feat: 新增通知公告功能 a74d7a2
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 5241400
dutingting Merge branch 'master' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev ab04f8b
dutingting 流程管理列表页搭建 9fdb79d
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 8a7cc6e
Stephanie fix<*>:修改全局样式 9e94cf0
dutingting Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 365a679
dutingting 计量二级菜单 ae5a7d5
liyaguang Merge branch 'dev' 94814bb
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 429b82b
Stephanie fix<*>:修改资源管理字典管理组件引用问题 275732a
liyaguang feat: 通知公告和常用工具页面 34bc757
dutingting 二级菜单 21067ee
dutingting 培训计划审批 8819b8b
dutingting bug修复 3a749ae
Commits on 2021-12-22
Stephanie Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev 47c858d
Commits on 2022-12-22
Stephanie fix<views>: 更新components c44f034
Patch
Unified Split
Showing 223 changed files
View
.env.development
Too large
View
.env.production
Too large
View
.env.test
Too large
View
.eslintrc
Too large
View
.gitignore
Too large
View
.vscode/settings.json
Too large
View
departments150.json 0 → 100644
Too large
View
package.json
Too large
View
plop-templates/page/prompt.js
Too large
View
pnpm-lock.yaml
Too large
View
public/conditions.json 0 → 100644
Too large
View
public/conditions字段注释.js 0 → 100644
Too large
View
public/data.json 0 → 100644
Too large
View
public/data字段注释.js 0 → 100644
Too large
View
public/myData.json 0 → 100644
Too large
View
server.xml 0 → 100644
Too large
View
src/App.vue
Too large
View
src/api/index.ts
Too large
View
src/api/system/area.ts
Too large
View
src/api/system/bench.ts 0 → 100644
Too large
View
src/api/system/dept.ts
Too large
View
src/api/system/login.ts
Too large
View
src/api/system/notice.ts 0 → 100644
Too large
View
src/api/system/price.ts 0 → 100644
Too large
View
src/assets/icons/business-board.svg 0 → 100644
Too large
View
src/assets/icons/icon-add.svg 0 → 100644
Too large
View
src/assets/icons/icon-area.svg 0 → 100644
Too large
View
src/assets/icons/icon-base.svg 0 → 100644
Too large
View
src/assets/icons/icon-bench.svg 0 → 100644
Too large
View
src/assets/icons/icon-book.svg 0 → 100644
Too large
View
src/assets/icons/icon-building.svg 0 → 100644
Too large
View
src/assets/icons/icon-business.svg 0 → 100644
Too large
View
src/assets/icons/icon-case.svg 0 → 100644
Too large
View
src/assets/icons/icon-certi.svg 0 → 100644
Too large
View
src/assets/icons/icon-contract.svg 0 → 100644
Too large
View
src/assets/icons/icon-create.svg 0 → 100644
Too large
View
src/assets/icons/icon-dept.svg 0 → 100644
Too large
View
src/assets/icons/icon-device.svg 0 → 100644
Too large
View
src/assets/icons/icon-dict.svg 0 → 100644
Too large
View
src/assets/icons/icon-error.svg 0 → 100644
Too large
View
src/assets/icons/icon-export.svg 0 → 100644
Too large
View
src/assets/icons/icon-file.svg 0 → 100644
Too large
View
src/assets/icons/icon-finance.svg 0 → 100644
Too large
View
src/assets/icons/icon-flow.svg 0 → 100644
Too large
View
src/assets/icons/icon-fold.svg 0 → 100644
Too large
View
src/assets/icons/icon-import.svg 0 → 100644
Too large
View
src/assets/icons/icon-line.svg 0 → 100644
Too large
View
src/assets/icons/icon-log.svg 0 → 100644
Too large
View
src/assets/icons/icon-loginlog.svg 0 → 100644
Too large
View
src/assets/icons/icon-measure.svg 0 → 100644
Too large
View
src/assets/icons/icon-notice.svg 0 → 100644
Too large
View
src/assets/icons/icon-pie.svg 0 → 100644
Too large
View
src/assets/icons/icon-price.svg 0 → 100644
Too large
View
src/assets/icons/icon-print.svg 0 → 100644
Too large
View
src/assets/icons/icon-resource.svg 0 → 100644
Too large
View
src/assets/icons/icon-role.svg 0 → 100644
Too large
View
src/assets/icons/icon-scan.svg 0 → 100644
Too large
View
src/assets/icons/icon-setting.svg 0 → 100644
Too large
View
src/assets/icons/icon-template.svg 0 → 100644
Too large
View
src/assets/icons/icon-tool.svg 0 → 100644
Too large
View
src/assets/icons/icon-user.svg 0 → 100644
Too large
View
src/assets/icons/icon-ywjs.svg 0 → 100644
Too large
View
src/assets/icons/icon-zhiliang.svg 0 → 100644
Too large
View
src/assets/images/bench/clock.png 0 → 100644
Too large
View
src/assets/images/bench/sampie-status.png 0 → 100644
Too large
View
src/assets/images/check_box.png 0 → 100644
Too large
View
src/assets/images/header-image.png 0 → 100644
Too large
View
src/assets/images/icon_file.png 0 → 100644
Too large
View
src/assets/images/icon_people.png 0 → 100644
Too large
View
src/assets/images/icon_role.png 0 → 100644
Too large
View
src/assets/images/list_search.png 0 → 100644
Too large
View
src/assets/images/login-image/banner.png 0 → 100644
Too large
View
src/assets/images/login-image/bg.png 0 → 100644
Too large
View
src/assets/images/login-image/frame.png 0 → 100644
Too large
View
src/assets/images/next_level.png 0 → 100644
Too large
View
src/assets/images/next_level_active.png 0 → 100644
Too large
View
src/assets/images/scan.png 0 → 100644
Too large
View
src/assets/images/workFlowImg/审批人.png 0 → 100644
Too large
View
src/assets/images/workFlowImg/抄送人.png 0 → 100644
Too large
View
src/assets/images/workFlowImg/条件.png 0 → 100644
Too large
View
src/assets/styles/element-plus/index.scss
Too large
View
src/assets/styles/globals.scss
Too large
View
src/assets/styles/themes.scss
Too large
View
src/components.d.ts
Too large
View
src/components/AddressSelect/AddressSelect.vue 0 → 100644
Too large
View
src/components/AddressSelect/address-interface.ts 0 → 100644
Too large
View
src/components/AddressSelect/country-code.json 0 → 100644
Too large
View
src/components/Approval/ApprovalDialog.vue 0 → 100644
Too large
View
src/components/ApprovalRecord/ApprovalRecord.vue 0 → 100644
Too large
View
src/components/BarCodeBind/index.vue 0 → 100644
Too large
View
src/components/DeptSelect/index.vue
Too large
View
src/components/DetailPage/DetailBlock.vue 0 → 100644
Too large
View
src/components/DetailPage/DetailBlockSwitch.vue 0 → 100644
Too large
View
src/components/DetailPage/index.vue 0 → 100644
Too large
View
src/components/Echart/BarChartHorizontal.vue 0 → 100644
Too large
View
src/components/Echart/BarChartVertical.vue 0 → 100644
Too large
View
src/components/Echart/LineChart.vue 0 → 100644
Too large
View
src/components/Echart/PieChart.vue 0 → 100644
Too large
View
src/components/Echart/echart-interface.ts 0 → 100644
Too large
View
src/components/Echart/theme.json 0 → 100644
Too large
View
src/components/Echart/utils.ts 0 → 100644
Too large
View
src/components/IconButton/index.vue 0 → 100644
Too large
View
src/components/NormalTable/index.vue
Too large
View
src/components/NormalTable/table_interface.ts
Too large
View
src/components/QrDialog/index.vue 0 → 100644
Too large
View
src/components/QrDialog/qrcode.d.ts 0 → 100644
Too large
View
src/components/Sample/certificationMonitor.vue 0 → 100644
Too large
View
src/components/Sample/certificationRecords.vue 0 → 100644
Too large
View
src/components/Sample/measureRecords.vue 0 → 100644
Too large
View
src/components/ScanSampleDialog/index.vue 0 → 100644
Too large
View
src/components/ScanSampleDialog/scan-interface.ts 0 → 100644
Too large
View
src/components/SearchArea/SearchItem.vue
Too large
View
src/components/SearchArea/index.vue
Too large
View
src/components/SelectTree/index.vue 100644 → 0
Too large
View
src/components/TableContainer/index.vue
Too large
View
src/components/benchCol/index.vue 0 → 100644
Too large
View
src/components/buttonBox/buttonBox.ts 0 → 100644
Too large
View
src/components/buttonBox/buttonBox.vue 0 → 100644
Too large
View
src/components/dialog/dialog.ts 0 → 100644
Too large
View
src/components/dialog/errorDialog.vue 0 → 100644
Too large
View
src/components/dialog/selectEmployeesDialog.vue 0 → 100644
Too large
View
src/components/dialog/selectRoleDialog.vue 0 → 100644
Too large
View
src/components/dialog/selectStaffDialog.vue 0 → 100644
Too large
View
src/components/drawer/approverDrawer.vue 0 → 100644
Too large
View
src/components/drawer/conditionDrawer.vue 0 → 100644
Too large
View
src/components/drawer/copyerDrawer.vue 0 → 100644
Too large
View
src/components/drawer/promoterDrawer.vue 0 → 100644
Too large
View
src/components/workFlow/addNode.vue 0 → 100644
Too large
View
src/components/workFlow/addNodeBan.vue 0 → 100644
Too large
View
src/components/workFlow/nodeWrap.vue 0 → 100644
Too large
View
src/components/workFlow/nodeWrapBan.vue 0 → 100644
Too large
View
src/css/dialog.css 0 → 100644
Too large
View
src/css/override-element-ui.css 0 → 100644
Too large
View
src/css/workflow.css 0 → 100644
Too large
View
src/global.d.ts
Too large
View
src/layouts/components/Header/index.vue
Too large
View
src/layouts/components/SidebarItem/index.vue
Too large
View
src/layouts/components/SubSidebar/index.vue
Too large
View
src/layouts/components/Tools/index.vue
Too large
View
src/layouts/components/Tools/resetPwd.vue 0 → 100644
Too large
View
src/layouts/components/Topbar/index.vue
Too large
View
src/layouts/index.vue
Too large
View
src/main.ts
Too large
View
src/plugins/preload.ts 0 → 100644
Too large
View
src/router/index.ts
Too large
View
src/router/modules/breadcrumb.example.ts 100644 → 0
Too large
View
src/router/modules/measure.ts 100644 → 0
Too large
View
src/router/modules/system.ts
Too large
View
src/router/routes.ts
Too large
View
src/settings.default.ts
Too large
View
src/settings.ts
Too large
View
src/store/modules/dict.ts
Too large
View
src/store/modules/menu.ts
Too large
View
src/store/modules/route.ts
Too large
View
src/store/modules/user.ts
Too large
View
src/store/modules/websocket.ts 0 → 100644
Too large
View
src/store/modules/workFlow.ts 0 → 100644
Too large
View
src/utils/auth.ts 0 → 100644
Too large
View
src/utils/buttonPerm.ts 0 → 100644
Too large
View
src/utils/common 100644 → 0
Too large
View
src/utils/download.ts 0 → 100644
Too large
View
src/utils/exportUtils.ts 0 → 100644
Too large
View
src/utils/exportXlsx.ts 0 → 100644
Too large
View
src/utils/getUid.ts 0 → 100644
Too large
View
src/utils/printUtils.ts 0 → 100644
Too large
View
src/utils/scheduleDict.ts 0 → 100644
Too large
View
src/utils/security.ts
Too large
View
src/utils/structure.ts
Too large
View
src/utils/validate.ts 0 → 100644
Too large
View
src/views/example/chartExample.vue 0 → 100644
Too large
View
src/views/login.vue
Too large
View
src/views/login_register.vue
Too large
View
src/views/measure/bench/bench.vue 100644 → 0
Too large
View
src/views/measure/file/approve.vue 100644 → 0
Too large
View
src/views/measure/file/manageMethod.vue 100644 → 0
Too large
View
src/views/measure/file/measureRule.vue 100644 → 0
Too large
View
src/views/measure/file/quality.vue 100644 → 0
Too large
View
src/views/measure/file/rules.vue 100644 → 0
Too large
View
src/views/measure/file/testingMethod.vue 100644 → 0
Too large
View
src/views/measure/person/certificateLog.vue 100644 → 0
Too large
View
src/views/measure/person/list.vue 100644 → 0
Too large
View
src/views/measure/person/remind.vue 100644 → 0
Too large
View
src/views/measure/train/plan.vue 100644 → 0
Too large
View
src/views/system/area/area-interface.ts
Too large
View
src/views/system/area/areaSelectTree.vue
Too large
View
src/views/system/area/area_interface.ts 100644 → 0
Too large
View
src/views/system/area/editArea.vue
Too large
View
src/views/system/area/list.area.vue 100644 → 0
Too large
View
src/views/system/area/listArea.vue 0 → 100644
Too large
View
src/views/system/dept/dept-interface.ts
Too large
View
src/views/system/dept/editDept.vue
Too large
View
src/views/system/dept/listDept.vue
Too large
View
src/views/system/dict/dict-interface.ts
Too large
View
src/views/system/dict/editDict.vue
Too large
View
src/views/system/dict/listDict.vue
Too large
View
src/views/system/log/list.log.vue 100644 → 0
Too large
View
src/views/system/log/listErrorLog.vue
Too large
View
src/views/system/log/listLog.vue 0 → 100644
Too large
View
src/views/system/log/log-interface.ts 0 → 100644
Too large
View
src/views/system/log/log_interface.ts 100644 → 0
Too large
View
src/views/system/log/loginLog.vue
Too large
View
src/views/system/notice/note.list.vue 100644 → 0
Too large
View
src/views/system/process/process.vue 100644 → 0
Too large
View
src/views/system/resource/editResource.vue
Too large
View
src/views/system/resource/listResource.vue
Too large
View
src/views/system/role/editRole.vue
Too large
View
src/views/system/role/listRole.vue
Too large
View
src/views/system/tenant/list.tenant.vue
Too large
View
src/views/system/tool/autograph/autograph.vue 100644 → 0
Too large
View
src/views/system/tool/certificate/certificate.vue 100644 → 0
Too large
View
src/views/system/tool/document/document.vue 100644 → 0
Too large
View
src/views/system/tool/signature/signature.vue 100644 → 0
Too large
View
src/views/system/user/list.user.vue 100644 → 0
Too large
View
src/views/system/user/listUser.vue 0 → 100644
Too large
View
src/views/system/user/role.assignment.vue 100644 → 0
Too large
View
src/views/system/user/roleAssignment.vue 0 → 100644
Too large
View
src/views/system/user/selecTree.vue 0 → 100644
Too large
View
src/views/system/user/select.tree.vue 100644 → 0
Too large
View
src/views/system/user/user-interface.ts 0 → 100644
Too large
View
src/views/system/user/user.add.vue 100644 → 0
Too large
View
src/views/system/user/userAdd.vue 0 → 100644
Too large
View
src/views/system/user/user_interface.ts 100644 → 0
Too large
View
vite/plugins/html.ts
Too large