diff --git a/Dockerfile b/Dockerfile index 325ee79b..ce4728d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM node:10 as build-stage WORKDIR /workspace/ COPY ./client /workspace/client +RUN npm config set registry https://registry.npm.taobao.org +#RUN npm config get registry RUN npm install -g @vue/cli@3.3.0 RUN npm install -g @vue/cli-service@3.3.0 diff --git a/README.md b/README.md index 4c43c887..6662350a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +# Introduce + +This patch is specially provided by coco-annotator in Chinese Mainland + +- Both CSS and NPM addresses are domestic servers in China +- Fixed the front-end malignant bug +- Containing the core values of socialism with Chinese characteristics +

diff --git a/client/public/index.html b/client/public/index.html index ad1635ad..73c2680c 100755 --- a/client/public/index.html +++ b/client/public/index.html @@ -6,7 +6,9 @@ + + /> diff --git a/client/src/components/Pagination.vue b/client/src/components/Pagination.vue old mode 100755 new mode 100644 index c3f2f1e6..93ba7dc2 --- a/client/src/components/Pagination.vue +++ b/client/src/components/Pagination.vue @@ -51,18 +51,27 @@ export default { if (this.page < 1) { this.page = 1; } + //this.$emit('fun','previous'); }, nextPage() { this.page += 1; if (this.page > this.pages) { this.page = this.pages; } + //this.$emit('fun','next'); } }, watch: { page(newPage, oldPage) { if (newPage === oldPage) return; - + if(oldPage>newPage) + { + this.$emit('fun','previous','down',oldPage-newPage); + } + if(oldPage this.$emit("pagechange", this.page), 0); } diff --git a/client/src/components/PaginationCopy.vue b/client/src/components/PaginationCopy.vue new file mode 100644 index 00000000..d15ce3e5 --- /dev/null +++ b/client/src/components/PaginationCopy.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue old mode 100755 new mode 100644 index b9b8d887..73013026 --- a/client/src/views/Dataset.vue +++ b/client/src/views/Dataset.vue @@ -53,11 +53,11 @@ No images found in directory.

- +
- +
@@ -467,6 +467,7 @@ import Dataset from "@/models/datasets"; import Export from "@/models/exports"; import ImageCard from "@/components/cards/ImageCard"; import Pagination from "@/components/Pagination"; +import PaginationCopy from "@/components/PaginationCopy"; import PanelString from "@/components/PanelInputString"; import PanelToggle from "@/components/PanelToggle"; import PanelDropdown from "@/components/PanelInputDropdown" @@ -482,6 +483,7 @@ export default { components: { ImageCard, Pagination, + PaginationCopy, PanelString, PanelToggle, PanelDropdown, @@ -496,6 +498,7 @@ export default { }, data() { return { + pageSynchronous: 1 , pages: 1, generateLimit: 100, limit: 52, @@ -601,6 +604,32 @@ export default { this.axiosReqestError("Loading Dataset", error.response.data.message); }) .finally(() => this.removeProcess(process)); + }, + fun(data,name,pagenum){ + if(this.pageSynchronous===1){ + this.pageSynchronous=0; + if(name=='down'){ + for(var i=0;i { @@ -838,6 +867,7 @@ export default { this.updatePage(); }, mounted() { + this.updatePage(); window.addEventListener("mouseup", this.stopDrag); window.addEventListener("mousedown", this.startDrag); },