jiangyy
|
77b4db81a4
|
烟台
|
3 years ago |
dai
|
2915be9f78
|
Merge branch 'yantai_master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
# Conflicts:
# src/router/index.js
# src/views/main-navbar.vue
# src/views/main-shuju/main-navbar.vue
# src/views/modules/base/epidemic/antiInfo.vue
# src/views/modules/base/epidemic/travel.vue
# src/views/modules/base/organization/organization.vue
# src/views/pages/yantai-login.vue
|
3 years ago |
zxc
|
b396b9c574
|
改名和url
|
3 years ago |
|
jiangyy
|
e75b73ab1b
|
Merge branch 'master' into yantai_master
|
3 years ago |
|
jiangyy
|
a5fcc6181f
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
jiangyy
|
41799ddaa2
|
11
|
3 years ago |
|
jiangyy
|
8c455bc8eb
|
111
|
3 years ago |
|
jiangyy
|
e716c4b712
|
重点人群关注、未做核酸对比
|
3 years ago |
|
dai
|
ca4b9457d9
|
Merge branch 'dev-登录返回旧业面'
|
3 years ago |
wanggongfeng
|
42e21c4ba0
|
Merge branch 'dev_zufangUpdate'
|
3 years ago |
|
jiangyy
|
e024d76dc9
|
Merge branch 'master' into dev-磐石烟台1107
|
3 years ago |
|
jiangyy
|
ccb4367109
|
Merge branch 'dev-行程上报1031'
|
3 years ago |
|
jiangyy
|
313d0513ae
|
11
|
3 years ago |
|
jiangyy
|
b3582afa74
|
现居地
|
3 years ago |
|
jiangyy
|
5859995300
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
jiangyy
|
ebfa51214b
|
Merge branch 'dev-行程上报1031'
|
3 years ago |
|
jiangyy
|
bf9b8a717e
|
111
|
3 years ago |
zhaoyongnian
|
7f42533324
|
顺德居小区临时写死
|
3 years ago |
|
wanggongfeng
|
f92f3e4060
|
租房删除
|
3 years ago |
|
jiangyy
|
ab4b815c5a
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
jiangyy
|
10e51f0006
|
隔离防疫
|
3 years ago |
|
wanggongfeng
|
9df41339df
|
工作人员通过pc新增的信息，不自动审核通过，审核状态为未审核，操作按钮为，登记、修改、删除
|
3 years ago |
zhaoqifeng
|
d27820d600
|
Merge branch 'dev_bugfix_zhaoqf'
|
3 years ago |
|
jiangyy
|
76372f79c7
|
去掉选择居民关联属性
|
3 years ago |
|
dai_siki
|
45143a2f1d
|
Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
dai_siki
|
adf392849f
|
改下版本号
|
3 years ago |
|
dai_siki
|
e76b45d908
|
Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
dai_siki
|
a6d5e6fa95
|
Merge branch 'dev-登录返回旧业面' into dev-烟台中转登录2
|
3 years ago |
|
dai_siki
|
eb91c66e3f
|
框架内不显示导航
|
3 years ago |
wangxianzhang
|
c05700f1d9
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov-zhengwu-yantai
|
3 years ago |
|
dai_siki
|
eb469805cf
|
Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
dai_siki
|
fc42ff614c
|
加上版本号
|
3 years ago |
|
dai_siki
|
99ee9e6a7a
|
Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
dai_siki
|
208e9da22e
|
原始登录页面也改改
|
3 years ago |
|
dai_siki
|
6fc174d7bb
|
Merge branch 'dev-登录返回旧业面' into dev-烟台中转登录2
# Conflicts:
# src/views/pages/login.vue
|
3 years ago |
|
dai_siki
|
7cccd07683
|
登录跳转逻辑
|
3 years ago |
|
dai_siki
|
2998ca9997
|
Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
dai_siki
|
36487dd925
|
Merge branch 'dev-登录返回旧业面' into dev-烟台中转登录2
|
3 years ago |
|
dai_siki
|
04a83254d4
|
同步试试哈哈哈
|
3 years ago |
|
dai_siki
|
15c0066a2a
|
试试吧哈哈哈
|
3 years ago |
|
dai_siki
|
c62f46c453
|
Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
dai_siki
|
b9e9027264
|
Merge branch 'dev-登录返回旧业面' into dev-烟台中转登录2
|
3 years ago |
|
dai_siki
|
917b985a96
|
写死未传之level
|
3 years ago |
|
dai_siki
|
e8f46042d1
|
Merge branch 'dev-烟台中转登录2' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into master临时
|
3 years ago |
|
dai_siki
|
0fb4a4494b
|
Merge branch 'dev-登录返回旧业面' into dev-烟台中转登录2
|
3 years ago |
|
dai_siki
|
f93f638959
|
很奇怪
|
3 years ago |
|
dai_siki
|
ef7cc8772c
|
盲些一通 不知道好使不
|
3 years ago |
|
wangxianzhang
|
4a9f0b2bee
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov-zhengwu-yantai
|
3 years ago |
|
dai_siki
|
cc95fcb625
|
Merge branch 'dev-烟台中转登录' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov
|
3 years ago |
|
dai_siki
|
976bd621eb
|
大概意思
|
3 years ago |
