diff --git a/package.json b/package.json index 528795b..5073bd1 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "element-resize-detector": "^1.2.4", "element-ui": "^2.15.6", "exceljs": "^4.4.0", + "fabric": "2.5", "file-saver": "^1.3.8", "fuse.js": "3.4.4", "handsontable": "^14.1.0", diff --git a/src/api/area/index.js b/src/api/area/index.js new file mode 100644 index 0000000..bbf965c --- /dev/null +++ b/src/api/area/index.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/libraryRegion/editLibraryRegion', + method: 'post', + data + }) +} + +export function edit(data) { + return request({ + url: 'api/libraryRegion/editLibraryRegion', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/libraryRegion/delLibraryRegion', + method: 'post', + data: ids + }) +} + +export function sort(parameter) { + return request({ + url: 'api/libraryRegion/libraryRegionSort', + method: 'post', + data: parameter + }) +} + +export function saveLibraryRegionSignPoint(parameter) { + return request({ + url: 'api/libraryRegion/saveLibraryRegionSignPoint', + method: 'post', + data: parameter + }) +} + +export default { add, edit, del, sort, saveLibraryRegionSignPoint } diff --git a/src/api/floor/index.js b/src/api/floor/index.js index 94bbc9f..f15be3b 100644 --- a/src/api/floor/index.js +++ b/src/api/floor/index.js @@ -1,5 +1,12 @@ import request from '@/utils/request' +export function FetchLibraryFloorListAll() { + return request({ + url: 'api/libraryFloor/getLibraryFloorListAll', + method: 'get' + }) +} + export function add(data) { return request({ url: 'api/libraryFloor/editLibraryFloor', @@ -32,4 +39,4 @@ export function sort(parameter) { }) } -export default { add, edit, del, sort } +export default { add, edit, del, sort, FetchLibraryFloorListAll } diff --git a/src/assets/images/closed.png b/src/assets/images/closed.png new file mode 100644 index 0000000..3341f93 Binary files /dev/null and b/src/assets/images/closed.png differ diff --git a/src/views/components/mark.vue b/src/views/components/mark.vue new file mode 100644 index 0000000..8879b6e --- /dev/null +++ b/src/views/components/mark.vue @@ -0,0 +1,667 @@ + + + + + diff --git a/src/views/visualCheck/venueDevice/area/index.vue b/src/views/visualCheck/venueDevice/area/index.vue index 4177ad2..83fdf54 100644 --- a/src/views/visualCheck/venueDevice/area/index.vue +++ b/src/views/visualCheck/venueDevice/area/index.vue @@ -10,7 +10,7 @@ @@ -104,14 +96,14 @@ /> - - + + - - + + - - + + @@ -130,65 +122,48 @@ 提示:请通过拖动鼠标来调整当前顺序 - + + + + - + -
-
- -
-
-
    -
  • -

    所属机构

    - 机构A -
  • -
  • -

    所属楼层

    - 五楼 -
  • -
  • -

    书架

    - 4 -
  • -
  • {{ true ? '已标注': '未标注' }}
  • -
-
- 清空 - 标注 - 保存 -
-
+
+