Commit Graph

397 Commits

Author SHA1 Message Date
shijing 60c7ca1a6d 数量统计 2022-11-03 14:04:09 +08:00
shijing 896413c933 1102的两个问题 2022-11-03 13:25:38 +08:00
caoqianming c8268bbc26 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2022-11-02 11:18:40 +08:00
caoqianming 15d62f3a28 sass版本号更新 2022-11-02 11:18:37 +08:00
shijing 0fe6f7b35b exam 2022-11-02 10:48:06 +08:00
shijing 42ef4fb444 videoTime 2022-10-31 15:01:28 +08:00
shijing 49a375042c numMin 2022-10-31 10:39:08 +08:00
shijing 3d906738fb search 2022-06-24 08:30:51 +08:00
shijing 48e10fcac5 nochange 2022-06-07 13:47:27 +08:00
shijing 11b57c4c10 nochange 2022-06-07 13:10:49 +08:00
shijing b5a532e126 abilityqualityvideo 2022-06-06 17:04:02 +08:00
shijing cc7ddefa7d 0606 2022-06-06 09:49:12 +08:00
shijing eda1c5c446 0606 2022-06-06 09:08:24 +08:00
““shijing af539a6a17 citys 2022-06-05 22:50:13 +08:00
shijing ae0e8da35f s 2022-06-02 17:46:01 +08:00
shijing 7a7111cfa3 关键字提示搜索提示 2022-06-02 17:02:07 +08:00
shijing 07e50c71d1 0601资质更改 2022-06-01 15:59:16 +08:00
shijing 0dc4b56a13 0530 2022-05-30 10:08:00 +08:00
shijing 177531485a 0530 2022-05-30 09:55:00 +08:00
shijing 4ff81c14c4 0530 2022-05-30 09:28:02 +08:00
shijing 3322c08a52 0530 2022-05-30 08:45:11 +08:00
shijing 7a479f6e07 0422 2022-04-22 12:37:51 +08:00
shijing a4cddb2242 sort 2022-04-21 15:50:37 +08:00
shijing f44a15d560 videoSubLevl 2022-04-21 09:35:12 +08:00
shijing 132244b49e videoPreview 2022-04-20 09:58:54 +08:00
shijing 4817fb0eb0 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2022-04-20 09:35:18 +08:00
shijing 439fa2d102 yundianbo 2022-04-20 09:35:11 +08:00
caoqianming 37a1a5a703 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2022-04-20 09:16:03 +08:00
caoqianming 13aac52084 增加材料详情列 2022-04-20 09:15:55 +08:00
shijing 58417e85a0 wenanxianshi 2022-04-20 09:10:45 +08:00
shijing 268d3e4815 yundianbo 2022-04-20 09:04:10 +08:00
caoqianming fd2af58c8e 修改bug 2022-04-14 08:32:40 +08:00
shilixia 01fa4d4181 erjidanweibaosong 2022-03-02 16:04:29 +08:00
shilixia 24662cae4f lingyunengliyanzheng 2021-12-20 13:18:50 +08:00
shilixia f4a9cf8205 xiuagi 2021-12-17 15:04:27 +08:00
shilixia 73ba89f20f xiugai 2021-12-14 17:01:21 +08:00
shilixia b7004e1a93 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-12-13 10:48:31 +08:00
shilixia 7bdd1a6c8a 咨询资料分享 2021-12-13 10:48:19 +08:00
shijing 01704faa75
登陆页面添加标题 2021-11-11 16:35:14 +08:00
shilixia 0bafaa0445 richengjiandu 2021-10-12 11:31:13 +08:00
shilixia e551f8fa4b fankui 2021-09-09 10:36:25 +08:00
shilixia 32c7776b25 xial 2021-09-08 14:26:21 +08:00
shilixia c85142df75 ship 2021-09-07 10:17:33 +08:00
shilixia 53c9c611cd ship 2021-09-06 16:08:21 +08:00
shilixia 8cbbad1357 shipin 2021-09-06 15:34:07 +08:00
shilixia f7738a9ed9 nengliyanzhengshanchu 2021-08-27 15:42:43 +08:00
shilixia ca09ec39a9 nengli 2021-08-25 09:13:16 +08:00
shilixia 7c5b7ba323 zhudong 2021-08-24 09:07:33 +08:00
shilixia 4efefba09f nengli 2021-08-23 16:02:46 +08:00
shilixia 955f2909f6 nenglibaospng 2021-08-23 15:17:53 +08:00
shilixia 39581b6724 nenglishangchuan 2021-08-20 14:41:53 +08:00
shilixia d08e75cdb8 shipin 2021-08-17 09:21:28 +08:00
shilixia 101fdb7f51 sdf 2021-08-13 10:51:02 +08:00
shilixia 0d8755cb1e daorujianzhun 2021-08-06 15:07:50 +08:00
shilixia 302273ad91 yesuobao 2021-07-29 11:26:15 +08:00
shilixia 7ec83e0585 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-07-29 11:19:22 +08:00
shilixia c52d2f8f1d jiaozhun 2021-07-29 11:19:13 +08:00
caoqianming e11447b800 django cache 有问题 2021-07-20 16:52:32 +08:00
shilixia 67ae066e8d kuodaziduan 2021-07-20 10:00:01 +08:00
shilixia 239d53aeb9 pdf 2021-07-09 16:04:11 +08:00
shilixia 1075c39285 pdf 2021-07-09 16:02:39 +08:00
shilixia 8c84b2ad48 pdf 2021-07-09 15:58:49 +08:00
shilixia 8db283331c bumen 2021-07-09 13:34:28 +08:00
shilixia a6dcd80682 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-07-09 11:23:39 +08:00
shilixia 91d6da4411 zuzhi 2021-07-09 11:23:23 +08:00
caoqianming f9deb7e916 更新视频播放总统计 2021-07-08 15:18:23 +08:00
shilixia aa5883a04f ziti 2021-07-08 11:40:18 +08:00
shilixia 74f8b80204 juesechacun 2021-07-08 11:10:15 +08:00
shilixia 6d75de80d5 ziliangshangchuang 2021-06-28 09:29:43 +08:00
shilixia 081c721494 woderenwusousuo 2021-06-25 14:26:22 +08:00
shilixia dbf7c793c2 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-06-25 10:36:18 +08:00
shilixia d670238807 xiala 2021-06-25 10:36:09 +08:00
caoqianming ae345f232d 删除任务内相关内容 2021-06-21 17:03:21 +08:00
caoqianming 0de9bf7f2d 数据库链接修改 2021-06-21 10:44:10 +08:00
caoqianming 765b497b40 清单模板完成,首页链接调整 2021-06-18 08:38:09 +08:00
caoqianming ad395c2649 清单模板 2021-06-17 17:25:26 +08:00
shilixia 9605d2eef4 xuncharenwu 2021-05-11 13:11:58 +08:00
shilixia bd301335af Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-05-11 13:05:13 +08:00
shilixia 6737cb445f xiugaishuaxin 2021-05-11 13:05:08 +08:00
caoqianming 90abf36c61 nginx 文件鉴权 2021-05-07 16:12:17 +08:00
caoqianming 6af0e82702 初步完成 2021-05-07 14:48:26 +08:00
shilixia c664f060de Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-05-07 14:42:17 +08:00
shilixia 94894d7e09 xiala 2021-05-07 14:42:12 +08:00
caoqianming 5b33dfb76c pc检查页面优化 2021-05-07 14:41:07 +08:00
shilixia c8cd6681f9 xuncharenwu 2021-05-07 09:52:38 +08:00
shilixia 1f2c9f1278 woderenwu 2021-05-07 09:35:50 +08:00
shilixia 83a0ed11ff Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-04-30 15:17:08 +08:00
shilixia 647f6e17a2 xunjianrenwu 2021-04-30 15:17:01 +08:00
caoqianming f0ec4691bc 任务报送批量确认 2021-04-30 13:24:34 +08:00
shilixia eb23199d31 xunjianrenwu 2021-04-30 10:25:14 +08:00
shilixia 2c5a0426d6 xunjian 2021-04-30 09:53:50 +08:00
shilixia 9c70118512 巡检 2021-04-30 09:49:17 +08:00
caoqianming 27591e5fd3 选巡查人员优化 2021-04-29 09:10:01 +08:00
caoqianming 52f7b2436e some fix 2021-04-28 16:58:44 +08:00
shilixia 52c1ed13d9 tijiao 2021-04-28 14:18:05 +08:00
shilixia c26b10604f tijiao 2021-04-28 14:03:31 +08:00
shilixia 10db3cb6dd xiala 2021-04-28 11:48:26 +08:00
shilixia 291294cbcd Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-04-27 15:18:33 +08:00
caoqianming b9204670aa 检查表模板接口 2021-04-27 15:17:16 +08:00
shilixia b452d91b9f Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-04-27 15:09:45 +08:00
shilixia a99a56ba1c xiala 2021-04-27 15:09:33 +08:00
caoqianming c5cf912243 ssl更改 2021-04-26 15:56:15 +08:00
shilixia 1fb508fbef xiala 2021-04-25 14:02:59 +08:00
shilixia a04123d4a9 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-04-23 15:02:52 +08:00
shilixia b84a15a93e xiala 2021-04-23 15:02:44 +08:00
caoqianming 1a62de4abb 重报按钮 2021-04-21 21:36:37 +08:00
caoqianming 5cb3cd8e2e drawer 滚动条 2021-04-21 21:28:17 +08:00
shilixia 697df757b8 jiagundongtiao 2021-04-21 16:34:14 +08:00
shilixia 9c2e20badc 任务执行 2021-04-16 17:10:33 +08:00
shilixia 7949cc9c7d renwuzhixing 2021-04-16 11:21:09 +08:00
shilixia 5df8ebc4f0 chuangjianzirenwu 2021-04-13 17:03:28 +08:00
shilixia a3e0a0a772 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-04-13 10:52:39 +08:00
shilixia cb9ff64b0e yonghu 2021-04-13 10:52:33 +08:00
caoqianming 3e88a397ac system user 分页 2021-04-13 10:50:59 +08:00
shilixia 0a48759416 xialarenwu 2021-04-12 14:02:37 +08:00
shilixia a8d9640375 xiala 2021-04-12 11:30:10 +08:00
shilixia 735d432472 zhiliangxunjian 2021-04-12 10:33:38 +08:00
caoqianming 1b3913dbc4 支持已报送时重报 2021-04-08 21:29:55 +08:00
caoqianming dda86a2d10 增加我的报送任务 2021-04-08 12:14:09 +08:00
caoqianming 17036eda97 报送管理员默认进来看全部 2021-04-07 21:20:33 +08:00
caoqianming a64684fc35 上报统一修改为报送 2021-04-07 21:11:29 +08:00
caoqianming ac1d1f5c53 左侧菜单调整/增加下属公司筛选功能 2021-04-07 14:33:43 +08:00
caoqianming ef2a925265 部门列表加滚动条 2021-04-06 10:47:09 +08:00
caoqianming f16bf41793 任务待发布和执行中可追加任务 2021-04-02 17:20:14 +08:00
caoqianming 936a186eee col=1 2021-04-01 20:25:36 +08:00
caoqianming e40cf39f6c 单record编辑 2021-04-01 17:28:27 +08:00
caoqianming 47670068db recorddo 页面调整 2021-04-01 16:19:07 +08:00
caoqianming d3e4aaf778 查询条件优化 2021-04-01 10:33:28 +08:00
caoqianming 379f1d5a24 主动报送bug 2021-03-31 21:56:58 +08:00
caoqianming ef3259dfd5 增加上报说明 2021-03-31 16:53:57 +08:00
caoqianming 3cfd346873 增加追加任务 2021-03-31 16:50:47 +08:00
caoqianming 83bc58d2e1 分页操作bug 2021-03-31 13:38:54 +08:00
caoqianming 878f6b19d7 任务执行部门加编号 2021-03-31 12:19:22 +08:00
caoqianming 5bee04a33a 显示sort 2021-03-31 11:34:33 +08:00
caoqianming f3bd274cf5 修改树型菜单展示 2021-03-31 11:23:00 +08:00
caoqianming 2d85db236d 文件上传进度条 2021-03-31 11:00:40 +08:00
caoqianming 6a112b32c2 字典排序 2021-03-31 10:49:19 +08:00
caoqianming 223182d61b 部门排序可留空 2021-03-31 10:40:52 +08:00
caoqianming 6a07415d50 显示是否适用 2021-03-31 09:58:32 +08:00
caoqianming c8b26e675a 公司级别等 2021-03-31 09:49:42 +08:00
caoqianming 60b84ab310 字段更新,权限设置 2021-03-30 22:03:59 +08:00
caoqianming 0351b6a7a4 按要求修改 2021-03-30 17:30:08 +08:00
caoqianming 1c6ed2bfb9 穿梭框显示不全 2021-03-30 10:00:07 +08:00
caoqianming 5b76549a19 缺少404页面 2021-03-26 10:10:40 +08:00
caoqianming 0da68d63f3 调整央视 2021-03-25 13:03:30 +08:00
caoqianming 53ad1ae23f supervision 基本完成 2021-03-23 15:05:49 +08:00
shilixia 66f68e5a34 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-03-23 09:09:42 +08:00
shilixia 664bc9aada 登录页面修改 2021-03-23 09:09:00 +08:00
caoqianming e6f4e7ce30 细节完善 2021-03-19 14:51:27 +08:00
caoqianming a8ba750585 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-03-19 13:54:40 +08:00
caoqianming bfa48cabe8 界面优化 2021-03-19 13:54:37 +08:00
shilixia 5069df82e9 liebiaogengxin 2021-03-19 13:29:02 +08:00
caoqianming 2493758943 调整到报送列表 2021-03-19 09:13:39 +08:00
caoqianming 13303b884b 界面调整 2021-03-18 21:23:11 +08:00
caoqianming cc340095db 细节调整 2021-03-18 17:23:55 +08:00
caoqianming 6bd5cf1365 两次提交 2021-03-18 15:22:54 +08:00
caoqianming 275d1c96e7 初步完成 2021-03-18 13:36:48 +08:00
caoqianming 7d8d0bce18 record tab 页 2021-03-18 13:21:34 +08:00
caoqianming 7dec4ca553 首页待办提醒 2021-03-18 13:14:10 +08:00
shilixia 1849681d65 lirbiaodfj 2021-03-18 13:11:56 +08:00
shilixia b8ebb0a049 tijiaoziliao 2021-03-18 11:05:31 +08:00
caoqianming 610becb715 前端权限 2021-03-18 10:15:00 +08:00
caoqianming b4350e8949 前端权限测试 2021-03-18 09:59:29 +08:00
caoqianming 2f9db6f915 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-03-18 09:15:39 +08:00
caoqianming 6b1bd8eac8 任务确认率计算 任务完成 2021-03-18 09:15:34 +08:00
shilixia b507f5028c Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-03-18 09:11:33 +08:00
shilixia a175dcb1fc cailiaobaosong 2021-03-18 09:11:26 +08:00
caoqianming 8820904e27 recorddo 2021-03-18 08:47:59 +08:00
shilixia 178236e2e5 xilazil 2021-03-17 14:40:11 +08:00
shilixia afe51cbcc9 ziliaoshangbao 2021-03-17 13:58:04 +08:00
caoqianming 41ccca16cc 上报率 2021-03-17 13:54:08 +08:00
caoqianming f175379237 report 2021-03-17 09:46:37 +08:00
shilixia b012ae3a46 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-03-17 09:26:16 +08:00
shilixia 507a09de1c cailiaobaosong 2021-03-17 09:25:16 +08:00
caoqianming 7d53e69be0 task rate 2021-03-17 09:23:55 +08:00
caoqianming ec2499a147 处理冲突 2021-03-16 16:13:11 +08:00
shilixia 079e929e11 record 2021-03-16 16:04:13 +08:00
caoqianming 6c473fd78a taskdo vue 2021-03-16 16:03:27 +08:00
shilixia 4a53a07df1 xiala 2021-03-16 08:39:41 +08:00
shilixia 9198ee1f2b xialagengxin 2021-03-16 08:32:16 +08:00
caoqianming aa03f2f0ee 记录主动报送字段 2021-03-16 08:28:27 +08:00
caoqianming d3c173f12f 按清单/按单位 2021-03-15 16:05:39 +08:00
shilixia 46fccd75b4 record 2021-03-15 14:34:31 +08:00
shilixia 86f7afac43 shangbao 2021-03-15 14:22:03 +08:00
caoqianming 9c3190cad6 创建上报记录 2021-03-15 14:20:55 +08:00
caoqianming 19ea893549 创建任务显示状态vue 2021-03-15 09:25:24 +08:00
caoqianming f199b9d68f 创建报送任务vue 2021-03-15 09:21:12 +08:00
shilixia d8488bc925 records 2021-03-15 09:09:37 +08:00
shilixia 68280e13af record 2021-03-15 09:04:04 +08:00
caoqianming 99a113015b 创建报送任务 2021-03-12 17:05:47 +08:00
caoqianming 3475acae63 task表 2021-03-12 15:06:43 +08:00
shilixia 3e7febf4c4 质量清单 2021-03-12 09:34:52 +08:00
caoqianming ad4e61fee3 资料清单model 2021-03-11 09:42:16 +08:00
caoqianming 24b3874c56 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2021-02-19 14:50:20 +08:00
caoqianming 81c42859e1 fit 2021-02-19 14:50:14 +08:00
caoqianming f88c19343f 记录真实ip 2021-01-14 08:58:47 +08:00
caoqianming 8b322f25b4 增加queryrecord 2020-12-31 16:50:41 +08:00
caoqianming 27d5877d36 修改model 2020-12-30 16:28:31 +08:00
caoqianming e1af622a04 cma 限制范围显示 2020-12-22 12:02:01 +08:00
caoqianming b3232df682 import_cma 优化 2020-12-21 16:16:50 +08:00