jfpt-Vue.git - Gitblit

main / jfpt-Vue

南昌市物联网技防平台-前端

summary
reflog
commits
tree
docs
forks
compare

冲突解决

Administrator

2021-04-26 e434c72ecb3d99e2bd8b4113998940034b0000be

 src/views/flow/model.vue

@@ -193,7 +193,7 @@
        flowUrl: '',
        option: {
          height: 'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

			@@ -193,7 +193,7 @@
			flowUrl: '',
			option: {
			height: 'auto',
			calcHeight: 30,
			calcHeight: 54,
			tip: false,
			searchShow: true,
			searchMenuSpan: 6,