智慧农业后台管理页面
parent: 74aef7 | patch | commitdiff
shuishen
2022-07-29 d6a0abe9024f87fc517a2b71df0f17c5cadc41a0
refs
author shuishen <1109946754@qq.com>
Friday, July 29, 2022 16:02 +0800
committer shuishen <1109946754@qq.com>
Friday, July 29, 2022 16:02 +0800
commitd6a0abe9024f87fc517a2b71df0f17c5cadc41a0
tree c01a2fb85c2ea508d040cfa236a1da115ead4800 tree | zip | gz
parent 74aef77090f6f97cdd3a4daf2624b008175b1005 view | diff 
合并冲突
45 files modified
29163 ■■■■■ changed files
src/views/authority/apiscope.vue 1242 ●●●●● diff | view | raw | blame | history
src/views/authority/datascope.vue 1410 ●●●●● diff | view | raw | blame | history
src/views/authority/role.vue 726 ●●●●● diff | view | raw | blame | history
src/views/base/region.vue 836 ●●●●● diff | view | raw | blame | history
src/views/desk/notice.vue 556 ●●●●● diff | view | raw | blame | history
src/views/farm/farm.vue 853 ●●●●● diff | view | raw | blame | history
src/views/farm/farmInfoDetail.vue 523 ●●●●● diff | view | raw | blame | history
src/views/farm/farmPaper.vue 541 ●●●●● diff | view | raw | blame | history
src/views/farm/farmReport.vue 541 ●●●●● diff | view | raw | blame | history
src/views/farm/farmingrecord.vue 861 ●●●●● diff | view | raw | blame | history
src/views/farm/getMapDataInThere.vue 599 ●●●●● diff | view | raw | blame | history
src/views/farmplant/detection.vue 596 ●●●●● diff | view | raw | blame | history
src/views/farmplant/farmplant copy.vue 1265 ●●●●● diff | view | raw | blame | history
src/views/farmplant/farmplant.vue 1395 ●●●●● diff | view | raw | blame | history
src/views/farmplant/farmproductstock copy.vue 711 ●●●●● diff | view | raw | blame | history
src/views/farmplant/farmproductstock.vue 1978 ●●●●● diff | view | raw | blame | history
src/views/farmplant/inventorylist.vue 116 ●●●●● diff | view | raw | blame | history
src/views/farmplant/process.vue 1500 ●●●●● diff | view | raw | blame | history
src/views/farmplant/retrievallist.vue 118 ●●●●● diff | view | raw | blame | history
src/views/farmplant/salelist.vue 118 ●●●●● diff | view | raw | blame | history
src/views/farmplant/strain.vue 571 ●●●●● diff | view | raw | blame | history
src/views/flow/deploy.vue 286 ●●●●● diff | view | raw | blame | history
src/views/flow/follow.vue 363 ●●●●● diff | view | raw | blame | history
src/views/flow/manager.vue 642 ●●●●● diff | view | raw | blame | history
src/views/flow/model.vue 929 ●●●●● diff | view | raw | blame | history
src/views/land/cs.vue 2 ●●●●● diff | view | raw | blame | history
src/views/land/land.vue 687 ●●●●● diff | view | raw | blame | history
src/views/land/landAdd.vue 350 ●●●●● diff | view | raw | blame | history
src/views/land/landMap.vue 627 ●●●●● diff | view | raw | blame | history
src/views/machining/machining.vue 632 ●●●●● diff | view | raw | blame | history
src/views/mapPattern/index.vue 39 ●●●●● diff | view | raw | blame | history
src/views/monitor/log/api.vue 287 ●●●●● diff | view | raw | blame | history
src/views/monitor/log/error.vue 297 ●●●●● diff | view | raw | blame | history
src/views/monitor/log/usual.vue 297 ●●●●● diff | view | raw | blame | history
src/views/panorama/panorama.vue 551 ●●●●● diff | view | raw | blame | history
src/views/recovery/recovery.vue 867 ●●●●● diff | view | raw | blame | history
src/views/remote/remote.vue 693 ●●●●● diff | view | raw | blame | history
src/views/report/reportlist.vue 381 ●●●●● diff | view | raw | blame | history
src/views/resource/attach.vue 543 ●●●●● diff | view | raw | blame | history
src/views/resource/oss.vue 794 ●●●●● diff | view | raw | blame | history
src/views/resource/sms.vue 838 ●●●●● diff | view | raw | blame | history
src/views/sale/sale.vue 477 ●●●●● diff | view | raw | blame | history
src/views/soldr/soldr.vue 495 ●●●●● diff | view | raw | blame | history
src/views/soldrecord/soldrecord.vue 491 ●●●●● diff | view | raw | blame | history
src/views/statistics/farmplantarea.vue 539 ●●●●● diff | view | raw | blame | history