slaughter
|
e7dab94e3f
|
#修改了乔木、灌木、草本添加和修改页面
|
2020-05-21 11:14:14 +08:00 |
|
slaughter
|
49250d2f51
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-21 10:20:04 +08:00 |
|
slaughter
|
3bf3392a9f
|
#修改了乔木、灌木、草本添加和修改页面
|
2020-05-21 10:19:44 +08:00 |
 Bob
|
12b0da93cd
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-21 10:14:45 +08:00 |
|
slaughter
|
16a0b2e7df
|
#修改了乔木、灌木、草本添加和修改页面
|
2020-05-19 18:05:44 +08:00 |
|
slaughter
|
c917295d53
|
#修改了乔木、灌木、草本添加和修改页面，还有调查点修改和调查者修改页面
|
2020-05-18 18:26:06 +08:00 |
|
slaughter
|
1ea92d5774
|
#修改了SampletreesUpdateForm,SampletreesDisplayed1页面
|
2020-05-15 15:18:38 +08:00 |
|
slaughter
|
ea05c08ac7
|
#修改了SampletreesAdd,SamplebushAdd1,SampleherbalAdd1,SampletreesUpdateForm,SamplebushUpdateForm,SampleherbalUpdateForm页面
|
2020-05-13 16:05:49 +08:00 |
|
slaughter
|
fe5a9022a7
|
#修改了SampletreesAdd,SampletreesDisplayed1页面
|
2020-05-13 10:35:38 +08:00 |
|
slaughter
|
f24063d6d2
|
#修改了SampletreesAdd页面
|
2020-05-12 16:23:47 +08:00 |
|
slaughter
|
1ebc41928b
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-12 16:15:38 +08:00 |
|
Bob
|
c5eb081044
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-12 16:15:07 +08:00 |
|
slaughter
|
f268f30fac
|
#修改了SampletreesDisplayed1页面
|
2020-05-12 16:10:38 +08:00 |
|
Bob
|
f10c56f402
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-12 15:35:58 +08:00 |
|
slaughter
|
25dfafaf35
|
#修改了SampletreesAdd页面，添加了SampletreesDisplayed1页面
|
2020-05-12 15:35:27 +08:00 |
|
Bob
|
1c09068509
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-12 15:34:18 +08:00 |
|
Bob
|
f9308c9f9a
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-12 08:54:26 +08:00 |
|
Bob
|
70a67e512f
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-12 08:53:43 +08:00 |
|
slaughter
|
ed6195dafc
|
#修改了SampletreesUpdateForm,SamplebushUpdateForm,SampleherbalUpdateForm,Enclosure,UAVphotos,Scenephotos,SamplebushAdd1,SampleherbalAdd1页面
|
2020-05-11 17:31:22 +08:00 |
|
Bob
|
6eea6b45ff
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-09 15:12:16 +08:00 |
|
slaughter
|
9b26a1ca50
|
#修改了SampletreesUpdateForm页面
|
2020-05-09 15:10:41 +08:00 |
|
Bob
|
eb7829ad87
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-09 15:09:14 +08:00 |
|
slaughter
|
3a86179349
|
#修改了SampletreesAdd页面
|
2020-05-08 15:40:56 +08:00 |
|
Bob
|
05057a02c6
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-08 10:01:56 +08:00 |
|
Bob
|
5d12c22786
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-08 08:51:41 +08:00 |
|
Bob
|
82edb37b77
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-08 08:51:21 +08:00 |
|
slaughter
|
d8ab99c155
|
Merge remote-tracking branch 'origin/master'
|
2020-05-07 20:21:52 +08:00 |
|
slaughter
|
d73a70ff4c
|
#修改了SampletreesAdd页面
|
2020-05-07 20:21:37 +08:00 |
|
Bob
|
99d6c0a5fc
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-07 17:00:54 +08:00 |
|
Bob
|
99a821fa07
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-05-07 16:59:29 +08:00 |
|
Bob
|
098f72e382
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-07 16:59:15 +08:00 |
|
slaughter
|
9944e25e29
|
#修改了SampletreesAdd,SampletreesUpdateForm,SamplebushAdd1,SamplebushUpdateForm,SampleherbalAdd1.SampleherbalUpdateForm页面
|
2020-05-07 16:39:55 +08:00 |
|
slaughter
|
c43891d523
|
#修改了SampletreesAdd页面
|
2020-05-07 10:31:17 +08:00 |
|
Bob
|
a45f4a797d
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
# Conflicts:
# src/router/index.js
# src/views/data/SampletreesAdd.vue
|
2020-05-02 21:01:07 +08:00 |
|
Bob
|
f4471365ef
|
#功能开发
|
2020-05-01 20:51:45 +08:00 |
|
slaughter
|
f5692e0412
|
#修改了InvestigatorsAdd Fingdings 创建了Enclosure UAVphotos Scenephotos页面
|
2020-04-30 18:11:42 +08:00 |
|
slaughter
|
7ccc2aa621
|
#修改了SanpletreesAdd 创建了SamplebushAdd1 SampleherbalAdd1页面
|
2020-04-30 10:16:42 +08:00 |
|
slaughter
|
235ec71570
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-04-29 16:39:18 +08:00 |
|
slaughter
|
ffcd31d663
|
#修改了SanpletreesAdd页面
|
2020-04-29 16:39:02 +08:00 |
|
Bob
|
62292b5361
|
#功能开发
|
2020-04-29 16:38:36 +08:00 |
|
Bob
|
c1bed16397
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-04-29 16:37:39 +08:00 |
|
Bob
|
745bd142df
|
#功能开发
|
2020-04-29 16:37:25 +08:00 |
|
slaughter
|
9d155cbc69
|
#修改了SanpletreesAdd页面
|
2020-04-29 16:12:01 +08:00 |
|
slaughter
|
2d307cd9cf
|
#修改了SanpletreesAdd页面
|
2020-04-28 15:13:11 +08:00 |
|
slaughter
|
bccb04d94d
|
#修改了SanpletreesUpdateForm,samplebushupdateform,sampleherbalupdateform页面
|
2020-04-27 14:56:44 +08:00 |
|
Bob
|
734beab66f
|
#功能开发
|
2020-04-26 18:36:36 +08:00 |
|
Bob
|
11ef8e06cd
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-04-26 17:31:06 +08:00 |
|
Bob
|
93d6d8faab
|
#功能开发
|
2020-04-26 17:30:49 +08:00 |
|
slaughter
|
4857bd1b86
|
#修改了FindingsUpdate.vue BarcodesAdd.vue ImvestigatorsUpdate.vue,InvestugatorsAdd.vue
|
2020-04-26 17:03:26 +08:00 |
|
slaughter
|
c81ae0198b
|
Merge branch 'master' of http://210.77.77.77/xieshen/desertvegetationcommunitysurveyfrontend
|
2020-04-26 15:25:12 +08:00 |