aixianling
|
a5dbdbe778
|
Merge branch 'dev' into vite
# Conflicts:
# examples/router/autoRoutes.js
# package.json
# packages/bigscreen/designer/components/Add.vue
# project/dv/apps/AppGridDV.vue
# vue.config.js
|
2022-08-23 11:14:38 +08:00 |
|
aixianling
|
de190a9076
|
减少冗余代码
|
2022-08-23 10:58:14 +08:00 |
|
aixianling
|
efdb76ff0c
|
异常修复
|
2022-08-23 10:53:03 +08:00 |
|
aixianling
|
a0d348748c
|
重新构建一遍okr-tree
|
2022-08-23 10:41:16 +08:00 |
|
aixianling
|
3c499a1f8d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-23 10:39:04 +08:00 |
|
aixianling
|
df498efd2f
|
重新构建一遍okr-tree
|
2022-08-23 10:38:33 +08:00 |
|
liuye
|
6561f31e2d
|
css
|
2022-08-23 08:58:46 +08:00 |
|
aixianling
|
f0edad2b97
|
okrtree改成cdn加载
|
2022-08-22 18:04:00 +08:00 |
|
aixianling
|
37e37540f8
|
okrtree改成cdn加载
|
2022-08-22 18:03:06 +08:00 |
|
shijingjing
|
8312807917
|
30953
|
2022-08-22 17:51:57 +08:00 |
|
yanran200730
|
b52c178051
|
bug
|
2022-08-22 17:06:11 +08:00 |
|
yanran200730
|
8c0f9451b7
|
Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
|
2022-08-22 16:00:16 +08:00 |
|
yanran200730
|
0a262cbb25
|
郫都大屏
|
2022-08-22 16:00:09 +08:00 |
|
aixianling
|
e7fb16bd70
|
修复状态显示异常
|
2022-08-22 15:24:36 +08:00 |
|
liuye
|
41810a8b80
|
宣发统计
|
2022-08-22 15:03:55 +08:00 |
|
liuye
|
53ee346ba0
|
上架宣发
|
2022-08-22 11:42:30 +08:00 |
|
liuye
|
fbfa584d55
|
30710
|
2022-08-22 11:30:27 +08:00 |
|
liuye
|
2d834a57d5
|
宣发统计
|
2022-08-22 10:44:41 +08:00 |
|
aixianling
|
a8041026a9
|
临时处理一下
|
2022-08-19 13:55:13 +08:00 |
|
aixianling
|
e6c3c1c857
|
BUG 30939
|
2022-08-19 11:12:07 +08:00 |
|
aixianling
|
37df0942ff
|
BUG 30868
|
2022-08-19 11:03:44 +08:00 |
|
aixianling
|
3f51798bc1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-19 10:32:25 +08:00 |
|
aixianling
|
85e34eda3d
|
增加信息标注
|
2022-08-19 10:32:12 +08:00 |
|
liuye
|
329f7562db
|
回调
|
2022-08-19 10:24:51 +08:00 |
|
yanran200730
|
a80efb09c0
|
Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
|
2022-08-19 09:42:59 +08:00 |
|
yanran200730
|
122d12fec0
|
bug
|
2022-08-19 09:42:46 +08:00 |
|
liuye
|
17bc8ad651
|
30941
|
2022-08-19 09:15:46 +08:00 |
|
liuye
|
587028883a
|
fix
|
2022-08-19 09:01:42 +08:00 |
|
liuye
|
79bfd71a8e
|
fix
|
2022-08-19 09:00:10 +08:00 |
|
yanran200730
|
8aae3b84a5
|
bug
|
2022-08-18 18:33:01 +08:00 |
|
yanran200730
|
238a6807ac
|
Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
|
2022-08-18 18:25:09 +08:00 |
|
yanran200730
|
49bd61c376
|
bug
|
2022-08-18 18:24:59 +08:00 |
|
aixianling
|
5dac5a8829
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-18 17:28:04 +08:00 |
|
aixianling
|
35e612d35c
|
特制化,使标题跟随菜单目录变化
|
2022-08-18 17:27:50 +08:00 |
|
yanran200730
|
21fcd206db
|
Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
|
2022-08-18 17:14:18 +08:00 |
|
yanran200730
|
dd81c894e0
|
协同宣发
|
2022-08-18 17:14:11 +08:00 |
|
aixianling
|
3b7ee0c6cc
|
固定版本
|
2022-08-18 16:13:37 +08:00 |
|
aixianling
|
bdc0f0861f
|
BUG 30925
|
2022-08-18 16:10:11 +08:00 |
|
aixianling
|
a694d33a9c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-18 15:36:42 +08:00 |
|
aixianling
|
a92123566d
|
秀山需求变更调整完毕
|
2022-08-18 15:36:24 +08:00 |
|
shijingjing
|
8fbdee3a22
|
分页和日期
|
2022-08-18 13:49:16 +08:00 |
|
shijingjing
|
583b210687
|
去掉echerts背景色
|
2022-08-18 12:21:45 +08:00 |
|
shijingjing
|
378c634c4a
|
sortable: "custom"
|
2022-08-18 11:45:46 +08:00 |
|
shijingjing
|
3f9deb61f0
|
30907
|
2022-08-18 09:53:15 +08:00 |
|
yanran200730
|
154506ec6e
|
协同宣发
|
2022-08-18 09:40:09 +08:00 |
|
shijingjing
|
320f9b9948
|
漏了
|
2022-08-18 09:32:58 +08:00 |
|
aixianling
|
8b1669ccfc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-18 09:24:01 +08:00 |
|
aixianling
|
5eaada7828
|
BUG 30916
|
2022-08-18 09:23:44 +08:00 |
|
shijingjing
|
6c3686232c
|
正负号格式化
|
2022-08-18 09:12:35 +08:00 |
|
shijingjing
|
34672ebfda
|
正负号
|
2022-08-18 09:02:34 +08:00 |
|