智慧农业大数据平台
parent: 7210f4 | patch | commitdiff
shuishen
2022-07-29 5f6614b4f448890f0b6e82376093ee2878f4464d
refs
author shuishen <1109946754@qq.com>
Friday, July 29, 2022 15:21 +0800
committer shuishen <1109946754@qq.com>
Friday, July 29, 2022 15:21 +0800
commit5f6614b4f448890f0b6e82376093ee2878f4464d
tree f9c003b17300ddf4a368f0cc6398297d52c70204 tree | zip | gz
parent 7210f462c6e4cf0c26ae43c4949f34fbf6b07372 view | diff
f9812ca20f1a34809057fdcd8564f7c495fc9693 view | diff 
合并冲突
21 files modified
2 files added
31748 ■■■■■ changed files
package-lock.json 27749 ●●●●● diff | view | raw | blame | history
src/api/farm/farmingrecord.js 15 ●●●●● diff | view | raw | blame | history
src/api/mobile/buildsClock/buildsClock.js 12 ●●●●● diff | view | raw | blame | history
src/api/mobile/hd/hd.js 18 ●●●●● diff | view | raw | blame | history
src/api/mobile/ip/index.js 2 ●●●●● diff | view | raw | blame | history
src/api/mobile/livingFacilities/index.js 8 ●●●●● diff | view | raw | blame | history
src/api/mobile/orgnav/index.js 2 ●●●●● diff | view | raw | blame | history
src/api/mobile/outIn/index.js 2 ●●●●● diff | view | raw | blame | history
src/api/mobile/search/index.js 3 ●●●●● diff | view | raw | blame | history
src/api/mobile/stop/index.js 5 ●●●●● diff | view | raw | blame | history
src/assets/libs/dc.core.min.js 2 ●●●●● diff | view | raw | blame | history
src/components/date-select/index.vue 24 ●●●●● diff | view | raw | blame | history
src/components/echart-map/index.vue 6 ●●●●● diff | view | raw | blame | history
src/position/position.js 14 ●●●●● diff | view | raw | blame | history
src/styles/element-ui.css 67 ●●●●● diff | view | raw | blame | history
src/styles/element-ui.min.css 1 ●●●●● diff | view | raw | blame | history
src/styles/element-ui.scss 18 ●●●●● diff | view | raw | blame | history
src/styles/publicBox/farm-oper-table.scss 4 ●●●●● diff | view | raw | blame | history
src/utils/CustomloadingImg.js 2 ●●●●● diff | view | raw | blame | history
src/utils/defaultValue copy.js 10 ●●●●● diff | view | raw | blame | history
src/utils/defaultValue.js 10 ●●●●● diff | view | raw | blame | history
src/views/home/index.vue 57 ●●●●● diff | view | raw | blame | history
src/views/manage/index.vue 3717 ●●●●● diff | view | raw | blame | history