diff --git a/package-lock.json b/package-lock.json
index 5c741682c..7b1d0134d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3619,23 +3619,6 @@
"upath": "^1.1.1"
}
},
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4581,94 +4564,6 @@
}
}
},
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.2.0",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
- "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "big.js": {
- "version": "5.2.2",
- "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
- "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
- "dev": true,
- "optional": true
- },
- "chalk": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
- "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "emojis-list": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
- "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
- "json5": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
- "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
- "dev": true,
- "optional": true,
- "requires": {
- "minimist": "^1.2.5"
- }
- },
- "loader-utils": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
- "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- }
- }
- },
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -6618,12 +6513,12 @@
"dev": true
},
"copy-anything": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz",
- "integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npm.taobao.org/copy-anything/download/copy-anything-2.0.3.tgz",
+ "integrity": "sha1-hCQHugJGaw34RIGbvjuuu+XUXYc=",
"dev": true,
"requires": {
- "is-what": "^3.7.1"
+ "is-what": "^3.12.0"
}
},
"copy-concurrently": {
@@ -9313,7 +9208,7 @@
},
"image-size": {
"version": "0.5.5",
- "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+ "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz",
"integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"dev": true,
"optional": true
@@ -9691,9 +9586,9 @@
"dev": true
},
"is-what": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz",
- "integrity": "sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==",
+ "version": "3.14.1",
+ "resolved": "https://registry.npm.taobao.org/is-what/download/is-what-3.14.1.tgz?cache=0&sync_timestamp=1615169735707&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-what%2Fdownload%2Fis-what-3.14.1.tgz",
+ "integrity": "sha1-4SIvRt3ahd6tD9HJ3xMXYOd3VcE=",
"dev": true
},
"is-windows": {
@@ -9889,8 +9784,8 @@
},
"less": {
"version": "3.13.1",
- "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz",
- "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==",
+ "resolved": "https://registry.npm.taobao.org/less/download/less-3.13.1.tgz",
+ "integrity": "sha1-DryR0qDpwMZzW4PUlrCrBYMHeQk=",
"dev": true,
"requires": {
"copy-anything": "^2.0.1",
@@ -9904,42 +9799,24 @@
"tslib": "^1.10.0"
},
"dependencies": {
- "make-dir": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
- "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
- "dev": true,
- "optional": true,
- "requires": {
- "pify": "^4.0.1",
- "semver": "^5.6.0"
- }
- },
"mime": {
"version": "1.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
- "dev": true,
- "optional": true
- },
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
- "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+ "resolved": "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz",
+ "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=",
"dev": true,
"optional": true
},
"source-map": {
"version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
+ "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
"dev": true,
"optional": true
},
"tslib": {
"version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+ "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1617647281845&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz",
+ "integrity": "sha1-zy04vcNKE0vK8QkcQfZhni9nLQA=",
"dev": true
}
}
@@ -10083,6 +9960,26 @@
"yallist": "^3.0.2"
}
},
+ "make-dir": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz",
+ "integrity": "sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "pify": "^4.0.1",
+ "semver": "^5.6.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
+ "integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
"map-cache": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -10508,8 +10405,8 @@
},
"native-request": {
"version": "1.0.8",
- "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz",
- "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==",
+ "resolved": "https://registry.nlark.com/native-request/download/native-request-1.0.8.tgz",
+ "integrity": "sha1-j2a/YG4PfqJ8DlmV6y9dA+M65vs=",
"dev": true,
"optional": true
},
@@ -13620,6 +13517,94 @@
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz",
"integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q=="
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.2.0",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
+ "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+ "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "hash-sum": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+ "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-router": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz",
diff --git a/package.json b/package.json
index 8ba50aa50..bdd1937f8 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
"@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0",
- "less": "^3.0.4",
+ "less": "^3.13.1",
"less-loader": "^5.0.0",
"vue-template-compiler": "^2.6.11",
"webpack": "^4.27.1"
diff --git a/public/static/pdf/web/viewer.css b/public/static/pdf/web/viewer.css
index 97b55cdc5..accde2053 100644
--- a/public/static/pdf/web/viewer.css
+++ b/public/static/pdf/web/viewer.css
@@ -522,19 +522,19 @@ html[dir='rtl'] #viewerContainer {
height: 32px;
background-color: #424242; /* fallback */
background-image: url(images/texture.png),
- linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+ linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
}
html[dir='ltr'] #toolbarSidebar {
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25),
- inset 0 -1px 0 hsla(0,0%,100%,.05),
- 0 1px 0 hsla(0,0%,0%,.15),
- 0 0 1px hsla(0,0%,0%,.1);
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 0 1px hsla(0,0%,0%,.1);
}
html[dir='rtl'] #toolbarSidebar {
box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.25),
- inset 0 1px 0 hsla(0,0%,100%,.05),
- 0 1px 0 hsla(0,0%,0%,.15),
- 0 0 1px hsla(0,0%,0%,.1);
+ inset 0 1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 0 1px hsla(0,0%,0%,.1);
}
#toolbarContainer, .findbar, .secondaryToolbar {
@@ -542,21 +542,21 @@ html[dir='rtl'] #toolbarSidebar {
height: 32px;
background-color: #474747; /* fallback */
background-image: url(images/texture.png),
- linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+ linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
}
html[dir='ltr'] #toolbarContainer, .findbar, .secondaryToolbar {
box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
- inset 0 1px 1px hsla(0,0%,0%,.15),
- inset 0 -1px 0 hsla(0,0%,100%,.05),
- 0 1px 0 hsla(0,0%,0%,.15),
- 0 1px 1px hsla(0,0%,0%,.1);
+ inset 0 1px 1px hsla(0,0%,0%,.15),
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 1px 1px hsla(0,0%,0%,.1);
}
html[dir='rtl'] #toolbarContainer, .findbar, .secondaryToolbar {
box-shadow: inset -1px 0 0 hsla(0,0%,100%,.08),
- inset 0 1px 1px hsla(0,0%,0%,.15),
- inset 0 -1px 0 hsla(0,0%,100%,.05),
- 0 1px 0 hsla(0,0%,0%,.15),
- 0 1px 1px hsla(0,0%,0%,.1);
+ inset 0 1px 1px hsla(0,0%,0%,.15),
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 1px 1px hsla(0,0%,0%,.1);
}
#toolbarViewer {
@@ -607,9 +607,9 @@ html[dir='rtl'] #toolbarContainer, .findbar, .secondaryToolbar {
width: calc(100% + 150px);
background: repeating-linear-gradient(135deg,
- #bbb 0, #999 5px,
- #999 45px, #ddd 55px,
- #ddd 95px, #bbb 100px);
+ #bbb 0, #999 5px,
+ #999 45px, #ddd 55px,
+ #ddd 95px, #bbb 100px);
-webkit-animation: progressIndeterminate 950ms linear infinite;
animation: progressIndeterminate 950ms linear infinite;
@@ -850,8 +850,8 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton {
border: 1px solid hsla(0,0%,0%,.35);
border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
- 0 0 1px hsla(0,0%,100%,.15) inset,
- 0 1px 0 hsla(0,0%,100%,.05);
+ 0 0 1px hsla(0,0%,100%,.15) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
-webkit-transition-property: background-color, border-color, box-shadow;
-webkit-transition-duration: 150ms;
-webkit-transition-timing-function: ease;
@@ -869,8 +869,8 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton {
.toolbarButton.textButton:focus {
background-color: hsla(0,0%,0%,.2);
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
- 0 0 1px hsla(0,0%,100%,.15) inset,
- 0 0 1px hsla(0,0%,0%,.05);
+ 0 0 1px hsla(0,0%,100%,.15) inset,
+ 0 0 1px hsla(0,0%,0%,.05);
z-index: 199;
}
.splitToolbarButton > .toolbarButton {
@@ -969,8 +969,8 @@ html[dir='rtl'] .dropdownToolbarButton {
border: 1px solid hsla(0,0%,0%,.35);
border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
- 0 0 1px hsla(0,0%,100%,.15) inset,
- 0 1px 0 hsla(0,0%,100%,.05);
+ 0 0 1px hsla(0,0%,100%,.15) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
}
.toolbarButton:hover:active,
@@ -981,8 +981,8 @@ html[dir='rtl'] .dropdownToolbarButton {
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45);
box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
- 0 0 1px hsla(0,0%,0%,.2) inset,
- 0 1px 0 hsla(0,0%,100%,.05);
+ 0 0 1px hsla(0,0%,0%,.2) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
-webkit-transition-property: background-color, border-color, box-shadow;
-webkit-transition-duration: 10ms;
-webkit-transition-timing-function: linear;
@@ -998,8 +998,8 @@ html[dir='rtl'] .dropdownToolbarButton {
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5);
box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
- 0 0 1px hsla(0,0%,0%,.2) inset,
- 0 1px 0 hsla(0,0%,100%,.05);
+ 0 0 1px hsla(0,0%,0%,.2) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
-webkit-transition-property: background-color, border-color, box-shadow;
-webkit-transition-duration: 10ms;
-webkit-transition-timing-function: linear;
@@ -1014,8 +1014,8 @@ html[dir='rtl'] .dropdownToolbarButton {
background-color: hsla(0,0%,0%,.4);
border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.5) hsla(0,0%,0%,.55);
box-shadow: 0 1px 1px hsla(0,0%,0%,.2) inset,
- 0 0 1px hsla(0,0%,0%,.3) inset,
- 0 1px 0 hsla(0,0%,100%,.05);
+ 0 0 1px hsla(0,0%,0%,.3) inset,
+ 0 1px 0 hsla(0,0%,100%,.05);
}
.dropdownToolbarButton {
@@ -1329,7 +1329,7 @@ html[dir='rtl'] .verticalToolbarSeparator {
border: 1px solid hsla(0,0%,0%,.35);
border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset,
- 0 1px 0 hsla(0,0%,100%,.05);
+ 0 1px 0 hsla(0,0%,100%,.05);
color: hsl(0,0%,95%);
font-size: 12px;
line-height: 14px;
@@ -1359,8 +1359,8 @@ html[dir='rtl'] .verticalToolbarSeparator {
.toolbarField.pageNumber::-webkit-inner-spin-button,
.toolbarField.pageNumber::-webkit-outer-spin-button {
- -webkit-appearance: none;
- margin: 0;
+ -webkit-appearance: none;
+ margin: 0;
}
.toolbarField:hover {
@@ -1441,8 +1441,8 @@ a:focus > .thumbnail > .thumbnailSelectionRing,
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
background-clip: padding-box;
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
- 0 0 1px hsla(0,0%,100%,.2) inset,
- 0 0 1px hsla(0,0%,0%,.2);
+ 0 0 1px hsla(0,0%,100%,.2) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
color: hsla(0,0%,100%,.9);
}
@@ -1456,8 +1456,8 @@ a:focus > .thumbnail > .thumbnailSelectionRing,
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
background-clip: padding-box;
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
- 0 0 1px hsla(0,0%,100%,.1) inset,
- 0 0 1px hsla(0,0%,0%,.2);
+ 0 0 1px hsla(0,0%,100%,.1) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
color: hsla(0,0%,100%,1);
}
@@ -1572,8 +1572,8 @@ html[dir='rtl'] .outlineItemToggler::before {
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
background-clip: padding-box;
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
- 0 0 1px hsla(0,0%,100%,.2) inset,
- 0 0 1px hsla(0,0%,0%,.2);
+ 0 0 1px hsla(0,0%,100%,.2) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
border-radius: 2px;
color: hsla(0,0%,100%,.9);
}
@@ -1583,8 +1583,8 @@ html[dir='rtl'] .outlineItemToggler::before {
background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
background-clip: padding-box;
box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
- 0 0 1px hsla(0,0%,100%,.1) inset,
- 0 0 1px hsla(0,0%,0%,.2);
+ 0 0 1px hsla(0,0%,100%,.1) inset,
+ 0 0 1px hsla(0,0%,0%,.2);
color: hsla(0,0%,100%,1);
}
@@ -1665,12 +1665,12 @@ html[dir='rtl'] .outlineItemToggler::before {
line-height: 14px;
background-color: #474747; /* fallback */
background-image: url(images/texture.png),
- linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+ linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
- inset 0 1px 1px hsla(0,0%,0%,.15),
- inset 0 -1px 0 hsla(0,0%,100%,.05),
- 0 1px 0 hsla(0,0%,0%,.15),
- 0 1px 1px hsla(0,0%,0%,.1);
+ inset 0 1px 1px hsla(0,0%,0%,.15),
+ inset 0 -1px 0 hsla(0,0%,100%,.05),
+ 0 1px 0 hsla(0,0%,0%,.15),
+ 0 1px 1px hsla(0,0%,0%,.1);
border: 1px solid hsla(0,0%,0%,.5);
border-radius: 4px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
@@ -1763,9 +1763,9 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
width: 300px;
}
#PDFBug .controls {
- background:#EEEEEE;
- border-bottom: 1px solid #666666;
- padding: 3px;
+ background:#EEEEEE;
+ border-bottom: 1px solid #666666;
+ padding: 3px;
}
#PDFBug .panels {
bottom: 0;
@@ -1792,7 +1792,7 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
white-space: pre;
}
#PDFBug .stats .title {
- font-weight: bold;
+ font-weight: bold;
}
#PDFBug table {
font-size: 10px;
@@ -1831,8 +1831,8 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
.grab-to-pan-grab {
cursor: url("images/grab.cur"), move !important;
- cursor: -webkit-grab !important;
- cursor: -moz-grab !important;
+ /*cursor: -webkit-grab !important;*/
+ /*cursor: -moz-grab !important;*/
cursor: grab !important;
}
.grab-to-pan-grab *:not(input):not(textarea):not(button):not(select):not(:link) {
@@ -1841,8 +1841,8 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
.grab-to-pan-grab:active,
.grab-to-pan-grabbing {
cursor: url("images/grabbing.cur"), move !important;
- cursor: -webkit-grabbing !important;
- cursor: -moz-grabbing !important;
+ /*cursor: -webkit-grabbing !important;*/
+ /*cursor: -moz-grabbing !important;*/
cursor: grabbing !important;
position: fixed;
diff --git a/public/static/pdf/web/viewer.html b/public/static/pdf/web/viewer.html
index 9f174fb4f..320221196 100644
--- a/public/static/pdf/web/viewer.html
+++ b/public/static/pdf/web/viewer.html
@@ -61,7 +61,7 @@ See https://github.com/adobe-type-tools/cmap-resources
/* left: 50%;*/
/* transform: translate(-50%, -50%);*/
/* border: 1px solid #e5e5e5;*/
- /* border-radius: 8px;*/
+ /* 8px;*/
/* background: #e5e5e5;*/
/* z-index: 999;*/
/*}*/
@@ -83,7 +83,7 @@ See https://github.com/adobe-type-tools/cmap-resources
/* background-color: #3391CE;*/
/* border: #3391CE;*/
/* color: #ffffff;*/
- /* border-radius: 3px;*/
+ /* 3px;*/
/* cursor: pointer;*/
/*}*/
/*.note-float{*/
@@ -136,7 +136,7 @@ See https://github.com/adobe-type-tools/cmap-resources
/* left: 50%;*/
/* transform: translate(-50%, -50%);*/
/* border: 1px solid #e5e5e5;*/
- /* border-radius: 8px;*/
+ /* 8px;*/
/* background: #e5e5e5;*/
/* z-index: 999;*/
/*}*/
diff --git a/public/static/ueditor/ADT/attachment/attachment.css b/public/static/ueditor/ADT/attachment/attachment.css
index 548b4284d..e1ff867cc 100644
--- a/public/static/ueditor/ADT/attachment/attachment.css
+++ b/public/static/ueditor/ADT/attachment/attachment.css
@@ -96,7 +96,7 @@
#upload .placeholder .webuploader-pick {
font-size: 18px;
background: #00b7ee;
- border-radius: 3px;
+ 3px;
line-height: 44px;
padding: 0 30px;
*width: 120px;
@@ -198,7 +198,7 @@
overflow: hidden;
z-index: 50;
margin: 0;
- border-radius: 0;
+ 0;
background: none;
-webkit-box-shadow: 0 0 0;
}
@@ -317,7 +317,7 @@
height: 113px;
background: url(./images/image.png) no-repeat center 12px;
border: 1px solid #eeeeee;
- border-radius: 0;
+ 0;
}
#upload .filelist li.filePickerBlock div.webuploader-pick {
width: 100%;
@@ -447,7 +447,7 @@
color: #565656;
padding: 0 18px;
display: inline-block;
- border-radius: 3px;
+ 3px;
margin-left: 10px;
cursor: pointer;
font-size: 14px;
@@ -678,4 +678,4 @@ i.file-preview.file-type-bmp,
i.file-preview.file-type-png,
i.file-preview.file-type-psd{
background-position: -140px center;
-}
\ No newline at end of file
+}
diff --git a/public/static/ueditor/ADT/background/background.css b/public/static/ueditor/ADT/background/background.css
index 5c41fe9a4..882701c1f 100644
--- a/public/static/ueditor/ADT/background/background.css
+++ b/public/static/ueditor/ADT/background/background.css
@@ -19,7 +19,7 @@ input,label{vertical-align:middle}
.wrapcolor{height: 19px;}
div.color{float: left;margin: 0;}
-#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;border-radius: 3px;box-shadow: 2px 2px 5px #D3D6DA;margin: 0;float: left;}
+#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;3px;box-shadow: 2px 2px 5px #D3D6DA;margin: 0;float: left;}
div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;}
#custom input{height: 15px;min-height: 15px;width:20px;}
#repeatType{width:100px;}
@@ -91,4 +91,4 @@ div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;}
height: 107px;
border: 3px solid #1094fa;
background-position: 72px 72px;
-}
\ No newline at end of file
+}
diff --git a/public/static/ueditor/ADT/charts/charts.css b/public/static/ueditor/ADT/charts/charts.css
index ac3c76458..45adc7caa 100644
--- a/public/static/ueditor/ADT/charts/charts.css
+++ b/public/static/ueditor/ADT/charts/charts.css
@@ -144,9 +144,9 @@ html, body {
margin-right: 30px;
text-decoration: none;
color: black;
- -webkit-border-radius: 2px;
- -moz-border-radius: 2px;
- border-radius: 2px;
+ -webkit-2px;
+ -moz-2px;
+ 2px;
}
.button-container a:HOVER {
@@ -162,4 +162,4 @@ html, body {
height: 100px;
line-height: 100px;
text-align: center;
-}
\ No newline at end of file
+}
diff --git a/public/static/ueditor/ADT/image/image.css b/public/static/ueditor/ADT/image/image.css
index 52c2295ef..b3cbdb5b2 100644
--- a/public/static/ueditor/ADT/image/image.css
+++ b/public/static/ueditor/ADT/image/image.css
@@ -143,7 +143,7 @@
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
- border-radius: 4px;
+ 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
@@ -251,7 +251,7 @@
#upload .placeholder .webuploader-pick {
font-size: 18px;
background: #00b7ee;
- border-radius: 3px;
+ 3px;
line-height: 44px;
padding: 0 30px;
*width: 120px;
@@ -354,7 +354,7 @@
overflow: hidden;
z-index: 50;
margin: 0;
- border-radius: 0;
+ 0;
background: none;
-webkit-box-shadow: 0 0 0;
}
@@ -464,7 +464,7 @@
height: 113px;
background: url(./images/image.png) no-repeat center 12px;
border: 1px solid #eeeeee;
- border-radius: 0;
+ 0;
}
#upload .filelist li.filePickerBlock div.webuploader-pick {
width: 100%;
@@ -594,7 +594,7 @@
color: #565656;
padding: 0 18px;
display: inline-block;
- border-radius: 3px;
+ 3px;
margin-left: 10px;
cursor: pointer;
font-size: 14px;
@@ -723,7 +723,7 @@
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
- border-radius: 4px;
+ 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
@@ -753,7 +753,7 @@
padding:0;
line-height: 28px;
border: 1px solid #d7d7d7;
- border-radius: 0;
+ 0;
vertical-align: top;
margin-left: 5px;
float: left;
@@ -774,7 +774,7 @@
border: 1px solid transparent;
white-space: nowrap;
font-size: 14px;
- border-radius: 4px;
+ 4px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@@ -891,4 +891,4 @@
}
#search .searchList .clearFloat{
clear: both;
-}
\ No newline at end of file
+}
diff --git a/public/static/ueditor/ADT/music/music.css b/public/static/ueditor/ADT/music/music.css
index 8fb7a94c3..77e417241 100644
--- a/public/static/ueditor/ADT/music/music.css
+++ b/public/static/ueditor/ADT/music/music.css
@@ -3,7 +3,7 @@
.searchBar{height:30px;padding:7px 0 3px;text-align:center;}
.searchBtn{font-size:13px;height:24px;}
-.resultBar{width:460px;margin:5px auto;border: 1px solid #CCC;border-radius: 5px;box-shadow: 2px 2px 5px #D3D6DA;overflow: hidden;}
+.resultBar{width:460px;margin:5px auto;border: 1px solid #CCC;5px;box-shadow: 2px 2px 5px #D3D6DA;overflow: hidden;}
.listPanel{overflow: hidden;}
.panelon{display:block;}
@@ -27,4 +27,4 @@
.m-trying{float:left;width:20px;height:20px;background:url('http://static.tieba.baidu.com/tb/editor/images/stop_music.gif') no-repeat ;}
.loading{width:95px;height:7px;font-size:7px;margin:60px auto;background:url(http://static.tieba.baidu.com/tb/editor/images/loading.gif) no-repeat}
-.empty{width:300px;height:40px;padding:2px;margin:50px auto;line-height:40px; color:#006699;text-align:center;}
\ No newline at end of file
+.empty{width:300px;height:40px;padding:2px;margin:50px auto;line-height:40px; color:#006699;text-align:center;}
diff --git a/public/static/ueditor/ADT/scrawl/scrawl.css b/public/static/ueditor/ADT/scrawl/scrawl.css
index b18430dc5..2cf5b4271 100644
--- a/public/static/ueditor/ADT/scrawl/scrawl.css
+++ b/public/static/ueditor/ADT/scrawl/scrawl.css
@@ -5,7 +5,7 @@ table{width:100%;}
table td{padding:2px 4px;vertical-align: middle;}
a{text-decoration: none;}
em{font-style: normal;}
-.border_style1{border: 1px solid #ccc;border-radius: 5px;box-shadow:2px 2px 5px #d3d6da;}
+.border_style1{border: 1px solid #ccc;5px;box-shadow:2px 2px 5px #d3d6da;}
/*module
*/
.main{margin: 8px;overflow: hidden;}
@@ -19,7 +19,7 @@ em{font-style: normal;}
.drawToolbar{float:right;width:110px;height:300px;overflow: hidden;}
.colorBar{margin-top:10px;font-size: 12px;text-align: center;}
-.colorBar a{display:block;width: 10px;height: 10px;border:1px solid #1006F1;border-radius: 3px; box-shadow:2px 2px 5px #d3d6da;opacity: 0.3}
+.colorBar a{display:block;width: 10px;height: 10px;border:1px solid #1006F1;3px; box-shadow:2px 2px 5px #d3d6da;opacity: 0.3}
.sectionBar{margin-top:15px;font-size: 12px;text-align: center;}
.sectionBar a{display:inline-block;width:10px;height:12px;color: #888;text-indent: -999px;opacity: 0.3}
.size1{background: url('images/size.png') 1px center no-repeat ;}
diff --git a/public/static/ueditor/ADT/template/template.css b/public/static/ueditor/ADT/template/template.css
index 6c1608dfc..dbbab2d9b 100644
--- a/public/static/ueditor/ADT/template/template.css
+++ b/public/static/ueditor/ADT/template/template.css
@@ -10,9 +10,9 @@
.bottom{height:320px;width:100%;margin: 0 auto;}
.transparent{ background: url("images/bg.gif") repeat;}
.bottom table tr td{border:1px dashed #ccc;}
-#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;border-radius: 3px;box-shadow: 2px 2px 5px #D3D6DA;}
-.border_style1{padding:2px;border: 1px solid #ccc;border-radius: 5px;box-shadow:2px 2px 5px #d3d6da;}
+#colorPicker{width: 17px;height: 17px;border: 1px solid #CCC;display: inline-block;3px;box-shadow: 2px 2px 5px #D3D6DA;}
+.border_style1{padding:2px;border: 1px solid #ccc;5px;box-shadow:2px 2px 5px #d3d6da;}
p{margin: 5px 0}
table{clear:both;margin-bottom:10px;border-collapse:collapse;word-break:break-all;}
li{clear:both}
-ol{padding-left:40px; }
\ No newline at end of file
+ol{padding-left:40px; }
diff --git a/public/static/ueditor/ADT/video/video.css b/public/static/ueditor/ADT/video/video.css
index 5870e7a15..4f797744e 100644
--- a/public/static/ueditor/ADT/video/video.css
+++ b/public/static/ueditor/ADT/video/video.css
@@ -148,7 +148,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
#upload .placeholder .webuploader-pick {
font-size: 18px;
background: #00b7ee;
- border-radius: 3px;
+ 3px;
line-height: 44px;
padding: 0 30px;
*width: 120px;
@@ -250,7 +250,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
overflow: hidden;
z-index: 50;
margin: 0;
- border-radius: 0;
+ 0;
background: none;
-webkit-box-shadow: 0 0 0;
}
@@ -369,7 +369,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
height: 113px;
background: url(./images/image.png) no-repeat center 12px;
border: 1px solid #eeeeee;
- border-radius: 0;
+ 0;
}
#upload .filelist li.filePickerBlock div.webuploader-pick {
width: 100%;
@@ -499,7 +499,7 @@ span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color:
color: #565656;
padding: 0 18px;
display: inline-block;
- border-radius: 3px;
+ 3px;
margin-left: 10px;
cursor: pointer;
font-size: 14px;
@@ -632,4 +632,4 @@ i.file-preview.file-type-bmp,
i.file-preview.file-type-png,
i.file-preview.file-type-psd{
background-position: -140px center;
-}
\ No newline at end of file
+}
diff --git a/public/static/ueditor/themes/default/css/ueditor.css b/public/static/ueditor/themes/default/css/ueditor.css
index 64400d35c..a1c60d209 100644
--- a/public/static/ueditor/themes/default/css/ueditor.css
+++ b/public/static/ueditor/themes/default/css/ueditor.css
@@ -137,9 +137,6 @@ div.edui-box {
background-color: white;
position: relative;
overflow: visible;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
}
.edui-editor div{
width:auto;
@@ -165,9 +162,6 @@ div.edui-box {
background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
background-repeat: repeat-x;
/*border: 1px solid #d4d4d4;*/
- -webkit-border-radius: 4px 4px 0 0;
- -moz-border-radius: 4px 4px 0 0;
- border-radius: 4px 4px 0 0;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
*zoom: 1;
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
@@ -431,7 +425,7 @@ div.edui-box {
.edui-default .edui-toolbar .edui-combox-body .edui-arrow {
background: url(../images/icons.png) -741px 0;
- _background: url(../images/icons.gif) -741px 0;
+ /*_background: url(../images/icons.gif) -741px 0;*/
height: 20px;
width: 9px;
}
@@ -439,9 +433,6 @@ div.edui-box {
.edui-default .edui-toolbar .edui-combox .edui-combox-body {
border: 1px solid #CCC;
background-color: white;
- border-radius: 2px;
- -webkit-border-radius: 2px;
- -moz-border-radius: 2px;
}
.edui-default .edui-toolbar .edui-combox-body .edui-splitborder {
@@ -505,9 +496,6 @@ div.edui-box {
background-color: #ffe69f;
padding: 0;
border: 1px solid #dcac6c;
- border-radius: 2px;
- -webkit-border-radius: 2px;
- -moz-border-radius: 2px;
}
.edui-default .edui-toolbar .edui-button .edui-state-active .edui-button-wrap {
@@ -946,7 +934,7 @@ div.edui-box {
.edui-default .edui-toolbar .edui-splitbutton-body .edui-arrow,
.edui-default .edui-toolbar .edui-menubutton-body .edui-arrow {
background: url(../images/icons.png) -741px 0;
- _background: url(../images/icons.gif) -741px 0;
+ /*_background: url(../images/icons.gif) -741px 0;*/
height: 20px;
width: 9px;
}
@@ -1048,9 +1036,6 @@ div.edui-box {
border: 1px solid rgba(0, 0, 0, 0.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-webkit-box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2);
box-shadow: 0 3px 4px rgba(0, 0, 0, 0.2);
@@ -1120,7 +1105,6 @@ div.edui-box {
position: relative;
}
.edui-default .edui-message-body{
- border-radius: 3px;
padding: 8px 15px 8px 8px;
color: #c09853;
background-color: #fcf8e3;
@@ -1209,9 +1193,6 @@ div.edui-box {
border: 1px solid rgba(0, 0, 0, 0.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -1826,7 +1807,6 @@ div.edui-box {
height: 50px;
background-color: #fff;
border: 1px solid #ccc;
- border-radius: 5px;
}
/*粘贴弹出菜单*/
diff --git a/public/static/ueditor/third-party/codemirror/codemirror.css b/public/static/ueditor/third-party/codemirror/codemirror.css
index 461ae195a..1f5d4303a 100644
--- a/public/static/ueditor/third-party/codemirror/codemirror.css
+++ b/public/static/ueditor/third-party/codemirror/codemirror.css
@@ -30,10 +30,10 @@
}
.CodeMirror pre {
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- -o-border-radius: 0;
- border-radius: 0;
+ -moz-0;
+ -webkit-0;
+ -o-0;
+ 0;
border-width: 0; margin: 0; padding: 0; background: transparent;
font-family: inherit;
font-size: inherit;
diff --git a/public/static/ueditor/third-party/video-js/video-js.css b/public/static/ueditor/third-party/video-js/video-js.css
index 2e8c332c4..57843d49b 100644
--- a/public/static/ueditor/third-party/video-js/video-js.css
+++ b/public/static/ueditor/third-party/video-js/video-js.css
@@ -380,9 +380,9 @@ easily in the skin designer. http://designer.videojs.com/
background-color: rgba(7, 20, 30, 0.7);
border: 0.1em solid #3b4249;
/* border-radius */
- -webkit-border-radius: 0.8em;
- -moz-border-radius: 0.8em;
- border-radius: 0.8em;
+ -webkit-0.8em;
+ -moz-0.8em;
+ 0.8em;
/* box-shadow */
-webkit-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
-moz-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
diff --git a/public/static/ueditor/third-party/webuploader/webuploader.css b/public/static/ueditor/third-party/webuploader/webuploader.css
index 12f451f80..e2e4f92af 100644
--- a/public/static/ueditor/third-party/webuploader/webuploader.css
+++ b/public/static/ueditor/third-party/webuploader/webuploader.css
@@ -14,7 +14,7 @@
padding: 10px 15px;
color: #fff;
text-align: center;
- border-radius: 3px;
+ 3px;
overflow: hidden;
}
.webuploader-pick-hover {
diff --git a/src/api/index.js b/src/api/index.js
index 2548daf6f..b55273416 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -36,4 +36,4 @@ export function getRoleAndUserByOrgIdPage (params) {
method: 'get',
params
})
-}
\ No newline at end of file
+}
diff --git a/src/assets/images/shangqi/home/BG.png b/src/assets/images/shangqi/home/BG.png
new file mode 100644
index 000000000..bcdbfd0dc
Binary files /dev/null and b/src/assets/images/shangqi/home/BG.png differ
diff --git a/src/assets/images/shangqi/home/logo2.png b/src/assets/images/shangqi/home/logo2.png
new file mode 100644
index 000000000..d6819be30
Binary files /dev/null and b/src/assets/images/shangqi/home/logo2.png differ
diff --git a/src/assets/images/shangqi/home/logo3.png b/src/assets/images/shangqi/home/logo3.png
new file mode 100644
index 000000000..21afbded4
Binary files /dev/null and b/src/assets/images/shangqi/home/logo3.png differ
diff --git a/src/assets/images/shangqi/img/logo2.png b/src/assets/images/shangqi/img/logo2.png
new file mode 100644
index 000000000..d6819be30
Binary files /dev/null and b/src/assets/images/shangqi/img/logo2.png differ
diff --git a/src/assets/images/shangqi/sideBar/side-bar-bg1.png b/src/assets/images/shangqi/sideBar/side-bar-bg1.png
new file mode 100644
index 000000000..0b29e9884
Binary files /dev/null and b/src/assets/images/shangqi/sideBar/side-bar-bg1.png differ
diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js
index 056dc3a6f..5e38c6dea 100644
--- a/src/assets/languages/cn.js
+++ b/src/assets/languages/cn.js
@@ -99,6 +99,10 @@ export const m = {
country: '国家',
tableName: '表格名称',
applicableModels: '适用车型',
+ applicableProductLine: '适用产品线',
+ associatedModule: '关联模块',
+ searchByApplicableProductLine: '根据适用产品线查找',
+ SearchByAssociatedModule: '根据关联模块查找',
typesOfEnergy: '能源种类',
pleaseSelectRegion: '请选择区域',
lookUpByTableName: '根据表格名称查找',
diff --git a/src/assets/styles/common.less b/src/assets/styles/common.less
index 501ee3421..74d7a5d70 100644
--- a/src/assets/styles/common.less
+++ b/src/assets/styles/common.less
@@ -49,7 +49,8 @@
}
#app{
&.theme-one {
- background: url('~@/assets/images/shangqi/home/home-bg.png') no-repeat;
+ //background: url('~@/assets/images/shangqi/home/home-bg.png') no-repeat;
+ background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
background-size: cover;
}
input:focus{
@@ -61,7 +62,6 @@
.back {
width: 30px;
height: 30px;
- border-radius: 50%;
background: #1E89FF;
display: inline-block;
line-height: 35px;
@@ -246,7 +246,6 @@
align-items: center;
.el-input__inner{
height: inherit;
- border-radius: 70px;
background: #EEF8FA;
font-size: 16px;
padding: 0 25px 0 50px;
@@ -299,7 +298,6 @@
font-size: 20px;
text-align: center;
background: rgba(248,181,81,1);
- border-radius: 70px;
&::before{
content: '';
position: absolute;
@@ -307,7 +305,6 @@
left: 0;
width: 100%;
height: 100%;
- border-radius: 70px;
background: rgba(255,255,255,.25);
display: none;
}
diff --git a/src/assets/styles/dialog.less b/src/assets/styles/dialog.less
index 7d2302a8b..6239c87cf 100644
--- a/src/assets/styles/dialog.less
+++ b/src/assets/styles/dialog.less
@@ -1,7 +1,6 @@
/*dialog公共样式*/
.v-class{
.el-dialog{
- border-radius: 6px;
.el-dialog__header{
width: 100%;
font-size: 14px;
diff --git a/src/assets/styles/navMenu.less b/src/assets/styles/navMenu.less
index 439c32b40..54bbdd1f9 100644
--- a/src/assets/styles/navMenu.less
+++ b/src/assets/styles/navMenu.less
@@ -66,7 +66,6 @@
}
.nav-menu-popper {
.el-menu {
- border-radius: 15px;
li {
&:hover {
background: rgba(255, 255, 255, 0.1) !important;
diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index d6d4642d9..d4cbb9ac8 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -159,7 +159,7 @@
// height: 32px !important;
// line-height: 32px !important;
// width: 170px;
-// border-radius: 0 4px 4px 0;
+// 0 4px 4px 0;
// font-size: 12px;
// color: #515a6e;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
@@ -196,7 +196,7 @@
// height: 32px !important;
// line-height: 32px !important;
// width: 180px;
-// border-radius: 4px;
+// 4px;
// font-size: 12px;
// color: #515a6e;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
@@ -229,7 +229,7 @@
// font-size: 14px;
// width: 224px;
// .el-input__inner{
-// border-radius: 0 4px 4px 0;
+// 0 4px 4px 0;
// font-size: 12px;
// color: #515a6e;
// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
@@ -369,7 +369,6 @@
input.el-input__inner{
display: inline-block;
width: 165px;
- border-radius: 20px;
color: #999;
height: 30px;
line-height: 30px;
@@ -385,7 +384,6 @@
font-family: MicrosoftYaHei,微软雅黑;
}
.el-range-editor.el-date-editor--daterange {
- border-radius: 20px;
height: 30px;
line-height: 30px;
font-family: MicrosoftYaHei,微软雅黑;
@@ -405,7 +403,6 @@
input.el-input__inner{
display: inline-block;
width: 100%;
- border-radius: 20px;
color: #999;
height: 30px;
line-height: 30px;
@@ -414,7 +411,6 @@
textarea.el-textarea__inner{
display: inline-block;
width: 425px;
- border-radius: 5px;
color: #999;
//height: 30px;
//line-height: 30px;
@@ -425,7 +421,6 @@
textarea.el-textarea__inner{
display: inline-block;
width: 425px;
- border-radius: 5px;
color: #999;
//height: 30px;
//line-height: 30px;
@@ -441,7 +436,6 @@
input.el-input__inner{
display: inline-block;
width: 400px;
- border-radius: 20px;
color: #999;
height: 30px;
line-height: 30px;
@@ -559,7 +553,7 @@ tr.el-table__row{
height: 44px;
}
.el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
- border-right: 1px dashed rgba(209, 209, 209, 1);
+ border-right: 1px solid rgba(209, 209, 209, 1);
}
.el-table td, .el-table th.is-leaf{
border-bottom: 1px solid rgba(209, 209, 209, 1);
@@ -575,8 +569,7 @@ tr.el-table__row{
input.el-input__inner{
display: inline-block;
width: 180px;
- border-radius: 20px;
- colro: #999;
+ color: #999;
height: 30px;
line-height: 30px;
font-family: MicrosoftYaHei,微软雅黑;
@@ -687,7 +680,6 @@ tr.el-table__row{
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
@@ -697,7 +689,6 @@ tr.el-table__row{
right: 10px;
left: auto;
background: #fff3f3;
- border-radius: 3px;
z-index: 9;
}
}
@@ -828,12 +819,6 @@ tr.el-table__row{
.el-input__inner {
height: 30px;
line-height: 30px;
- border-radius: 15px;
- }
- }
- .el-textarea{
- .el-textarea__inner{
- border-radius: 15px;
}
}
.form-upload-btn{
@@ -843,7 +828,6 @@ tr.el-table__row{
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
@@ -854,7 +838,6 @@ tr.el-table__row{
.switch-wrap {
padding: 3px 7px;
border: 1px solid #409EFF;
- border-radius: 20px;
user-select: none;
.el-switch__label,
.el-switch__label.is-active {
@@ -918,4 +901,4 @@ tr.el-table__row{
.el-input__inner {
width: 100% !important;
}
-}
\ No newline at end of file
+}
diff --git a/src/assets/styles/process.less b/src/assets/styles/process.less
index a373a7738..1caa274ac 100644
--- a/src/assets/styles/process.less
+++ b/src/assets/styles/process.less
@@ -2,7 +2,6 @@
.prc-content-border {
border: 1px dashed #ddd;
padding: 20px;
- border-radius: 10px;
background: #fdfdfd;
.form-item-disabled {
.el-form-item__label, .el-form-item__content .el-input .el-input__inner,
diff --git a/src/assets/styles/scroll.less b/src/assets/styles/scroll.less
index b8a3158e2..96695f989 100644
--- a/src/assets/styles/scroll.less
+++ b/src/assets/styles/scroll.less
@@ -6,7 +6,6 @@
::-webkit-scrollbar-track,
::-webkit-scrollbar-thumb {
- border-radius: 999px;
border: 5px solid transparent;
}
//凹槽颜色
@@ -26,4 +25,4 @@
position: absolute;
top: 0;
left: 0;
-}
\ No newline at end of file
+}
diff --git a/src/assets/styles/searchInput.less b/src/assets/styles/searchInput.less
index ae80378ef..fb08f9960 100644
--- a/src/assets/styles/searchInput.less
+++ b/src/assets/styles/searchInput.less
@@ -40,7 +40,7 @@
// .search-input-box{
// margin-top: 1px;
// border: 1px solid #DCDFE6;
-// border-radius: 0 4px 4px 0;
+// 0 4px 4px 0;
// .v-select-selection{
// & > div{
// .v-select-placeholder{
diff --git a/src/assets/styles/shangqi-iconfont-replace/demo.css b/src/assets/styles/shangqi-iconfont-replace/demo.css
index a67054a0a..704b99534 100644
--- a/src/assets/styles/shangqi-iconfont-replace/demo.css
+++ b/src/assets/styles/shangqi-iconfont-replace/demo.css
@@ -252,7 +252,6 @@
margin: 0 3px;
padding: 0 5px;
background: #eee;
- border-radius: 3px;
}
.markdown strong,
@@ -461,7 +460,6 @@ pre[class*="language-"] {
/* Inline code */
:not(pre)>code[class*="language-"] {
padding: .1em;
- border-radius: .3em;
white-space: normal;
}
diff --git a/src/assets/zTree/css/zTreeStyle/zTreeStyle.css b/src/assets/zTree/css/zTreeStyle/zTreeStyle.css
index a97979f65..d178df759 100644
--- a/src/assets/zTree/css/zTreeStyle/zTreeStyle.css
+++ b/src/assets/zTree/css/zTreeStyle/zTreeStyle.css
@@ -28,9 +28,68 @@ website: http://code.google.com/p/jquerytree/
.ztree li span {line-height:16px; margin-right:2px}
.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
border:0 none; cursor: pointer;outline:none;
- background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
- background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
-
+ /*background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;*/
+ /*background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")*/
+}
+.ztree li span.button.roots_open{
+ width: 0px !important;
+ height: 0px !important;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-top: 5px solid rgb(192, 196, 204);
+}
+.ztree li span.button.roots_close{
+ width: 0px !important;
+ height: 0px !important;
+ border-bottom: 5px solid transparent;
+ border-left: 5px solid rgb(192, 196, 204);
+ border-top: 5px solid transparent;
+ margin-right: 5px;
+}
+.ztree li span.button.center_open{
+ width: 0px !important;
+ height: 0px !important;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-top: 5px solid rgb(192, 196, 204);
+}
+.ztree li span.button.center_close{
+ width: 0px !important;
+ height: 0px !important;
+ border-bottom: 5px solid transparent;
+ border-left: 5px solid rgb(192, 196, 204);
+ border-top: 5px solid transparent;
+ margin-right: 5px;
+}
+.ztree li span.button.bottom_open{
+ width: 0px !important;
+ height: 0px !important;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-top: 5px solid rgb(192, 196, 204);
+}
+.ztree li span.button.bottom_close{
+ width: 0px !important;
+ height: 0px !important;
+ border-bottom: 5px solid transparent;
+ border-left: 5px solid rgb(192, 196, 204);
+ border-top: 5px solid transparent;
+ margin-right: 5px;
+}
+.ztree li a.curSelectedNode {
+ border: 1px solid transparent !important;
+ color: #2d8cf0;
+ background: transparent;
+}
+.ztree li ul.line {
+ background: transparent;
+}
+.ico_open {
+ width: 2px !important;
+}
+.ico_close {
+ width: 2px !important;
+}
.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
.ztree li span.button.chk.checkbox_false_full {background-position:0 0}
.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index 7f9ac89d1..8c683defb 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -9,9 +9,7 @@ import store from '@/store'
import {Message} from 'element-ui'
export const CancelToken = axios.CancelToken
// import 'element-ui/lib/theme-chalk/index.css'
-const _axios = axios.create({
- baseURL: '/'
-})
+const _axios = axios.create()
/**
* @description: FormData
@@ -65,7 +63,7 @@ _axios.interceptors.response.use(
}
})
function api () {
- return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : '/api/'
+ return store.getters.getTypeFlag === 'CloudRepository' ? '/busApi/' : ''
}
export default {
_axios,
diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue
index a88355aa6..dbaac0224 100644
--- a/src/components/CustomFormComponents/InputForAllStandards.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards.vue
@@ -17,7 +17,7 @@
diff --git a/src/components/CustomFormComponents/InputForPolicy.vue b/src/components/CustomFormComponents/InputForPolicy.vue
index cf05bc9c7..dfe48690c 100644
--- a/src/components/CustomFormComponents/InputForPolicy.vue
+++ b/src/components/CustomFormComponents/InputForPolicy.vue
@@ -23,7 +23,7 @@
diff --git a/src/components/CustomFormComponents/InputForRecord.vue b/src/components/CustomFormComponents/InputForRecord.vue
index aec5bbb63..d596d83e4 100644
--- a/src/components/CustomFormComponents/InputForRecord.vue
+++ b/src/components/CustomFormComponents/InputForRecord.vue
@@ -20,7 +20,7 @@
diff --git a/src/components/CustomFormComponents/InputForStandAndForeign.vue b/src/components/CustomFormComponents/InputForStandAndForeign.vue
index b4c6fc1e2..7df2bcefa 100644
--- a/src/components/CustomFormComponents/InputForStandAndForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandAndForeign.vue
@@ -22,7 +22,7 @@
diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 62b6fb9ef..f21a6c117 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -21,7 +21,7 @@
diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index dad369eeb..d8d781c58 100644
--- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
@@ -18,7 +18,7 @@
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index e504835ca..e05ff727d 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -18,7 +18,7 @@
diff --git a/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue b/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue
index cec3c60ea..47500f4bd 100644
--- a/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue
+++ b/src/components/CustomFormComponents/ProjectRelatedPersonnel.vue
@@ -18,8 +18,8 @@
>
diff --git a/src/components/CustomFormComponents/SearchSelect.vue b/src/components/CustomFormComponents/SearchSelect.vue
index fce2c16a1..d2ea00ff2 100644
--- a/src/components/CustomFormComponents/SearchSelect.vue
+++ b/src/components/CustomFormComponents/SearchSelect.vue
@@ -93,6 +93,7 @@ export default {
// 匹配项来源
if (this.searchKey === '') {
this.filterOptions = this.options
+ console.log(this.options)
} else {
let result = []
// 用原始数据进行匹配
diff --git a/src/components/ProjectRelatedPersonnel/index.vue b/src/components/ProjectRelatedPersonnel/index.vue
index f5ca6eb49..d355f5076 100644
--- a/src/components/ProjectRelatedPersonnel/index.vue
+++ b/src/components/ProjectRelatedPersonnel/index.vue
@@ -57,7 +57,7 @@
diff --git a/src/components/ProjectRelatedPersonnel/index2.vue b/src/components/ProjectRelatedPersonnel/index2.vue
index 7a7699d62..2db5d6b2a 100644
--- a/src/components/ProjectRelatedPersonnel/index2.vue
+++ b/src/components/ProjectRelatedPersonnel/index2.vue
@@ -79,7 +79,7 @@
-
+
@@ -497,11 +497,9 @@ export default {
}
.inp{
width: 230px;
- border-radius: 50px;
margin-left: 5px;
}
/deep/.el-input--suffix .el-input__inner {
- border-radius: 100px;
height: 35px;
line-height: 35px;
}
diff --git a/src/components/PutQuestionButton/index.vue b/src/components/PutQuestionButton/index.vue
index 70b540df1..3dc145f0d 100644
--- a/src/components/PutQuestionButton/index.vue
+++ b/src/components/PutQuestionButton/index.vue
@@ -35,7 +35,7 @@
@@ -228,7 +228,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
diff --git a/src/components/advancedQuery/index.vue b/src/components/advancedQuery/index.vue
index 7c3ff4159..5b33954b3 100644
--- a/src/components/advancedQuery/index.vue
+++ b/src/components/advancedQuery/index.vue
@@ -189,8 +189,8 @@
- 高级检索
- 重置
+ 高级检索
+ 重置
@@ -381,8 +381,8 @@
- 查询
- 重置
+ 查询
+ 重置
@@ -421,7 +421,7 @@
@@ -1101,23 +1101,17 @@ export default {
color: #ffffff;
background: #409EFF;
border: none;
- border-radius: 20px;
}
.advancedSearch-btn-reduce{
padding: 12px 12px;
color: #999;
background: #fff;
border: 1px solid #DCDFE6;
- border-radius: 20px;
}
.advance-dialog {
.advance-dialog-form{
- /deep/input.el-input__inner{
- border-radius: 20px;
- }
.el-date-editor, .advanced-three{
width: 247px;
- border-radius: 20px;
}
.el-date-editor{
/deep/& > span{
@@ -1132,9 +1126,6 @@ button.el-button.advancedSearch-btn-reduce.el-button--default{
.query-box{
width: 850px;
.advance-dialog-form{
- /deep/input.el-input__inner{
- border-radius: 20px;
- }
.advanced-class{
visibility: hidden;
}
@@ -1146,18 +1137,15 @@ button.el-button.advancedSearch-btn-reduce.el-button--default{
color: #ffffff;
background: #409EFF;
border: none;
- border-radius: 20px;
}
.advancedSearch-btn-reduce{
padding: 12px 12px;
color: #999;
background: #fff;
border: 1px solid #DCDFE6;
- border-radius: 20px;
}
.el-date-editor, .advanced-three{
width: 247px;
- border-radius: 20px;
}
.el-date-editor{
/deep/& > span{
diff --git a/src/components/comHeader/index.vue b/src/components/comHeader/index.vue
index 8e9036365..6a2e0f462 100644
--- a/src/components/comHeader/index.vue
+++ b/src/components/comHeader/index.vue
@@ -72,7 +72,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
this.$store.commit('setTypeFlag', 'loginOut')
this.$http.get('logout', {}, {
diff --git a/src/components/generationNumber/index.vue b/src/components/generationNumber/index.vue
index 80955c1fc..16e933212 100644
--- a/src/components/generationNumber/index.vue
+++ b/src/components/generationNumber/index.vue
@@ -72,8 +72,8 @@
diff --git a/src/components/hasNoData/index.vue b/src/components/hasNoData/index.vue
index 1ef758a03..6abe270a0 100644
--- a/src/components/hasNoData/index.vue
+++ b/src/components/hasNoData/index.vue
@@ -43,7 +43,6 @@ export default {
display: -ms-flex;
justify-content: center;
align-items: center;
- border-radius: 50%;
font-size: 50px;
flex-flow: column;
color: #AAA;
diff --git a/src/components/lawsTree/index.vue b/src/components/lawsTree/index.vue
index 937d4ca7d..4d528bfab 100644
--- a/src/components/lawsTree/index.vue
+++ b/src/components/lawsTree/index.vue
@@ -1484,9 +1484,7 @@ export default {
flex-direction: column;
.input-wrapper{
padding: 10px 5px 0 5px;
- .empty {
- border-radius: 50px;
- }
+
input{
display: inline-block;
width: 100%;
@@ -1494,7 +1492,6 @@ export default {
line-height: 1.5;
padding: 4px 28px 4px 7px;
font-size: 12px;
- border-radius: 4px;
color: #515a6e;
background-color: #fff;
background-image: none;
diff --git a/src/components/lawsTree/index2.vue b/src/components/lawsTree/index2.vue
index 94b792417..5d8b4983a 100644
--- a/src/components/lawsTree/index2.vue
+++ b/src/components/lawsTree/index2.vue
@@ -1380,7 +1380,6 @@ export default {
.input-wrapper{
padding: 10px 5px 0 5px;
.empty {
- border-radius: 50px;
}
input{
display: inline-block;
@@ -1389,7 +1388,6 @@ export default {
line-height: 1.5;
padding: 4px 28px 4px 7px;
font-size: 12px;
- border-radius: 4px;
color: #515a6e;
background-color: #fff;
background-image: none;
diff --git a/src/components/loading/index.vue b/src/components/loading/index.vue
index d160a6b86..fbe1b2286 100644
--- a/src/components/loading/index.vue
+++ b/src/components/loading/index.vue
@@ -64,7 +64,6 @@ export default {
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.9);
- border-radius: 8px;
user-select: none;
.loading-content{
position: absolute;
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index c28ce2aad..cd7f837d3 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -68,7 +68,7 @@ export default {
navMenuList: [
{
title: '首页',
- path: '/home',
+ path: '/home1',
isChildren: true, // 判断没有子菜单
'icon-class': 'home'
},
@@ -78,81 +78,86 @@ export default {
'icon-class': 'fagui',
menuId: 'PMYP5AG3M2',
children: [
- {
- title: '动态&资料',
- path: '/dynamicInformation',
- menuId: 'RAFQ4N4ARF'
- },
+ // {
+ // title: '动态&资料',
+ // path: '/dynamicInformation',
+ // menuId: 'RAFQ4N4ARF'
+ // },
{
title: '国内标准法规',
path: '/domesticStandardsAndRegulations',
menuId: 'A59EFAQ7AC'
},
{
- title: '海外标准法规',
- path: '/foreignStandardsAndRegulations',
- menuId: '6K8A2RZYRE'
+ title: '标准征求意见',
+ path: '/standardForComments',
+ menuId: ''
},
- {
- title: '国内外政策',
- path: '/foreignRegulationsDatabase',
- menuId: '4DB4Y2H3NH'
- },
- // // {
- // // title: '标准制修订管理',
- // // path: '/demo2One'
- // // },
+ // {
+ // title: '海外标准法规',
+ // path: '/foreignStandardsAndRegulations',
+ // menuId: '6K8A2RZYRE'
+ // },
+ // {
+ // title: '国内外政策',
+ // path: '/foreignRegulationsDatabase',
+ // menuId: '4DB4Y2H3NH'
+ // },
+ // // // {
+ // // // title: '标准制修订管理',
+ // // // path: '/demo2One'
+ // // // },
{
title: '标准法规清单',
path: '/accessStandardsAndRegulations',
menuId: 'UR3CSDWEQM6Q2GEW339L'
},
- // {
- // title: '标准法规清单详情',
- // path: '/details'
- // }
// // {
- // // title: '试验项目库',
- // // path: '/demo2One'
- // // },
- // // {
- // // title: '本地产品/项目库',
- // // path: '/localProductsOrProjectLibrary'
- // // },
- {
- title: '企业标准库',
- path: '/enterpriseStandardDatabase',
- menuId: '3YVZP8R4TC'
- },
- {
- title: '企标制修订计划',
- path: '/enterBSysRevPlanManaLib',
- menuId: 'WW7YDHQ9Z679TGMDZMUS'
- },
+ // // title: '标准法规清单详情',
+ // // path: '/details'
+ // // }
+ // // // {
+ // // // title: '试验项目库',
+ // // // path: '/demo2One'
+ // // // },
+ // // // {
+ // // // title: '本地产品/项目库',
+ // // // path: '/localProductsOrProjectLibrary'
+ // // // },
// {
- // title: '子公司标准库',
- // path: '/subsidiaryStandardLibrary'
- // }
+ // title: '企业标准库',
+ // path: '/enterpriseStandardDatabase',
+ // menuId: '3YVZP8R4TC'
+ // },
+ // {
+ // title: '企标制修订计划',
+ // path: '/enterBSysRevPlanManaLib',
+ // menuId: 'WW7YDHQ9Z679TGMDZMUS'
+ // },
+ // // {
+ // // title: '子公司标准库',
+ // // path: '/subsidiaryStandardLibrary'
+ // // }
{
title: '车型/项目库',
path: '/localProductsOrProjectLibrary',
menuId: 'PCZKM8TQJAH5UP5EAXTJ'
},
- {
- title: '未符合项跟踪',
- path: '/nonConfomity',
- menuId: 'HQSK8WWPDJG7R5F53LTK'
- },
- {
- title: '标准法规工作组',
- path: '/workGroup',
- menuId: 'QYRMD5TUNBP9XXFRNK5S'
- },
- {
- title: '备案产品标准库',
- path: '/enterpriseStandardFiling',
- menuId: 'MQBAGJQMSRZDRX3X5AVR'
- },
+ // {
+ // title: '未符合项跟踪',
+ // path: '/nonConfomity',
+ // menuId: 'HQSK8WWPDJG7R5F53LTK'
+ // },
+ // {
+ // title: '标准法规工作组',
+ // path: '/workGroup',
+ // menuId: 'QYRMD5TUNBP9XXFRNK5S'
+ // },
+ // {
+ // title: '备案产品标准库',
+ // path: '/enterpriseStandardFiling',
+ // menuId: 'MQBAGJQMSRZDRX3X5AVR'
+ // },
{
title: '标准合规评估结果', // 把 标准涉及项目 这几个字 改成 标准合规评估结果
path: '/standInvolveProject',
@@ -165,46 +170,46 @@ export default {
// }
]
},
- {
- title: '工作台',
- path: '/processCenter',
- 'icon-class': 'liucheng',
- menuId: '6GDJ5JDHUS',
- children: [
- {
- title: '流程中心',
- path: '/processCenter'
- },
- {
- title: '发起流程',
- path: '/createProcessNew'
- },
- // {
- // title: '标准法规管理流程',
- // path: '/newProcess/1'
- // },
- // {
- // title: '政策管理流程',
- // path: '/newProcess/2'
- // },
- // {
- // title: '企标管理流程',
- // path: '/newProcess/3'
- // },
- // {
- // title: '标准采购翻译申请流程',
- // path: '/newProcess/4'
- // },
- // {
- // title: '工作组会议管理流程',
- // path: '/newProcess/5'
- // },
- // {
- // title: '标准法规清单管理流程',
- // path: '/newProcess/6'
- // }
- ]
- },
+ // {
+ // title: '工作台',
+ // path: '/processCenter',
+ // 'icon-class': 'liucheng',
+ // menuId: '6GDJ5JDHUS',
+ // children: [
+ // {
+ // title: '流程中心',
+ // path: '/processCenter'
+ // },
+ // {
+ // title: '发起流程',
+ // path: '/createProcessNew'
+ // },
+ // // {
+ // // title: '标准法规管理流程',
+ // // path: '/newProcess/1'
+ // // },
+ // // {
+ // // title: '政策管理流程',
+ // // path: '/newProcess/2'
+ // // },
+ // // {
+ // // title: '企标管理流程',
+ // // path: '/newProcess/3'
+ // // },
+ // // {
+ // // title: '标准采购翻译申请流程',
+ // // path: '/newProcess/4'
+ // // },
+ // // {
+ // // title: '工作组会议管理流程',
+ // // path: '/newProcess/5'
+ // // },
+ // // {
+ // // title: '标准法规清单管理流程',
+ // // path: '/newProcess/6'
+ // // }
+ // ]
+ // },
{
title: '本地工具',
@@ -231,11 +236,11 @@ export default {
path: '/standContrast',
menuId: '3RYN5FLTTDYP7D2PJ44H'
},
- {
- title: '标准比对库',
- path: '/standardComparisonLibrary',
- menuId: 'AH56UDHHBVF5V7WZFWJQ'
- }
+ // {
+ // title: '标准比对库',
+ // path: '/standardComparisonLibrary',
+ // menuId: 'AH56UDHHBVF5V7WZFWJQ'
+ // }
// {
// title: '预警管理',
// path: '/warningManage'
@@ -271,148 +276,148 @@ export default {
// }
// ]
// },
- {
- title: '配置管理',
- path: '/config',
- 'icon-class': 'conf',
- menuId: '95KGANGWCV',
- children: [
- {
- title: '标准法规属性管理',
- path: '/standLawsAttrManage',
- menuId: 'C5VHBSYRMA'
- },
- {
- title: '资料中心管理',
- path: '/dynamicInformationManage',
- menuId: '6V2QZ9STRZ'
- },
- {
- title: '机构管理',
- path: '/MechanismManage',
- menuId: '7MWCQK6NNH'
- },
- {
- title: '角色管理',
- path: '/roleManage',
- menuId: 'NVU76EMB7N'
- },
- {
- title: '用户管理',
- path: '/userManage',
- menuId: 'YRJUEVJVUJ'
- },
- {
- title: '系统配置管理',
- path: '/warningTimeSetting',
- menuId: 'H2KC6P3PPM'
- },
- {
- title: '文档转换监控',
- path: '/convertDocView',
- menuId: '3F52K25546'
- },
- // {
- // title: '菜单管理',
- // path: '/menuManage'
- // },
- // {
- // title: '保密管理',
- // path: '/convertDocView'
- // },
- {
- title: '动态信息管理',
- path: '/DynamicInformations',
- menuId: '3C87BSHJUF'
- },
- {
- title: '标准属性自定义',
- path: '/attributeCustom',
- menuId: 'PGPZXNUFEXC85BVPV9AU'
- },
- // {
- // title: '流程分类管理',
- // path: '/processClassificationManage',
- // menuId: 'N323F2UB9FTUV5SD3GTD'
- // },
- // {
- // title: '流程管理',
- // path: '/processManage',
- // menuId: 'K5KXSS3X9CF7CS8AMFJ5'
- // },
- {
- title: 'SVPPS',
- path: '/svpps',
- menuId: 'AR52RX586LQHVZSVV83K'
- },
- {
- title: '企标编号管理体系',
- path: '/enterpriseStandardNumberManagement',
- menuId: '9YSFG39S3CBFUJCEU3QX'
- }
- ]
- },
- {
- title: '个人中心',
- path: '/personal',
- 'icon-class': 'ucenter',
- menuId: 'ZY9RFA4M35',
- children: [
- {
- title: '我的消息',
- path: '/dynamics',
- menuId: 'JCEV4AEV32'
- },
- {
- title: '我的企标',
- path: '/MyEnterpriseStandard',
- menuId: 'LKU3W23UMEHDM9VLDHGK'
- },
- {
- title: '我的收藏',
- path: '/collection',
- menuId: 'JY5LKL2HPD'
- },
-
- {
- title: '我的浏览',
- path: '/browsing',
- menuId: 'HAEY2A4LMX'
- },
- {
- title: '已收分享',
- path: '/push',
- menuId: '9F8T7DPYHE'
- },
- {
- title: '已发分享',
- path: '/forward',
- menuId: 'K45Y9TGKZV2K4XP4CETD'
- },
- {
- title: '我的问答',
- path: '/questionsAndAnswers',
- menuId: '8VKLZATQQG4NQHXV9UDS'
- },
- {
- title: '我的板块',
- path: '/plate',
- menuId: 'TUYHX8JBWV'
- }
- // {
- // title: '个人信息',
- // path: '/info',
- // menuId: '8K7FDHG89G'
- // }
- ]
- },
- {
- title: '搜索中心',
- path: '/advancedSearch',
- 'icon-class': 'search',
- menuId: 'K9BAYUPZBC',
- isChildren: true // 判断没有子菜单
- },
+ // {
+ // title: '配置管理',
+ // path: '/config',
+ // 'icon-class': 'conf',
+ // menuId: '95KGANGWCV',
+ // children: [
+ // {
+ // title: '标准法规属性管理',
+ // path: '/standLawsAttrManage',
+ // menuId: 'C5VHBSYRMA'
+ // },
+ // {
+ // title: '资料中心管理',
+ // path: '/dynamicInformationManage',
+ // menuId: '6V2QZ9STRZ'
+ // },
+ // {
+ // title: '机构管理',
+ // path: '/MechanismManage',
+ // menuId: '7MWCQK6NNH'
+ // },
+ // {
+ // title: '角色管理',
+ // path: '/roleManage',
+ // menuId: 'NVU76EMB7N'
+ // },
+ // {
+ // title: '用户管理',
+ // path: '/userManage',
+ // menuId: 'YRJUEVJVUJ'
+ // },
+ // {
+ // title: '系统配置管理',
+ // path: '/warningTimeSetting',
+ // menuId: 'H2KC6P3PPM'
+ // },
+ // {
+ // title: '文档转换监控',
+ // path: '/convertDocView',
+ // menuId: '3F52K25546'
+ // },
+ // // {
+ // // title: '菜单管理',
+ // // path: '/menuManage'
+ // // },
+ // // {
+ // // title: '保密管理',
+ // // path: '/convertDocView'
+ // // },
+ // {
+ // title: '动态信息管理',
+ // path: '/DynamicInformations',
+ // menuId: '3C87BSHJUF'
+ // },
+ // {
+ // title: '标准属性自定义',
+ // path: '/attributeCustom',
+ // menuId: 'PGPZXNUFEXC85BVPV9AU'
+ // },
+ // // {
+ // // title: '流程分类管理',
+ // // path: '/processClassificationManage',
+ // // menuId: 'N323F2UB9FTUV5SD3GTD'
+ // // },
+ // // {
+ // // title: '流程管理',
+ // // path: '/processManage',
+ // // menuId: 'K5KXSS3X9CF7CS8AMFJ5'
+ // // },
+ // {
+ // title: 'SVPPS',
+ // path: '/svpps',
+ // menuId: 'AR52RX586LQHVZSVV83K'
+ // },
+ // {
+ // title: '企标编号管理体系',
+ // path: '/enterpriseStandardNumberManagement',
+ // menuId: '9YSFG39S3CBFUJCEU3QX'
+ // }
+ // ]
+ // },
+ // {
+ // title: '个人中心',
+ // path: '/personal',
+ // 'icon-class': 'ucenter',
+ // menuId: 'ZY9RFA4M35',
+ // children: [
+ // {
+ // title: '我的消息',
+ // path: '/dynamics',
+ // menuId: 'JCEV4AEV32'
+ // },
+ // {
+ // title: '我的企标',
+ // path: '/MyEnterpriseStandard',
+ // menuId: 'LKU3W23UMEHDM9VLDHGK'
+ // },
+ // {
+ // title: '我的收藏',
+ // path: '/collection',
+ // menuId: 'JY5LKL2HPD'
+ // },
+ //
+ // {
+ // title: '我的浏览',
+ // path: '/browsing',
+ // menuId: 'HAEY2A4LMX'
+ // },
+ // {
+ // title: '已收分享',
+ // path: '/push',
+ // menuId: '9F8T7DPYHE'
+ // },
+ // {
+ // title: '已发分享',
+ // path: '/forward',
+ // menuId: 'K45Y9TGKZV2K4XP4CETD'
+ // },
+ // {
+ // title: '我的问答',
+ // path: '/questionsAndAnswers',
+ // menuId: '8VKLZATQQG4NQHXV9UDS'
+ // },
+ // {
+ // title: '我的板块',
+ // path: '/plate',
+ // menuId: 'TUYHX8JBWV'
+ // }
+ // // {
+ // // title: '个人信息',
+ // // path: '/info',
+ // // menuId: '8K7FDHG89G'
+ // // }
+ // ]
+ // },
+ // {
+ // title: '搜索中心',
+ // path: '/advancedSearch',
+ // 'icon-class': 'search',
+ // menuId: 'K9BAYUPZBC',
+ // isChildren: true // 判断没有子菜单
+ // },
// {
// title: '标准比对库',
// path: '/standardComparisonLibrary',
@@ -441,7 +446,7 @@ export default {
},
computed: {
logo () {
- return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo.png')
+ return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png')
},
...mapGetters(['getDynamicTotal', 'isCollapse'])
},
@@ -469,7 +474,7 @@ export default {
background-size: 100% 100%;
&:not(.is-collapse) {
width: 212px;
- background: url("~assets/images/shangqi/sideBar/side-bar-bg.png") no-repeat;
+ background: url("~assets/images/shangqi/sideBar/side-bar-bg1.png") no-repeat;
background-size: 100% 100%;
.logo {
img {
diff --git a/src/components/panel/PanelHeader.vue b/src/components/panel/PanelHeader.vue
index 4af60afaf..882569e88 100644
--- a/src/components/panel/PanelHeader.vue
+++ b/src/components/panel/PanelHeader.vue
@@ -98,14 +98,12 @@ export default {
}
.test-1::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
- border-radius: 10px;
box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2);
background : #cecece;
}
.test-1::-webkit-scrollbar-track {
/*滚动条里面轨道*/
box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2);
- border-radius: 10px;
background : #ededed;
}
diff --git a/src/components/tableToolsBar/index.vue b/src/components/tableToolsBar/index.vue
index b59b53091..9e8908925 100644
--- a/src/components/tableToolsBar/index.vue
+++ b/src/components/tableToolsBar/index.vue
@@ -8,14 +8,16 @@
@@ -114,6 +116,7 @@ export default {
padding: 8px 20px;
.flex();
justify-content: flex-end;
+ margin-top: -20px;
}
}
.tools-bar-wrapper{
diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue
index 986611300..75ee3b1e2 100644
--- a/src/pages/config/pages/attributeCustom/components/buss.vue
+++ b/src/pages/config/pages/attributeCustom/components/buss.vue
@@ -2,8 +2,8 @@
- 新增
- 展示区域管理
+ 新增
+ 展示区域管理
数据处理中
@@ -195,7 +195,7 @@
type="primary"
:loading="loading.submit"
@click="saveInfo()">提交
- 取消
+ 取消
@@ -205,7 +205,7 @@
width="400px"
>
- 新增
+ 新增
diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue
index 0b2040277..0336d42ba 100644
--- a/src/pages/config/pages/attributeCustom/components/laws.vue
+++ b/src/pages/config/pages/attributeCustom/components/laws.vue
@@ -2,8 +2,8 @@
- 新增
- 展示区域管理
+ 新增
+ 展示区域管理
数据处理中
@@ -188,8 +188,8 @@
@@ -199,7 +199,7 @@
width="400px"
>
- 新增
+ 新增
diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index d293efbac..5a121e29f 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -2,8 +2,8 @@
- 新增
- 展示区域管理
+ 新增
+ 展示区域管理
数据处理中
@@ -188,8 +188,8 @@
@@ -199,7 +199,7 @@
width="400px"
>
- 新增
+ 新增
diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue
index f671b1e02..cce7e6a1d 100644
--- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue
+++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue
@@ -88,8 +88,8 @@
@@ -164,7 +164,7 @@
@@ -603,7 +603,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i{
@@ -721,7 +720,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue
index a90bf546f..5575dfee2 100644
--- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue
+++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue
@@ -75,8 +75,8 @@
@@ -153,7 +153,7 @@
@@ -606,7 +606,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i{
diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue
index bceaded79..8d9f0facf 100644
--- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue
+++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue
@@ -182,7 +182,7 @@
数据获取中
@@ -220,7 +220,7 @@
diff --git a/src/pages/config/pages/dynamicInformationManage/index.vue b/src/pages/config/pages/dynamicInformationManage/index.vue
index 20e78a2d7..5b75db872 100644
--- a/src/pages/config/pages/dynamicInformationManage/index.vue
+++ b/src/pages/config/pages/dynamicInformationManage/index.vue
@@ -170,8 +170,8 @@
diff --git a/src/pages/config/pages/dynamicInformations/index.vue b/src/pages/config/pages/dynamicInformations/index.vue
index 321f34b31..5f260a64c 100644
--- a/src/pages/config/pages/dynamicInformations/index.vue
+++ b/src/pages/config/pages/dynamicInformations/index.vue
@@ -197,10 +197,10 @@
@@ -217,7 +217,7 @@
diff --git a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue
index 3d4877b14..fa7ac340b 100644
--- a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue
+++ b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue
@@ -104,8 +104,8 @@
@@ -165,7 +165,6 @@
},
drawerType: '',
drawerTitle: '',
- id: '',
drawer: false,
msgList: [],
search: {
diff --git a/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue b/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue
index 307f7746c..d2bcb6b4d 100644
--- a/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue
+++ b/src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue
@@ -90,7 +90,7 @@
@@ -116,7 +116,7 @@
diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index f563d10f7..c433a7cad 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -245,8 +245,8 @@
- {{$t('m.cancel')}}
- {{$t('m.confirm')}}
+ {{$t('m.cancel')}}
+ {{$t('m.confirm')}}
@@ -365,8 +365,8 @@
- {{$t('m.cancel')}}
- {{$t('m.confirm')}}
+ {{$t('m.cancel')}}
+ {{$t('m.confirm')}}
diff --git a/src/pages/config/pages/processManage/components/EditProcess.vue b/src/pages/config/pages/processManage/components/EditProcess.vue
index 9efddded1..d21877775 100644
--- a/src/pages/config/pages/processManage/components/EditProcess.vue
+++ b/src/pages/config/pages/processManage/components/EditProcess.vue
@@ -22,8 +22,8 @@
- {{$t('m.cancel')}}
- {{$t('m.confirm')}}
+ {{$t('m.cancel')}}
+ {{$t('m.confirm')}}
diff --git a/src/pages/config/pages/processManage/components/EditProcessClassification.vue b/src/pages/config/pages/processManage/components/EditProcessClassification.vue
index 0a21bbd6f..4bc819df0 100644
--- a/src/pages/config/pages/processManage/components/EditProcessClassification.vue
+++ b/src/pages/config/pages/processManage/components/EditProcessClassification.vue
@@ -20,8 +20,8 @@
- {{$t('m.cancel')}}
- {{$t('m.confirm')}}
+ {{$t('m.cancel')}}
+ {{$t('m.confirm')}}
diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index ce5098a55..add59698b 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -84,9 +84,9 @@
- 配置角色资源
- 配置法规库权限
- 新增分组
+ 配置角色资源
+ 配置法规库权限
+ 新增分组
{{$t('m.dataProcessing')}}
@@ -200,7 +200,7 @@
ref="menuTree">
-
{{$t('m.cancel')}}
+
{{$t('m.cancel')}}
{{$t('m.getting')}}……
- {{$t('m.cancel')}}
+ {{$t('m.cancel')}}
{{$t('m.submit')}}
- {{$t('m.cancel')}}
+ {{$t('m.cancel')}}
@@ -403,7 +403,7 @@
{{$t('m.getting')}}……
- {{$t('m.cancel')}}
+ {{$t('m.cancel')}}
diff --git a/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue b/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue
index db500c107..12d32e7ed 100644
--- a/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue
+++ b/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue
@@ -304,7 +304,6 @@
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i{
@@ -355,7 +354,7 @@
border-bottom: 1px solid #E5E5E5;
}
.file-wrap {
- padding:10px auto 10px 0;
+ //padding:10px auto 10px 0;
/*border-top: 1px dashed #ddd;*/
a{
min-height: 55px;
@@ -456,7 +455,7 @@
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
+
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
diff --git a/src/pages/details/itemsDetails/index.vue b/src/pages/details/itemsDetails/index.vue
index c0ac6bb06..aa30745ce 100644
--- a/src/pages/details/itemsDetails/index.vue
+++ b/src/pages/details/itemsDetails/index.vue
@@ -242,7 +242,6 @@ export default {
&:hover{
cursor: pointer;
background: rgba(255,255,255,.25);
- border-radius: 2px;
}
}
}
@@ -375,6 +374,5 @@ export default {
}
}
.serch-form-item .el-form-item__content .el-input__inner{
- border-radius: 4px !important;
}
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index ab1aeba07..c8a7f1d18 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -233,10 +233,10 @@
icon="add"
@click="addItemModal"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '84a37ea1e1' : '3D87NJR8N3'">新增
-
模板下载
-
导入
-
导出
-
删除
+
模板下载
+
导入
+
导出
+
删除
@@ -530,7 +530,7 @@
@@ -2144,7 +2144,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i{
@@ -2262,7 +2261,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
diff --git a/src/pages/details/otherLawsDetails/index.vue b/src/pages/details/otherLawsDetails/index.vue
index e60e8a927..d61551331 100644
--- a/src/pages/details/otherLawsDetails/index.vue
+++ b/src/pages/details/otherLawsDetails/index.vue
@@ -329,9 +329,9 @@
-
-
- 导出
+
+
+ 导出
关联条款
-
+
数据获取中
@@ -573,8 +573,8 @@
@@ -664,7 +664,7 @@
@@ -776,7 +776,7 @@
@@ -831,8 +831,8 @@
>
@@ -856,7 +856,6 @@
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #409EFF;;
border: 1px solid #409EFF;
background: rgba(64, 158, 255, 0.1);
@@ -970,7 +969,6 @@
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
@@ -1096,7 +1094,6 @@
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 099bd7b45..a7714f971 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -5,6 +5,9 @@
+
+ 9.5分
+
@@ -14,15 +17,9 @@
@@ -363,11 +360,11 @@
-
-
- 模板下载-->
+
+ 导出
-
+
@@ -693,7 +690,7 @@
@@ -802,7 +799,7 @@
@@ -868,7 +865,7 @@
@@ -899,8 +896,8 @@
@@ -936,8 +933,8 @@
>
@@ -2727,7 +2724,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #409EFF;;
border: 1px solid #409EFF;
background: rgba(64, 158, 255, 0.1);
@@ -2802,6 +2798,7 @@ export default {
& > p{
min-height: 55px;
line-height: 55px;
+ border-bottom: 1px solid #E5E5E5;
}
}
}
@@ -2819,6 +2816,17 @@ export default {
width: 100%;
}
}
+ .details-fraction{
+ float: right;
+ width:270px;
+ height:80px;
+ line-height: 80px;
+ text-align: center;
+ font-size: 30px;
+ font-weight: bold;
+ color: #e88218;
+ margin-top: -80px;
+ }
/deep/.details-content{
/*padding: 0 67px;*/
.details-content-modular{
@@ -2852,7 +2860,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i{
@@ -2994,7 +3001,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
@@ -3016,7 +3022,6 @@ export default {
}
.basic-information{
border-top: 2px dashed #D1D1D1;
- border-bottom: 2px dashed #D1D1D1;
.modular-header{
height: 60px;
border-bottom: none;
@@ -3025,6 +3030,7 @@ export default {
& > p{
min-height: 55px;
line-height: 55px;
+ border-bottom: 1px solid #E5E5E5;
}
}
}
diff --git a/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue b/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue
index 3712cc4c4..7b5ea27ee 100644
--- a/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue
+++ b/src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue
@@ -49,7 +49,7 @@
-
+
@@ -243,8 +243,8 @@
@pageSizeChange="pageProStateSizeChange">
-
-
+
+
@@ -260,9 +260,9 @@
数据处理中
@@ -383,8 +383,8 @@
@pageSizeChange="pageProStateSizeChange2">
-
-
+
+
数据处理中
diff --git a/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue b/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue
index 287dc9a6b..4ae4b8199 100644
--- a/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue
+++ b/src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue
@@ -49,7 +49,7 @@
-
+
@@ -242,8 +242,8 @@
@pageSizeChange="pageProStateSizeChange">
-
-
+
+
@@ -259,9 +259,9 @@
数据处理中
@@ -382,8 +382,8 @@
@pageSizeChange="pageProStateSizeChange2">
-
-
+
+
数据处理中
diff --git a/src/pages/details/process/ruku/index.vue b/src/pages/details/process/ruku/index.vue
index 4d0c5b0c4..c4fb4875e 100644
--- a/src/pages/details/process/ruku/index.vue
+++ b/src/pages/details/process/ruku/index.vue
@@ -347,11 +347,11 @@
-
-
- 模板下载-->
+
+ 导出
-
+
@@ -673,7 +673,7 @@
@@ -780,7 +780,7 @@
@@ -846,7 +846,7 @@
@@ -877,8 +877,8 @@
@@ -914,8 +914,8 @@
>
@@ -2768,7 +2768,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i{
@@ -2910,7 +2909,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
@@ -3023,4 +3021,4 @@ export default {
::v-deep .el-drawer{
outline: none!important;
}
-
\ No newline at end of file
+
diff --git a/src/pages/home/components/EnterCard.vue b/src/pages/home/components/EnterCard.vue
index 65d7d3936..b46a574c6 100644
--- a/src/pages/home/components/EnterCard.vue
+++ b/src/pages/home/components/EnterCard.vue
@@ -4,8 +4,8 @@
-
-
{{ label }}
+
+ {{ label }}
@@ -25,14 +25,13 @@ export default {
+
diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue
new file mode 100644
index 000000000..b8aa9bbd2
--- /dev/null
+++ b/src/pages/home1/components/navMenu/index.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/home1/components/realtimeinfo/index.vue b/src/pages/home1/components/realtimeinfo/index.vue
new file mode 100644
index 000000000..94f315cdc
--- /dev/null
+++ b/src/pages/home1/components/realtimeinfo/index.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
new file mode 100644
index 000000000..11e76a840
--- /dev/null
+++ b/src/pages/home1/components/release/index.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/home1/components/searchGroup/index.vue b/src/pages/home1/components/searchGroup/index.vue
new file mode 100644
index 000000000..ee628b2be
--- /dev/null
+++ b/src/pages/home1/components/searchGroup/index.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
new file mode 100644
index 000000000..37a57b2b0
--- /dev/null
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue
new file mode 100644
index 000000000..0eb3a868b
--- /dev/null
+++ b/src/pages/home1/components/todoList/index.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue
new file mode 100644
index 000000000..e0612529d
--- /dev/null
+++ b/src/pages/home1/index.vue
@@ -0,0 +1,209 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/knowledgeGraph/components/standSelect.vue b/src/pages/knowledgeGraph/components/standSelect.vue
index a7c87ba5b..2f40ff770 100644
--- a/src/pages/knowledgeGraph/components/standSelect.vue
+++ b/src/pages/knowledgeGraph/components/standSelect.vue
@@ -1,6 +1,6 @@
- 手动查找
+ 手动查找
@@ -81,7 +81,7 @@
@pageSizeChange="pageSizeChangeReplace">
-
-
+
+
@@ -2773,7 +2773,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
@@ -2862,4 +2861,4 @@ export default {
overflow-y: auto !important;
padding: 0 10px 0 20px !important;
}
-
\ No newline at end of file
+
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index ebf57f786..3a716a366 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -11,16 +11,14 @@
+ @click="searchStandList">搜索
+ @click="clearSearchStand">清空
@@ -28,10 +26,10 @@
- 拆分
- 上传
- 导入拆分结果
- 删除
+ 拆分
+ 上传
+ 导入拆分结果
+ 删除
@@ -168,20 +166,18 @@
+ >搜索
+ >清空
@@ -239,8 +235,8 @@
@pageSizeChange="addFileStandPageSizeChange">
正在获取数据
@@ -262,8 +258,8 @@
@@ -308,8 +304,8 @@
手动查找
@@ -377,7 +373,7 @@
name="file"
:on-change="handleUploadChange2"
ref="importFileAboutStand">
- {{$t('m.upload')}}
+ {{$t('m.upload')}}
@@ -389,8 +385,8 @@
- 取消
- 拆分
+ 取消
+ 拆分
@@ -414,7 +410,7 @@
4.文档序号从4开始拆分,且序号必须为连续,例如4.1,4.2,4.3
- 知道了
+ 知道了
@@ -432,7 +428,7 @@
4.文档中的表格,在导出excel中以链接的形式展示,点击链接跳转到指定的sheet页面
- 知道了
+ 知道了
@@ -459,7 +455,7 @@
手动查找
@@ -489,8 +485,8 @@
ref="importFileAboutStand"
:disabled="importSplitResultLoading"
>
- {{$t('m.upload')}}
- 模板下载
+ {{$t('m.upload')}}
+ 模板下载
@@ -501,8 +497,8 @@
- 取消
- 确定
+ 取消
+ 确定
@@ -550,13 +546,11 @@
icon="el-icon-search"
type="primary"
class="common-button-primary"
- round
@click="getSearchSarBussStandPage">
@@ -633,14 +627,12 @@
@@ -522,8 +509,8 @@
- 提交
- 取消
+ 提交
+ 取消
@@ -536,8 +523,8 @@
选择条款关联节点下包含子节点,是否全部删除?
@@ -626,8 +613,8 @@
@@ -640,17 +627,16 @@
@@ -697,8 +683,8 @@
@@ -1038,7 +1024,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
let listAgain = {}
listAgain.msgResult = state
@@ -1260,7 +1246,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
this.$http.delete('lawss/sarFileSplitMenu/deleteMenu', {
id: this.selectSarMenu.id
@@ -1400,7 +1386,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
window.open('/api/lawss/sarFileSplitItems/exportSplitInfoZip?ids=null&infoId=' + this.infoId + '&exportName=' + exportName)
}).catch(() => {})
@@ -1435,7 +1421,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
this.deleteItemsModal = false
@@ -1510,7 +1496,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
let ids = []
this.selectedAllList.map((item, index) => {
@@ -1948,7 +1934,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
this.$http.postData('lawss/sarFileSplitMenu/copyMenu', treeNode, {
_this: this, loading: 'loading'
@@ -2092,7 +2078,7 @@ export default {
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
this.$http.postData('lawss/sarFileSplitMenu/copyMenuNotChildren', command[0], {
_this: this, loading: 'loading'
@@ -2520,7 +2506,6 @@ export default {
}
.spe-col-input{
.ivu-input{
- border-radius: 0;
}
}
.chooseBtn:focus {
diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue
index f9743dcfe..15d49d176 100644
--- a/src/pages/localTool/standContrast/index.vue
+++ b/src/pages/localTool/standContrast/index.vue
@@ -16,16 +16,14 @@
+ @click="sarStandCompareHisInfo">搜索
+ size="mini"
+ @click="clearSearchStand">清空
@@ -33,8 +31,8 @@
- 比对
- 批量删除
+ 比对
+ 批量删除
@@ -162,8 +160,8 @@
diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue
index 67751dba0..fa6580cf1 100644
--- a/src/pages/localTool/standContrast/pages/contrastDetails.vue
+++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue
@@ -17,11 +17,11 @@
-
+
@@ -104,12 +104,12 @@
-
+
@@ -184,8 +184,8 @@
数据加载中……
diff --git a/src/pages/localTool/standContrast/pages/textComparison.vue b/src/pages/localTool/standContrast/pages/textComparison.vue
index eac64aa39..5980108ce 100644
--- a/src/pages/localTool/standContrast/pages/textComparison.vue
+++ b/src/pages/localTool/standContrast/pages/textComparison.vue
@@ -628,7 +628,6 @@ export default {
padding: 5px;
cursor: pointer;
font-size: 16px;
- border-radius: 9px;
margin-bottom: 10px;
position: relative;
&:hover{
@@ -666,7 +665,6 @@ export default {
padding: 5px;
cursor: pointer;
font-size: 16px;
- border-radius: 9px;
margin-bottom: 10px;
position: relative;
&:hover{
@@ -749,7 +747,6 @@ export default {
.wrap-left {
width: 200px;
border: 1px solid #ddd;
- border-radius: 4px;
margin-right: 10px;
}
.wrap-right {
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index ec7aee2cf..e10c7dce3 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -4,10 +4,10 @@
- 上传
- 删除
@@ -165,7 +165,6 @@
{{ $t("m.upload")+' PDF'}}
@@ -205,13 +204,12 @@
-
取消
{
this.$http.delete(
@@ -699,7 +697,7 @@ export default {
cancelButtonText: "取消",
confirmButtonClass: "common-button-primary",
type: "warning",
- roundButton: true,
+ roundButton: false,
});
} else {
this.$confirm("确认删除这些数据?", "提示", {
@@ -707,7 +705,7 @@ export default {
cancelButtonText: "取消",
type: "warning",
confirmButtonClass: "common-button-primary",
- roundButton: true,
+ roundButton: false,
}).then(() => {
let idsList = [];
this.selectTableData.map((item) => {
@@ -798,9 +796,4 @@ export default {
}
}
}
-.bead-input {
- /deep/ .el-input__inner {
- border-radius: 20px;
- }
-}
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 5e84c0435..67f5f71d9 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -3,154 +3,341 @@
@@ -1726,19 +1726,9 @@ export default {
}
}
}
-.bead {
- /deep/ .el-input__inner {
- border-radius: 20px !important;
- }
- }
.skip {
margin: 10px;
}
-.bead-input {
- /deep/ .el-input__inner {
- border-radius: 20px !important;
- }
-}
.transition-box{
padding: 0 10px;
background: #ffffff;
diff --git a/src/pages/processCenter/pages/createProcess/components/hhgl/step1.vue b/src/pages/processCenter/pages/createProcess/components/hhgl/step1.vue
index 3a3619098..7c1300a2a 100644
--- a/src/pages/processCenter/pages/createProcess/components/hhgl/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/hhgl/step1.vue
@@ -274,7 +274,7 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/process1.vue b/src/pages/processCenter/pages/createProcess/components/process1.vue
index 214e85cb4..74dbb32d8 100644
--- a/src/pages/processCenter/pages/createProcess/components/process1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/process1.vue
@@ -661,7 +661,7 @@
手动查找
@@ -676,7 +676,7 @@
手动查找
@@ -689,7 +689,7 @@
手动查找
@@ -721,7 +721,7 @@
手动查找
@@ -738,7 +738,7 @@
手动查找
@@ -1141,9 +1141,9 @@
数据获取中
@@ -1255,9 +1255,9 @@
数据获取中
@@ -1379,7 +1379,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace">
@@ -1448,7 +1448,7 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/process2.vue b/src/pages/processCenter/pages/createProcess/components/process2.vue
index cf8c7c6eb..d66249a92 100644
--- a/src/pages/processCenter/pages/createProcess/components/process2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/process2.vue
@@ -235,7 +235,7 @@
@@ -272,7 +272,7 @@
@@ -295,7 +295,7 @@
@@ -309,8 +309,8 @@
- 取 消
- 确 定
+ 取 消
+ 确 定
@@ -324,8 +324,8 @@
- 取 消
- 确 定
+ 取 消
+ 确 定
@@ -1942,7 +1942,6 @@ export default {
}
/deep/.el-input__inner {
margin: 5px 0;
- border-radius: 15px;
}
}
.myfoot {
diff --git a/src/pages/processCenter/pages/createProcess/components/process3.vue b/src/pages/processCenter/pages/createProcess/components/process3.vue
index 2ca9ea2bc..919c9e04b 100644
--- a/src/pages/processCenter/pages/createProcess/components/process3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/process3.vue
@@ -261,8 +261,8 @@
数据获取中
@@ -378,7 +378,7 @@
@pageChange="typeProjectTablePageChange" @pageSizeChange="typeProjectTablePageSizeChange">
数据获取中
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue
index c924e68c6..3b014ebdf 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step1.vue
@@ -44,7 +44,7 @@
手动查找
@@ -336,7 +336,7 @@
icon="el-icon-check"
:loading="loadUser"
@click="typeProjectOk">确定
- 取消
+ 取消
@@ -376,7 +376,7 @@
-
+
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue
index 788e2813d..30d752a70 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step2.vue
@@ -275,8 +275,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue
index 17415cfd3..1a685de88 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step3.vue
@@ -64,7 +64,7 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue
index 6ca120c5b..529e389d2 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step4.vue
@@ -64,7 +64,7 @@
手动查找
@@ -365,7 +365,7 @@
@@ -396,7 +396,7 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue
index 7a2536fa1..bb67d7322 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step5.vue
@@ -327,8 +327,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue
index c73dfdfae..3e0cbf7ad 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step6.vue
@@ -327,8 +327,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue
index 51e3f5fb3..47410e240 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step7.vue
@@ -335,8 +335,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue b/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue
index 256f84e55..f9dd5df7f 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbba/step8.vue
@@ -64,7 +64,7 @@
手动查找
@@ -304,7 +304,7 @@
@@ -328,7 +328,7 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue
index 9f91f1b3e..9ca9b9d1b 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbfs/step1.vue
@@ -276,7 +276,7 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue
index df265392c..7990e0fb8 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step1.vue
@@ -1003,7 +1003,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue
index 3ab381db5..d3d55cae3 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step2.vue
@@ -526,7 +526,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue
index 495a7f530..d6a7dd472 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step3.vue
@@ -520,7 +520,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue
index bc622acc7..b0ab3d684 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step4.vue
@@ -440,7 +440,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue
index 5aba63a03..f5ef56e3a 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step5.vue
@@ -496,7 +496,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue b/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue
index d0148297c..30d1e0547 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbfz/step6.vue
@@ -442,7 +442,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue
index f3457d03c..0df254d67 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step1.vue
@@ -332,7 +332,6 @@
v-if="EditPermission !== '1'"
type="warning"
icon="el-icon-edit-outline"
- round
@click="onlineEditing"
class="common-button-warning"
>在线编辑
diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue
index b1aef7d00..7f9000f13 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step2.vue
@@ -276,12 +276,10 @@
新增
删除
@@ -380,8 +378,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue
index d1a4f4316..e2a540959 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbkw/step3.vue
@@ -276,12 +276,10 @@
新增
删除
@@ -382,8 +380,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue
index 1c10d0ea7..9b73c8064 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbzxd/step1.vue
@@ -1768,7 +1768,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue
index 845a37cd4..2510db37f 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbzxdpg/step3.vue
@@ -226,7 +226,7 @@
手动查找
@@ -372,7 +372,7 @@
@@ -462,7 +462,7 @@
数据获取中
diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue
index c882f1437..b2e496e58 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step1.vue
@@ -224,7 +224,7 @@
手动查找
@@ -371,7 +371,7 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue
index a6df860b1..7a8066f41 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step2.vue
@@ -739,7 +739,6 @@ export default {
.prc-content-border {
border: 1px dashed #ddd;
padding: 20px;
- border-radius: 10px;
background: #fefefe;
}
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue
index 0632f79d0..d58db5104 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step3.vue
@@ -685,7 +685,6 @@ export default {
.prc-content-border {
border: 1px dashed #ddd;
padding: 20px;
- border-radius: 10px;
background: #fefefe;
}
}
diff --git a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue
index e4bc36ee5..641b1e472 100644
--- a/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue
+++ b/src/pages/processCenter/pages/createProcess/components/qbzxdsq/step4.vue
@@ -238,7 +238,7 @@
手动查找
@@ -388,7 +388,7 @@
数据获取中
@@ -1310,7 +1310,6 @@ export default {
.prc-content-border {
border: 1px dashed #ddd;
padding: 20px;
- border-radius: 10px;
background: #fefefe;
}
}
diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue
index 036e1020c..05c29ebbf 100644
--- a/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue
+++ b/src/pages/processCenter/pages/createProcess/components/ruKu/components/reject.vue
@@ -17,7 +17,7 @@
maxlength="1000"
:placeholder="placeholder">
@@ -102,4 +102,4 @@ export default {
align-items: center;
justify-content: flex-end;
}
-
\ No newline at end of file
+
diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue
index 6a41227cf..c4368e702 100644
--- a/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step1.vue
@@ -993,7 +993,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace">
diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue
index 70073c1ff..d74a850f0 100644
--- a/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step2.vue
@@ -2337,7 +2337,6 @@ export default {
}
.myBox {
border: 1px solid #ccc;
- border-radius: 4px;
.mycheck {
margin-right: 10px;
}
@@ -2415,9 +2414,6 @@ export default {
background: transparent;
margin-right: 10px;
padding: 0;
- /deep/.el-textarea__inner {
- border-radius: 20px;
- }
/deep/.el-input__inner {
width: 240px;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue
index bf09afbdb..a1ebf2a90 100644
--- a/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step3.vue
@@ -265,17 +265,17 @@
:on-remove="(res, file, fileList) => handleRemoveFile(item, res, file, fileList)"
:on-success="(res, file, fileList) => handleUploadSuccess(item, res, file, fileList)"
ref="importFileAboutStand">
- 点击上传
+ 点击上传
@@ -250,7 +250,7 @@
class="common-button-default"
icon="el-icon-close"
@click="submitProcess(item, false)">驳回
-
+
- 点击上传
+ 点击上传
@@ -414,7 +414,7 @@
@@ -2674,7 +2674,6 @@ export default {
}
.myBox {
border: 1px solid #ccc;
- border-radius: 4px;
.mycheck {
margin-right: 10px;
}
@@ -2917,9 +2916,6 @@ export default {
}
}
/deep/ .search-item {
- .el-input__inner {
- border-radius: 4px !important;
- }
.el-input__icon {
line-height: 30px;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue b/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue
index 754cfbad8..97c1e0eaa 100644
--- a/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue
+++ b/src/pages/processCenter/pages/createProcess/components/ruKu/step5.vue
@@ -232,7 +232,7 @@
disabled
ref="importFileAboutStand"
:on-preview="handlePreviewFile">
- 点击上传
+ 点击上传
@@ -247,7 +247,7 @@
class="common-button-default"
icon="el-icon-close"
@click="submitProcess(item, false)">驳回
-
+
- 点击上传
+ 点击上传
@@ -412,7 +412,7 @@
@@ -2780,7 +2780,6 @@ export default {
}
.myBox {
border: 1px solid #ccc;
- border-radius: 4px;
.mycheck {
margin-right: 10px;
}
@@ -3018,9 +3017,6 @@ export default {
}
}
/deep/ .search-item {
- .el-input__inner {
- border-radius: 4px !important;
- }
.el-input__icon {
line-height: 30px;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue
index 107a7c38c..6a548dbc0 100644
--- a/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step1.vue
@@ -464,7 +464,7 @@
@@ -585,7 +585,7 @@
@@ -2260,7 +2260,6 @@ export default {
border: 1px solid #e5e5e5;
/deep/.el-input__inner{
margin: 5px 0;
- border-radius: 15px;
}
/deep/.table-row-background{
background: #ecf7ff;
diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step2.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step2.vue
index a37c0b485..6fe3ecce2 100644
--- a/src/pages/processCenter/pages/createProcess/components/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step2.vue
@@ -953,7 +953,6 @@ export default {
border: 1px solid #e5e5e5;
/deep/.el-input__inner{
margin: 5px 0;
- border-radius: 15px;
}
/deep/.table-row-background{
background: #ecf7ff;
diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue
index ba741c030..e6304bad3 100644
--- a/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue
+++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step3-validate-copy.vue
@@ -259,7 +259,7 @@
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
-
+
点击上传
@@ -271,7 +271,7 @@
v-if="approvalHistory.length"
>
@@ -390,7 +390,7 @@
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
-
+
点击上传
@@ -403,9 +403,9 @@
v-if="approvalHistory.length"
>
@@ -540,7 +540,7 @@
@@ -1322,7 +1322,6 @@ export default {
.myBox {
margin-bottom: 10px;
border: 1px solid #ccc;
- border-radius: 4px;
&:last-child {
margin-bottom: 0;
}
@@ -1394,7 +1393,7 @@ export default {
margin-bottom: 25px;
}
/deep/.el-textarea__inner {
- //border-radius: 15px;
+ //15px;
}
/deep/.el-input__inner {
width: 140px;
@@ -1455,9 +1454,6 @@ export default {
align-items: center;
display: flex;
}
- /deep/.el-input__inner{
- border-radius: 0;
- }
}
}
}
@@ -1475,4 +1471,4 @@ export default {
}
}
}
-
\ No newline at end of file
+
diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue
index d932aa9a0..f8af7345d 100644
--- a/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step3.vue
@@ -233,7 +233,7 @@
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
-
+
点击上传
@@ -246,9 +246,9 @@
v-if="approvalHistory.length"
>
@@ -370,7 +370,7 @@
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
-
+
点击上传
@@ -383,9 +383,9 @@
v-if="approvalHistory.length"
>
@@ -521,7 +521,7 @@
@@ -1448,7 +1448,6 @@ export default {
.myBox {
//margin-bottom: 10px;
border: 1px solid #ccc;
- border-radius: 4px;
.mycheck {
margin-right: 10px;
}
@@ -1516,7 +1515,7 @@ export default {
margin-bottom: 25px;
}
/deep/.el-textarea__inner {
- //border-radius: 15px;
+ //15px;
}
/deep/.el-input__inner {
width: 140px;
@@ -1578,7 +1577,6 @@ export default {
display: flex;
}
/deep/.el-input__inner{
- border-radius: 0;
}
}
}
diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue
index c788fbc33..122ea10ee 100644
--- a/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step4.vue
@@ -388,8 +388,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue b/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue
index 283e4f057..32bae3817 100644
--- a/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/createProcess/components/xmpg/step5.vue
@@ -401,8 +401,8 @@
diff --git a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue
index af9b10590..2dd00acb8 100644
--- a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1-1.vue
@@ -258,7 +258,7 @@
@@ -1272,7 +1272,6 @@ export default {
/deep/.el-input__inner{
height: 30px !important;
line-height: 30px;
- border-radius: 15px;
}
/deep/.table-row-background{
background: #ecf7ff;
diff --git a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue
index 3a4ceacfd..3965d156b 100644
--- a/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zcjspg/step1.vue
@@ -247,7 +247,7 @@
@@ -1341,7 +1341,6 @@ export default {
/deep/.el-input__inner{
height: 30px !important;
line-height: 30px;
- border-radius: 15px;
}
/deep/.table-row-background{
background: #ecf7ff;
diff --git a/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue b/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue
index 6bcf3ab79..e5aac9fc5 100644
--- a/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zcjspg/step2.vue
@@ -930,9 +930,6 @@ export default {
.bead-input {
width: 100%;
- /deep/ .el-input__inner {
- border-radius: 20px !important;
- }
}
.demo-table-expand {
@@ -952,9 +949,6 @@ export default {
.feedback {
padding: 18px 15px 20px 0;
- /deep/ .el-textarea__inner {
- border-radius: 5px !important;
- }
/deep/ .el-form-item {
margin-bottom: 0;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue
index 44089b167..91e062219 100644
--- a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step1.vue
@@ -1942,7 +1942,6 @@ export default {
font-size: 14px;
color: #409EFF;
border: 1px solid #409EFF;
- border-radius: 15px;
background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue
index 2c5098681..f2aacf718 100644
--- a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step2.vue
@@ -784,9 +784,6 @@ export default {
.bead-input {
width: 100%;
- /deep/ .el-input__inner {
- border-radius: 20px !important;
- }
}
.demo-table-expand {
@@ -806,9 +803,6 @@ export default {
.feedback {
padding: 18px 15px 20px 0;
- /deep/ .el-textarea__inner {
- border-radius: 5px !important;
- }
/deep/ .el-form-item {
margin-bottom: 0;
}
diff --git a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue
index 68a9cee14..9f66de205 100644
--- a/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zcrk&jspg/step3.vue
@@ -1018,9 +1018,6 @@ export default {
.bead-input {
width: 100%;
- /deep/ .el-input__inner {
- border-radius: 20px !important;
- }
}
.demo-table-expand {
@@ -1041,7 +1038,6 @@ export default {
.feedback {
padding: 18px 15px 20px 0;
/deep/ .el-textarea__inner {
- border-radius: 5px !important;
}
/deep/ .el-form-item {
margin-bottom: 0;
diff --git a/src/pages/processCenter/pages/createProcess/components/zg/step1.vue b/src/pages/processCenter/pages/createProcess/components/zg/step1.vue
index 757d1d0f4..0684660f4 100644
--- a/src/pages/processCenter/pages/createProcess/components/zg/step1.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zg/step1.vue
@@ -241,7 +241,7 @@
@@ -791,7 +791,6 @@ export default {
.typebox {
.typeitem {
border: 1px solid #f4f4f4;
- border-radius: 5px;
padding: 10px 10px 0;
margin: 10px 0;
display: flex;
diff --git a/src/pages/processCenter/pages/createProcess/components/zg/step8.vue b/src/pages/processCenter/pages/createProcess/components/zg/step8.vue
index ff5104c1b..c0944590e 100644
--- a/src/pages/processCenter/pages/createProcess/components/zg/step8.vue
+++ b/src/pages/processCenter/pages/createProcess/components/zg/step8.vue
@@ -136,7 +136,6 @@
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index bdabc39ae..408a5d666 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -255,7 +255,6 @@ export default {
margin-bottom: 10px;
text-align: center;
border: 1px dashed #ddd;
- border-radius: 3px;
background: #fdfdfd;
font-size: 18px;
font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif;
diff --git a/src/pages/processCenter/pages/newProcess/index_new.vue b/src/pages/processCenter/pages/newProcess/index_new.vue
index 1ccd03ed4..2931b971b 100644
--- a/src/pages/processCenter/pages/newProcess/index_new.vue
+++ b/src/pages/processCenter/pages/newProcess/index_new.vue
@@ -348,7 +348,6 @@ export default {
margin-bottom: 10px;
text-align: center;
border: 1px dashed #ddd;
- border-radius: 3px;
background: #fdfdfd;
font-size: 18px;
font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif;
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 0245f1c65..53d4ca8cb 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -128,8 +128,8 @@
diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue
index fe2672ba8..6ef498a90 100644
--- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle.vue
@@ -178,18 +178,18 @@
-
+
{{ form.file.length > 0 ? '查看已上传文件': '上传文件' }}
- 取消
- 退回
- 保存
-
- 提交
+ 取消
+ 退回
+ 保存
+
+ 提交
@@ -307,18 +307,18 @@
-
+
{{ form.file.length > 0 ? '查看已上传文件': '上传文件' }}
- 取消
- 退回
- 保存
-
- 提交
+ 取消
+ 退回
+ 保存
+
+ 提交
@@ -366,8 +366,8 @@
{{ ItemText }}
- 取 消
- 确 定
+ 取 消
+ 确 定
@@ -389,7 +389,6 @@
- 点击上传
+ 点击上传
@@ -1627,7 +1626,6 @@ export default {
.block-input {
/deep/ .el-input__inner {
width: 100% !important;
- border-radius: 0;
}
}
.myFileButton {
@@ -1636,7 +1634,6 @@ export default {
display: flex;
align-items: center;
justify-content: center;
- border-radius: 0;
}
.file-box{
padding: 0 10px;
@@ -1718,7 +1715,6 @@ export default {
overflow: auto;
.myBox {
border: 1px solid #ccc;
- border-radius: 4px;
.mycheck {
margin-right: 10px;
}
@@ -1795,7 +1791,6 @@ export default {
}
/deep/.el-input__inner {
width: 240px;
- border-radius: 0;
}
}
.myBoxItemH {
diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue
index aa552a461..2e4870a80 100644
--- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle1.vue
@@ -34,12 +34,10 @@
批量编辑
新增
技术评估
@@ -243,7 +241,7 @@
@@ -280,7 +278,7 @@
@@ -303,7 +301,7 @@
@@ -317,8 +315,8 @@
- 取 消
- 确 定
+ 取 消
+ 确 定
@@ -332,8 +330,8 @@
- 取 消
- 确 定
+ 取 消
+ 确 定
@@ -2115,7 +2113,6 @@
}
/deep/.el-input__inner {
margin: 5px 0;
- border-radius: 15px;
}
}
.myfoot {
diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue
index beb526471..681a7568a 100644
--- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle2.vue
@@ -42,7 +42,7 @@
批量同意
+ >批量同意
@@ -83,7 +83,7 @@
-
+
@@ -190,8 +190,8 @@
- 不同意
- 同意
+ 不同意
+ 同意
@@ -223,7 +223,7 @@
-
+
@@ -330,8 +330,8 @@
- 不同意
- 同意
+ 不同意
+ 同意
@@ -365,8 +365,8 @@
{{ ItemText }}
- 取 消
- 确 定
+ 取 消
+ 确 定
@@ -529,16 +529,16 @@
moreFileClick () { // 点击文本附件、车型项目更多事件
this.isFileDrawer = true
},
- handlePreview (item) { // 点击跳转标准详情
- let routeUrl = this.$router.resolve({
- name: 'OtherStandardDetails',
- params: {
- id: item.resId,
- pageType: item.resType
- }
- })
- window.open(routeUrl.href, '_blank')
- },
+ // handlePreview (item) { // 点击跳转标准详情
+ // let routeUrl = this.$router.resolve({
+ // name: 'OtherStandardDetails',
+ // params: {
+ // id: item.resId,
+ // pageType: item.resType
+ // }
+ // })
+ // window.open(routeUrl.href, '_blank')
+ // },
parentSubmit (item, type) {
const next =() => {
let json = {...item}
@@ -583,7 +583,7 @@
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
next()
})
@@ -639,7 +639,7 @@
cancelButtonText: '取消',
type: 'warning',
confirmButtonClass: 'common-button-primary',
- roundButton: true
+ roundButton: false
}).then(() => {
next()
})
@@ -695,7 +695,6 @@
.block-input {
/deep/ .el-input__inner {
width: 100% !important;
- border-radius: 0;
}
}
.see-drawer-val {
@@ -785,7 +784,6 @@
flex-direction: column;
.myBox {
border: 1px solid #ccc;
- border-radius: 4px;
.mycheck {
margin-right: 10px;
}
@@ -862,7 +860,6 @@
}
/deep/.el-input__inner {
width: 240px;
- border-radius: 0;
}
}
.myBoxItemH {
diff --git a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue
index 4099a8fe7..3265167df 100644
--- a/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/dealWith/handle3.vue
@@ -81,8 +81,8 @@
-
-
+
+
@@ -218,7 +218,7 @@
-
+
@@ -359,8 +359,8 @@
{{ ItemText }}
- 取 消
- 确 定
+ 取 消
+ 确 定
@@ -448,16 +448,16 @@
})
},
// 点击查看
- handlePreview (item) {
- let routeUrl = this.$router.resolve({
- name: 'OtherStandardDetails',
- params: {
- id: item.resId,
- pageType: item.resType
- }
- })
- window.open(routeUrl.href, '_blank')
- },
+ // handlePreview (item) {
+ // let routeUrl = this.$router.resolve({
+ // name: 'OtherStandardDetails',
+ // params: {
+ // id: item.resId,
+ // pageType: item.resType
+ // }
+ // })
+ // window.open(routeUrl.href, '_blank')
+ // },
seeitems (indexs, index, items, item) {
this.List[index].itemsList[indexs].seeopen = !this.List[index].itemsList[indexs].seeopen
if (this.List[index].itemsList[indexs].seeopen === true) {
@@ -590,7 +590,6 @@
.block-input {
/deep/ .el-input__inner {
width: 100% !important;
- border-radius: 0;
}
}
.see-drawer-val {
@@ -680,7 +679,6 @@
flex-direction: column;
.myBox {
border: 1px solid #ccc;
- border-radius: 4px;
.mycheck {
margin-right: 10px;
}
@@ -750,7 +748,6 @@
}
/deep/.el-input__inner {
width: 240px;
- border-radius: 0;
}
}
.myBoxItemH {
diff --git a/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue b/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue
index 6a3066afb..f8f4e63e0 100644
--- a/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/processDetailDetails/index.vue
@@ -486,7 +486,6 @@ export default {
padding: 5px;
cursor: pointer;
font-size: 16px;
- border-radius: 9px;
margin-bottom: 10px;
position: relative;
&:hover{
diff --git a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue
index 29ad28036..68dc2e33d 100644
--- a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details11.vue
@@ -220,7 +220,6 @@ export default {
&:hover{
cursor: pointer;
background: rgba(255,255,255,.25);
- border-radius: 2px;
}
}
}
diff --git a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue
index 87b80ae2d..2d4643bea 100644
--- a/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue
+++ b/src/pages/processCenter/pages/processDetail/pages/processDetails/pages/Details12.vue
@@ -218,7 +218,6 @@ export default {
&:hover{
cursor: pointer;
background: rgba(255,255,255,.25);
- border-radius: 2px;
}
}
}
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index de3fb9093..cf9862856 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -355,7 +355,6 @@ export default {
width: 12px;
height: 12px;
margin-right: 8px;
- border-radius: 50%;
//background: #e8eaec;
position: relative;
top: 1px;
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index 1f5f91ce7..380d1c7e8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -375,7 +375,6 @@ export default {
width: 12px;
height: 12px;
margin-right: 8px;
- border-radius: 50%;
//background: #e8eaec;
position: relative;
top: 1px;
diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
index 53cd22da4..cea6349ab 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
@@ -339,7 +339,6 @@ export default {
width: 12px;
height: 12px;
margin-right: 8px;
- border-radius: 50%;
//background: #e8eaec;
position: relative;
top: 1px;
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index dcf796c48..698f9ee7f 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -1197,7 +1197,6 @@ export default {
width: 12px;
height: 12px;
margin-right: 8px;
- border-radius: 50%;
//background: #e8eaec;
position: relative;
top: 1px;
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 01810b668..a0286af9d 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -522,7 +522,6 @@ export default {
width: 12px;
height: 12px;
margin-right: 8px;
- border-radius: 50%;
//background: #e8eaec;
position: relative;
top: 1px;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index aafa70961..d683c5072 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -1,627 +1,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 高级查询
-
-
-
-
-
- 新增
- 批量删除
-
-
-
-
-
-
-
-
-
- {{ scope.row.accessContent }}
-
-
-
-
- 未发布
- 已发布
-
-
-
-
- V{{ scope.row.version }}
-
-
-
-
- {{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
-
-
-
-
-
-
-
-
-
-
- 查看
- 编辑
- 删除
-
-
-
-
-
-
-
-
数据获取中
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -629,46 +60,31 @@ export default {
@import '~@/assets/styles/style';
@import '~@/assets/styles/mixins';
#accessStandardsAndRegulations {
- height: 100%;
- display: flex;
- flex-direction: column;
- .container {
+ height: 100%;
+ padding: 0 10px;
+ background: #fff;
display: flex;
flex-direction: column;
- position: relative;
- flex: auto;
- width: 100%;
- //height: calc(~'100% - 105px - 56px') !important;
- .pagination {
- position: static;
- /deep/ .pagination-slot {
- padding: 0;
- }
+ /deep/.el-tabs{
+ flex: auto;
+ display: flex;
+ flex-direction: column;
+ /deep/ .el-tabs__header{
+ margin:0 !important;
+ }
+ .el-tabs__content {
+ height: 100% !important;
+ flex: auto;
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ .el-tab-pane {
+ height: 100%;
+ flex: auto;
+ display: flex;
+ flex-direction: column;
+ }
+ }
}
- }
- .el-divider{
- .el-divider__text{
- font-size: 16px;
- color: #0c91e5;
- }
- }
- .standards-drawer-table-one{
- position: relative;
- height: 350px;
- .pagination{
- bottom: 0;
- }
- }
- .standards-drawer-table{
- margin-top: 10px;
- }
- .see-drawer{
- .searchAngNewBtn{
- float: right;
- }
- .el-divider{
- clear: both;
- }
- }
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
new file mode 100644
index 000000000..42cce532f
--- /dev/null
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -0,0 +1,676 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 高级查询
+
+
+
+
+
+
+ 新增
+ 批量删除
+
+
+
+
+
+
+
+
+
+ {{ scope.row.accessContent }}
+
+
+
+
+ 未发布
+ 已发布
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ {{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
数据获取中
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
new file mode 100644
index 000000000..2af54d069
--- /dev/null
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -0,0 +1,661 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 高级查询
+
+
+
+
+
+
+ 新增
+ 批量删除
+
+
+
+
+
+
+
+
+
+ {{ scope.row.accessContent }}
+
+
+
+
+ 未发布
+ 已发布
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ {{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
数据获取中
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
new file mode 100644
index 000000000..596cd2efa
--- /dev/null
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -0,0 +1,667 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 高级查询
+
+
+
+
+
+
+ 新增
+ 批量删除
+
+
+
+
+
+
+
+
+
+ {{ scope.row.accessContent }}
+
+
+
+
+ 未发布
+ 已发布
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ {{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
数据获取中
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
new file mode 100644
index 000000000..18d6d042e
--- /dev/null
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -0,0 +1,661 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 高级查询
+
+
+
+
+
+
+ 新增
+ 批量删除
+
+
+
+
+
+
+
+
+
+ {{ scope.row.accessContent }}
+
+
+
+
+ 未发布
+ 已发布
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ V{{ scope.row.version }}
+
+
+
+
+ {{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
数据获取中
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index f96306210..2c4a756c1 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -53,7 +53,7 @@
:on-success="uploadBackSuccess"
:before-upload="beforeUpload"
>
-
+
点击上传
@@ -143,7 +143,7 @@
icon="el-icon-search"
type="primary"
class="common-button-primary"
- round
+ size="small"
@click="searchLawsStands">
@@ -151,7 +151,7 @@
@@ -168,7 +168,10 @@
@click="moreSearch">{{$t('m.hideMultiAttributeSearch')}}
-->
- 高级查询
+
+
+ 高级查询
+
添加
+ size="mini" @click="addSarAccess">添加
{{$t('m.showAddDataList')}}
新增
+
+
+
+
编辑
- 上移
下移
- 导入
- 导出
- 模板下载
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
删除
-
-
-
-
-
+
-
-
+
-
- {{ scope.row.code }}
- {{ scope.row.code }}
-
-
-
+ {{ scope.row.code }}
+ {{ scope.row.code }}
+
+
+
-
- {{ scope.row.name }}
- {{ scope.row.name }}
-
-
-
+
+ {{ scope.row.name }}
+ {{ scope.row.name }}
+
+
+
-
- {{ scope.row.enName }}
- {{ scope.row.enName }}
-
-
-
+ {{ scope.row.enName }}
+ {{ scope.row.enName }}
+
+
+
-
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
-
-
- {{ getAskNature(scope.row.askNature) }}
-
-
-
-
- {{ getApplyArctic(scope.row.applyArctic) }}
-
-
-
+
+
+
+
+
+
+ {{ getAskNature(scope.row.askNature) }}
+
+
+
+
+ {{ getApplyArctic(scope.row.applyArctic) }}
+
+
+
-
- {{ scope.row.ZRBMName || scope.row.zrbmname || '' }}
-
-
-
-
- {{ scope.row.XGBMName || scope.row.xgbmname || '' }}
-
-
-
+ {{ scope.row.ZRBMName || scope.row.zrbmname || '' }}
+
+
+
+
+ {{ scope.row.XGBMName || scope.row.xgbmname || '' }}
+
+
+
-
- {{ scope.row.FOName || scope.row.foname || '' }}
-
-
-
+ {{ scope.row.FOName || scope.row.foname || '' }}
+
+
+
-
-
-
-
-
- {{ getGXHBQ(scope.row.GXHBQ || scope.row.gxhbq) }}
-
-
-
-
- {{ getAskType(scope.row.askType) }}
-
-
-
-
-
-
-
-
- 入库
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.code }}
- {{ scope.row.code }}
-
-
-
-
- {{ scope.row.name }}
- {{ scope.row.name }}
-
-
-
-
- {{ scope.row.enName }}
- {{ scope.row.enName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getAskNature(scope.row.askNature) }}
-
-
-
-
- {{ getApplyArctic(scope.row.applyArctic) }}
-
-
-
-
- {{ scope.row.ZRBMName || scope.row.zrbmname || '' }}
-
-
-
-
- {{ scope.row.XGBMName || scope.row.xgbmname || '' }}
-
-
-
-
- {{ scope.row.FOName || scope.row.foname || '' }}
-
-
-
-
-
-
-
-
- {{ getGXHBQ(scope.row.GXHBQ || scope.row.gxhbq) }}
-
-
-
-
- {{ getAskType(scope.row.askType) }}
-
-
-
-
-
-
-
-
- 入库
-
-
-
-
-
-
-
-
-
+ show-overflow-tooltip
+ label="文本说明">
+
+
+
+ {{ getGXHBQ(scope.row.GXHBQ || scope.row.gxhbq) }}
+
+
+
+
+ {{ getAskType(scope.row.askType) }}
+
+
+
+
+
+
+
+
+ 入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -779,7 +969,7 @@
@@ -1047,7 +1237,7 @@
@@ -1338,8 +1528,8 @@
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 9a12b5a4d..6412cd36d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -11,10 +11,6 @@
-
-
-
-
{{ sarAccessEO.countryShow }}
@@ -36,7 +32,6 @@
class="icon-download"
v-btn-permission="'E5QPKLR9CFVXTV64N32C'"
/>
-
-
-
-
-
-
-
-
-
@@ -87,18 +75,18 @@
-
+
-
+
导出
- 高级查询
+ 高级查询
-
-
-
-
-
+
-
-
+
-
- {{ scope.row.code }}
- {{ scope.row.code }}
-
-
-
+ {{ scope.row.code }}
+ {{ scope.row.code }}
+
+
+
-
- {{ scope.row.name }}
- {{ scope.row.name }}
-
-
-
+
+ {{ scope.row.name }}
+ {{ scope.row.name }}
+
+
+
-
- {{ scope.row.enName }}
- {{ scope.row.enName }}
-
-
-
+ {{ scope.row.enName }}
+ {{ scope.row.enName }}
+
+
+
-
-
+
+
-
-
+
+
-
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.ZRBMName || scope.row.zrbmname || '' }}
+
+
+
+
+ {{ scope.row.XGBMName || scope.row.xgbmname || '' }}
+
+
+
+
+ {{ scope.row.FOName || scope.row.foname || '' }}
+
+
+
+
+
+
+
+
+ {{ scope.row.GXHBQName || scope.row.gxhbqName || '' }}
+
+
+
+
+
+
+
+ 评估中
+ 已评估
+
+
+
+ N/A
+
+
+
+
+
+ 待验证
+ 符合
+ 不符合
+ 部分符合
+ 不涉及
+ 评估中
+ 整改中
+ 未评估
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+

+
+
+
+
+
+
+
+
+

+
+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -202,468 +718,187 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.ZRBMName || scope.row.zrbmname || '' }}
-
-
-
-
- {{ scope.row.XGBMName || scope.row.xgbmname || '' }}
-
-
-
-
- {{ scope.row.FOName || scope.row.foname || '' }}
-
-
-
-
-
-
-
-
- {{ scope.row.GXHBQName || scope.row.gxhbqName || '' }}
-
-
-
-
-
-
-
- 评估中
- 已评估
-
-
-
- N/A
-
-
-
-
-
- 待验证
- 符合
- 不符合
- 部分符合
- 不涉及
- 评估中
- 整改中
- 未评估
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-

-
-
-
-
-
-
-
-
-

-
-
-
-
-

-
-
-
-

-
-
-
-

-
-
-
-

-
-
-
-

-
-
-
-
-
-
-
-
数据获取中
-
-
-
-
-
-
-
-
-
- {{ scope.row.code }}
- {{ scope.row.code }}
-
-
-
-
- {{ scope.row.name }}
- {{ scope.row.name }}
-
-
-
-
- {{ scope.row.enName }}
- {{ scope.row.enName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.ZRBMName || scope.row.zrbmname || '' }}
-
-
-
-
- {{ scope.row.XGBMName || scope.row.xgbmname || '' }}
-
-
-
-
- {{ scope.row.FOName || scope.row.foname || '' }}
-
-
-
-
-
-
-
-
- {{ scope.row.GXHBQName || scope.row.gxhbqName || '' }}
-
-
-
-
-
-
-
- 评估中
- 已评估
-
-
-
- N/A
-
-
-
-
-
- 待验证
- 符合
- 不符合
- 部分符合
- 不涉及
- 评估中
- 整改中
- 未评估
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-

-
-
-
-

-
-
-
-
-
-
-
-
-

-
-
-
-
-

-
-
-
-

-
-
-
-

-
-
-
-

-
-
-
-

-
-
-
-
-
-
-
-
-
数据获取中
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -674,7 +909,7 @@
@@ -697,7 +932,7 @@
@@ -715,8 +950,8 @@
{{$t('m.dataAcquisition')}}
@@ -1553,6 +1788,7 @@ export default {
let accessRow = JSON.parse(sessionStorage.getItem('accessRow'))
this.sarAccessEO = accessRow
this.getFileInfo()
+ console.log('1818', this.selectInfobyAccid());
})
// 从数据库中查询各下拉框数据
@@ -1687,7 +1923,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index df0e005d4..cb12ad4c3 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -41,7 +41,7 @@
-
+
+ 搜索
- 高级查询
+ @click="clearAllSearch('standCommonlySearch')">清空
+ 高级检索
@@ -85,18 +84,18 @@
新增
导入
导出
@@ -105,19 +104,21 @@
批量删除
移除标准
模板下载
配置标准
@@ -132,7 +133,7 @@
height="100%"
:row-class-name="dragRowClassName"
@sort-change="sortChange"
- :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="standSelectChange">
@@ -513,9 +514,9 @@
@@ -600,8 +601,8 @@
-
-
+
+
@@ -718,10 +719,10 @@
placeholder="根据标准号/名称查找" clearable/>
-
+
-
+
@@ -793,13 +794,13 @@
@@ -823,8 +824,8 @@
@@ -841,8 +842,8 @@
@@ -854,16 +855,79 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+
{
this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, {
_this: this, loading: 'loading'
@@ -1810,6 +1873,7 @@ export default {
},
// 高级检索
selectMoreBtn () {
+ console.log('检索窗口')
this.isAdvancedSearch = true
this.threeOptions = []
},
@@ -1907,7 +1971,7 @@ export default {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
- roundButton: true,
+ roundButton: false,
type: 'warning'
}).then(() => {
this.$http.post('lawss/sarMenu/deleteMenuAndChildren', this.selectSarMenu, {
@@ -2184,7 +2248,7 @@ export default {
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
type: 'warning',
- roundButton: true
+ roundButton: false
}).then(() => {
this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: itemid}, {
_this: this,
@@ -2208,7 +2272,7 @@ export default {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
- roundButton: true,
+ roundButton: false,
type: 'warning'
})
} else {
@@ -2217,7 +2281,7 @@ export default {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
- roundButton: true,
+ roundButton: false,
type: 'warning'
}).then(() => {
this.$http.post('lawss/sarStandardsInfo/deleteSarStandards', {ids: this.selectedList.join(',')}, {
@@ -2429,7 +2493,8 @@ export default {
formData.standType = 'INLAND'
this.SarExportSearchEo = formData
this.loading = true
- this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', formData, {
+ console.log(2496)
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
}, res => {
this.isAdvancedSearch = false
@@ -3043,7 +3108,7 @@ export default {
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
type: 'warning',
- roundButton: true
+ roundButton: false
}).then(() => {
search.idlist.push(item)
this.$http.putData('lawss/sarStandMenu/removeStandInfo', search, {
@@ -3064,7 +3129,7 @@ export default {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
- roundButton: true,
+ roundButton: false,
type: 'warning'
}).then(() => {
for (let i = 0; i < this.selectedList.length; i++) {
@@ -3548,7 +3613,8 @@ export default {
},
async mounted () {
// 进入页面后查询树形结构目录
- await this.selectMenu()
+ // await this.selectMenu()
+
this.treeReload = true
// 从数据库中查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -3694,12 +3760,32 @@ export default {
padding-top: 11px;
}
-::v-deep .el-drawer__header{
+::v-deep .el-drawer__header {
&>span:first-child{
outline: none!important;
}
}
-::v-deep .el-drawer{
+::v-deep .el-drawer {
outline: none!important;
}
+.label-input-form {
+ &.table-lattice{
+ /deep/.el-form-item__label {
+ width:100px;
+ height:30px;
+ border: 1px solid #DCDFE6;
+ border-right: none;
+ line-height:30px;
+ text-align: center;
+ margin-top: 6px;
+ background: #F9F9F9;
+ }
+ /deep/.el-input__inner {
+ height: 30px;
+ line-height: 30px;
+ border-radius: 0 !important;
+ }
+ }
+}
+
diff --git a/src/pages/regulatoryRepository/dyInformation/index.vue b/src/pages/regulatoryRepository/dyInformation/index.vue
index 24b921c09..378d27d2e 100644
--- a/src/pages/regulatoryRepository/dyInformation/index.vue
+++ b/src/pages/regulatoryRepository/dyInformation/index.vue
@@ -50,7 +50,7 @@
@click="querySearchWords"
>查询
- 清空
+ 清空
@@ -309,7 +309,6 @@ export default {
position: relative;
height: 100%;
border: 1px solid #ddd;
- border-radius: 5px;
overflow-x: auto;
.substance {
position: relative;
diff --git a/src/pages/regulatoryRepository/dynamicInformation/index.vue b/src/pages/regulatoryRepository/dynamicInformation/index.vue
index c2719d9d3..9f7ca7d14 100644
--- a/src/pages/regulatoryRepository/dynamicInformation/index.vue
+++ b/src/pages/regulatoryRepository/dynamicInformation/index.vue
@@ -52,7 +52,7 @@
@click="getSearch"
>查询
- 清空
+ 清空
@@ -549,7 +549,6 @@ export default {
position: relative;
height: 100%;
border: 1px solid #ddd;
- border-radius: 5px;
overflow-x: auto;
.substance {
position: relative;
diff --git a/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue b/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue
index 8c962cfbb..596c2d4a4 100644
--- a/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue
+++ b/src/pages/regulatoryRepository/dynamicInformation/indexMore.vue
@@ -55,7 +55,7 @@
@click="querySearchWords"
>查询
- 清空
+ 清空
@@ -342,7 +342,6 @@ export default {
position: relative;
height: 100%;
border: 1px solid #ddd;
- border-radius: 5px;
overflow-x: auto;
.substance {
position: relative;
diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue
index be71d717a..a04adaa71 100644
--- a/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue
+++ b/src/pages/regulatoryRepository/dynamicInformation/pages/QueryDynamicInformation.vue
@@ -50,7 +50,7 @@
@click="querySearchWords"
>查询
- 清空
+ 清空
@@ -307,7 +307,6 @@ export default {
position: relative;
height: 100%;
border: 1px solid #ddd;
- border-radius: 5px;
overflow-x: auto;
.substance {
position: relative;
diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue
index 913aabd68..7ae4c289d 100644
--- a/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue
+++ b/src/pages/regulatoryRepository/dynamicInformation/pages/components/DomesticDynamics.vue
@@ -114,7 +114,6 @@
font-style: italic;
width: 20px;
height: 20px;
- border-radius: 50%;
font-size: 12px;
.flex();
justify-content: center;
diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue
index aeba10ee2..66be4c244 100644
--- a/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue
+++ b/src/pages/regulatoryRepository/dynamicInformation/pages/components/InternationalDynamics.vue
@@ -85,7 +85,6 @@
font-style: italic;
width: 20px;
height: 20px;
- border-radius: 50%;
font-size: 12px;
.flex();
justify-content: center;
diff --git a/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue b/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue
index 2cfd89394..015ebbcac 100644
--- a/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue
+++ b/src/pages/regulatoryRepository/dynamicInformation/pages/components/pages/informationCenterPages/InformationNotice.vue
@@ -191,7 +191,6 @@ export default {
font-style: italic;
width: 20px;
height: 20px;
- border-radius: 50%;
font-size: 12px;
.flex();
justify-content: center;
diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue
index 81d7bdbf0..ccc47594e 100644
--- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue
+++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/components/ProcessSearchStand.vue
@@ -20,7 +20,7 @@
手动查找
@@ -50,7 +50,6 @@
icon="el-icon-search"
type="primary"
class="common-button-primary"
- round
@click="getReplaceLawsNumRow">
@@ -58,7 +57,6 @@
@@ -129,8 +127,8 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace">
diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
index 781839803..d134c484c 100644
--- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
+++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
@@ -1064,7 +1064,7 @@
手动查找
@@ -1465,7 +1465,7 @@
@@ -1537,7 +1537,7 @@
@@ -741,7 +741,7 @@
@click="saveConfigStand"
:loading="isSubmit"
>提交
- 取消
+ 取消
@@ -767,7 +767,7 @@
@@ -778,8 +778,8 @@
>
该节点下有记录,是否删除?
- 取消
- 确定
+ 取消
+ 确定
@@ -790,7 +790,7 @@
@@ -809,7 +809,7 @@
diff --git a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
index c17ac9c1f..465d26143 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
@@ -404,8 +404,8 @@
@@ -447,7 +447,7 @@
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index b948e0c0e..378319852 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -260,7 +260,7 @@
该节点下有记录,是否删除?
- {{$t('m.cancel')}}
+ {{$t('m.cancel')}}
{{$t('m.sure')}}
@@ -312,7 +312,7 @@
@@ -524,8 +524,8 @@
@@ -556,7 +556,7 @@
@@ -778,7 +778,7 @@
@click="saveConfigLawsInfo"
:loading="isSubmit"
>{{$t('m.submit')}}
- {{$t('m.cancel')}}
+ {{$t('m.cancel')}}
@@ -867,7 +867,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace">
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index f9fb9b940..40f8760f3 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -246,7 +246,7 @@
@@ -499,8 +499,8 @@
@@ -694,7 +694,7 @@
@pageChange="pageChangeItems"
@pageSizeChange="pageSizeChangeItems">
@@ -813,7 +813,7 @@
@@ -845,7 +845,7 @@
:loading="isSubmit"
@click="newMenu"
>提交
- 取消
+ 取消
@@ -871,7 +871,7 @@
@@ -3750,23 +3750,18 @@ export default {
color: #ffffff;
background: #409EFF;
border: none;
- border-radius: 20px;
}
.advancedSearch-btn-reduce{
padding: 12px 12px;
color: #999;
background: #fff;
border: 1px solid #DCDFE6;
- border-radius: 20px;
}
button.el-button.advancedSearch-btn-reduce.el-button--default{
margin-left: 0;
}
.advance-dialog {
.advance-dialog-form{
- /deep/input.el-input__inner{
- border-radius: 20px;
- }
}
}
}
diff --git a/src/pages/regulatoryRepository/information/index2.vue b/src/pages/regulatoryRepository/information/index2.vue
index afec2042b..be98873dd 100644
--- a/src/pages/regulatoryRepository/information/index2.vue
+++ b/src/pages/regulatoryRepository/information/index2.vue
@@ -95,8 +95,8 @@
@@ -137,7 +137,7 @@
@@ -549,7 +549,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i{
@@ -702,7 +701,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 760f9d2e6..f2f82ff0f 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -12,14 +12,6 @@
clearable
>
-
高级查询
@@ -71,42 +63,8 @@
-
- 新增
-
- 批量删除
-
-
-
-
-
-
-
- 导出项目标准关系
- 项目信息同步
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.productName }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.leftRight === '1' ? '左驾': '右驾')}}
-
-
-
-
-
-
- {{(scope.row.eopTime ? scope.row.eopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
- 编辑
-
- 删除
-
-
-
-
-
-
-
-
- 数据获取中
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.productName }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.leftRight === '1' ? '左驾': '右驾')}}
-
-
-
-
-
-
- {{(scope.row.eopTime ? scope.row.eopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
- 编辑
- 关联
- 删除
-
-
-
-
-
-
-
-
- 数据获取中
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.productName }}
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.leftRight === '1' ? '左驾': '右驾')}}
-
-
-
-
-
-
- {{(scope.row.eopTime ? scope.row.eopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
- 查看
- 编辑
-
- 删除
-
-
-
-
-
-
-
-
- 数据获取中
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.productName }}
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{(scope.row.leftRight === '1' ? '左驾': '右驾')}}
-
-
-
-
-
-
- {{(scope.row.eopTime ? scope.row.eopTime.substring(0, 11): '')}}
-
-
-
-
-
-
-
-
-
-
-
- 查看
- 编辑
- 关联
- 删除
-
-
-
-
-
-
-
-
- 数据获取中
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ scope.row.productName }}
+
+
+
+
+
+
+
+ {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
+
+
+
+
+ {{(scope.row.leftRight === '1' ? '左驾': '右驾')}}
+
+
+
+
+
+
+ {{(scope.row.eopTime ? scope.row.eopTime.substring(0, 11): '')}}
+
+
+
+
+
+
+
+ 查看
+ 删除
+
+
+
+
+
+
+
+
数据获取中
-
-
-
-
-
-
-
-
-
-
-
-
-
- 导出
- 取消
-
-
-
-
{
- this.tableHeight = $('.regulatory-repository').height() - 55 - 50 - 40 - 40 - 15 - 15 - 60 - 15 - 15
+ this.tableHeight = $('.regulatory-repository').height() - 110
window.onresize = () => {
- this.tableHeight = $('.container').height() - 55 - 50 - 40 - 40 - 15 - 15 - 60 - 15 - 15
+ this.tableHeight = $('.container').height() - 110
}
})
},
@@ -2433,14 +1445,7 @@ export default {
//position: relative;
height: 100%;
.container {
- height: calc(~'100% - 105px');
- .el-tabs{
- height: 100%;
- /deep/.el-tabs__content{
- height: calc(~'100% - 55px');
- overflow-y: auto;
- }
- }
+ height: calc(~'100% - 55px');
}
.el-drawer-form{
padding-left: 25px;
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index b6221fd07..4a5a1993b 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -1005,8 +1005,8 @@
@pageSizeChange="copyPageSizeChange">
数据获取中
@@ -1136,8 +1136,8 @@
数据获取中
@@ -1590,8 +1590,8 @@
@@ -1605,16 +1605,16 @@
- 导出
- 取消
+ 导出
+ 取消
@@ -1877,7 +1877,7 @@
@@ -1895,8 +1895,8 @@
@@ -1986,8 +1986,8 @@
@@ -3732,7 +3732,6 @@ export default {
margin: 0 auto;
width: 20px;
height: 20px;
- border-radius: 50px;
}
.iconClass{
width: 18px;
@@ -3828,7 +3827,6 @@ export default {
/deep/.el-step__icon{
width: 18px;
height: 18px;
- border-radius: 50%;
font-size: 12px;
}
/deep/.el-step__title{
@@ -3851,7 +3849,6 @@ export default {
height: 30px;
line-height: 30px;
font-size: 14px;
- border-radius: 15px;
padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
}
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index f46673c4d..e988f9a5b 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -1,35 +1,9 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
+
@@ -131,7 +101,7 @@
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
- size="800px"
+ size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
>
@@ -152,14 +122,14 @@
icon="el-icon-search"
type="primary"
class="common-button-primary"
- round
+ size="mini"
@click="querySarProStateZero">
@@ -183,59 +153,86 @@
width="55"
align="center">
-
-
-
-
-
-
-
-
+ prop="carModel"
+ label="产品线">
+ label="项目编号">
-
-
-
-
-
-
-
-
-
-
-
待验证
-
符合
-
不符合
-
部分符合
-
不涉及
-
评估中
-
整改中
-
-
-
+ prop="carModel"
+ label="项目名称">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -261,9 +254,9 @@
数据处理中
@@ -384,8 +377,8 @@
@pageSizeChange="pageProStateSizeChange2">
-
-
+
+
数据处理中
@@ -690,23 +683,7 @@ export default {
this.exportShowName = row.standName
this.sarItem.productCode = ''
this.sarItem.productName = ''
- // this.queryItemsBySar()
this.row = row
-
- // 原方案
- // if (this.row.isExistItems === 1) {
- // this.isExistItems = 1
- // this.standNum = this.row.standCode
- // // this.querySarProStateFirst()
- // this.saveSarId = this.row.standId
- // this.queryItemsBySar()
- // this.showSarProStateModal = true
- // } else {
- // this.isExistItems = 0
- // this.querySarProStateZero()
- // this.showSarProStateModal = true
- // }
-
this.$http.get('lawss/sarProductStand/isPermission', {standId: this.saveSarId}, {
_this: this,
loading: 'loading3'
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
index 5e25285a1..02fede51f 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
@@ -1,35 +1,9 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
@@ -88,11 +57,6 @@
企业标准
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -131,7 +86,7 @@
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
- size="800px"
+ size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
>
@@ -152,14 +107,14 @@
icon="el-icon-search"
type="primary"
class="common-button-primary"
- round
+ size="mini"
@click="querySarProStateZero">
@@ -168,7 +123,6 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ label="具体章条">
+ align="center"
+ label="解读内容">
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
待验证
-
符合
-
不符合
-
部分符合
-
不涉及
-
评估中
-
整改中
-
未评估
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -260,9 +207,9 @@
数据处理中
@@ -383,8 +330,8 @@
@pageSizeChange="pageProStateSizeChange2">
-
-
+
+
数据处理中
@@ -431,6 +378,7 @@ export default {
name: "technologyInvolveProject",
data () {
return {
+ SarProStateType: '',
// 条件查询
sarProject: {
// 国家地区
@@ -691,45 +639,9 @@ name: "technologyInvolveProject",
this.exportShowName = row.standName
this.sarItem.productCode = ''
this.sarItem.productName = ''
- // this.queryItemsBySar()
this.row = row
-
- // 原方案
- // if (this.row.isExistItems === 1) {
- // this.isExistItems = 1
- // this.standNum = this.row.standCode
- // // this.querySarProStateFirst()
- // this.saveSarId = this.row.standId
- // this.queryItemsBySar()
- // this.showSarProStateModal = true
- // } else {
- // this.isExistItems = 0
- // this.querySarProStateZero()
- // this.showSarProStateModal = true
- // }
- this.$http.get('lawss/sarProductStand/isPermission', {standId: this.saveSarId}, {
- _this: this,
- loading: 'loading3'
- }, res => {
- if (res.ok){
- // 现阶段方案
- this.isExistItems = 0
- this.querySarProStateZero()
- // this.showSarProStateModal = true]
- let routeUrl = this.$router.resolve({
- name: 'ComplianceDetails',
- query: {
- sarId: row.standId,
- sarType: row.standType
- }
- })
- window.open(routeUrl.href, '_blank')
- } else{
- this.$message.warning('无权访问')
- }
- }, e => {
- })
-
+ this.SarProStateType = row.standType
+ this.showSarProStateModal = true
},
handleProjectPreview (row) {
this.saveClickProductId = row.productId
diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue
index fc8586e4e..73243f3ad 100644
--- a/src/pages/regulatoryRepository/nonConfomity/index.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/index.vue
@@ -647,8 +647,8 @@
@@ -1010,8 +1010,8 @@
@@ -1095,7 +1095,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace">
@@ -2079,7 +2079,6 @@ export default {
padding-right: 30px;
line-height: 30px;
height: 30px;
- border-radius: 20px;
}
/deep/.el-input__icon {
line-height: 30px;
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 15e419fc8..dafa34498 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -252,7 +252,7 @@
@@ -2497,7 +2497,6 @@ export default {
.AllBox {
margin-top: 20px;
background-color: #fff;
- border-radius: 20px;
padding: 10px;
&:last-child {
margin-bottom: 20px;
@@ -2515,7 +2514,6 @@ export default {
height: 20px;
line-height: 20px;
padding: 0 5px;
- border-radius: 6px;
color: #fff;
background: #3391CE;
}
@@ -2636,7 +2634,6 @@ export default {
.ivu-input{
width: 100%;
height: 100%;
- border-radius: 0;
border: none;
.flex();
align-items: center;
@@ -2658,7 +2655,7 @@ export default {
margin-top: 15px;
//background-color: hsla(0,0%,100%,.9);
- //border-radius: 20px;
+ //20px;
padding: 10px;
.condition-btn{
width: 75px;
@@ -2710,7 +2707,6 @@ export default {
span{
/*padding: 3px 7px;*/
padding: 0 0 0 3px;
- border-radius: 2px;
transition: all .3s ease;
.un-select();
&:hover{
@@ -2721,7 +2717,6 @@ export default {
padding: 3px 7px 3px 7px;
background: @baseColor;
color: #FFF;
- border-radius: 4px;
& span {
font {
color: #fff !important;
@@ -2947,7 +2942,6 @@ export default {
//padding: 9px 0 10px 10px;
input.el-input__inner{
font-size: 16px;
- border-radius: 24px 0 0 24px;
font-family: PingFang-SC-Medium;
color: #666;
}
@@ -2955,7 +2949,6 @@ export default {
.search-btn-box {
width: 55px;
height: 48px;
- border-radius: 0 24px 24px 0;
background-color: #fff;
display: flex;
justify-content: center;
@@ -2973,7 +2966,6 @@ export default {
}
.el-input__inner {
height: 48px;
- border-radius: 0;
border: none;
padding: 0 34px;
}
@@ -3004,7 +2996,6 @@ export default {
}
.el-input--suffix .el-input__inner {
padding-right: 30px;
- border-radius: 20px;
}
.fixed-clean {
/deep/.el-input__inner {
@@ -3019,7 +3010,6 @@ export default {
}
.search-content__wrap {
background-color: hsla(0, 0%, 100%, .9);
- border-radius: 20px;
flex: 1;
overflow: hidden;
margin-top: 20px;
diff --git a/src/pages/skillReq/SkillReqAdd/searchForm.vue b/src/pages/skillReq/SkillReqAdd/searchForm.vue
index 6e9eae9ee..406aa120b 100644
--- a/src/pages/skillReq/SkillReqAdd/searchForm.vue
+++ b/src/pages/skillReq/SkillReqAdd/searchForm.vue
@@ -671,7 +671,6 @@ export default {
span {
margin-right: 15px;
padding: 0px 7px;
- border-radius: 2px;
transition: all 0.3s ease;
user-select: none;
margin-bottom: 5px;
diff --git a/src/pages/skillReq/SkillReqSee/searchForm.vue b/src/pages/skillReq/SkillReqSee/searchForm.vue
index 9c1d4aee7..3f204fb32 100644
--- a/src/pages/skillReq/SkillReqSee/searchForm.vue
+++ b/src/pages/skillReq/SkillReqSee/searchForm.vue
@@ -404,7 +404,6 @@ export default {
span {
margin-right: 15px;
padding: 0px 7px;
- border-radius: 2px;
transition: all 0.3s ease;
user-select: none;
margin-bottom: 5px;
diff --git a/src/pages/standardComparisonLibrary/components/ViewBaseInfo.vue b/src/pages/standardComparisonLibrary/components/ViewBaseInfo.vue
index b062a6506..672f7f286 100644
--- a/src/pages/standardComparisonLibrary/components/ViewBaseInfo.vue
+++ b/src/pages/standardComparisonLibrary/components/ViewBaseInfo.vue
@@ -74,7 +74,6 @@ export default {
input.el-input__inner{
display: inline-block;
width: 165px;
- border-radius: 20px !important;
color: #999;
height: 30px;
line-height: 30px;
diff --git a/src/pages/standardComparisonLibrary/index.vue b/src/pages/standardComparisonLibrary/index.vue
index d72eecf05..072b4f0ff 100644
--- a/src/pages/standardComparisonLibrary/index.vue
+++ b/src/pages/standardComparisonLibrary/index.vue
@@ -18,7 +18,6 @@
icon="el-icon-search"
type="primary"
class="common-button-primary"
- round
@click="searchBtn"
>
@@ -26,7 +25,6 @@
{{$t('m.clearQuery')}}
@@ -38,7 +36,6 @@
新增
@@ -215,8 +212,8 @@
@@ -301,8 +298,8 @@
- {{$t('m.submit')}}
- {{$t('m.cancel')}}
+ {{$t('m.submit')}}
+ {{$t('m.cancel')}}
@@ -315,8 +312,8 @@
- 取 消
- 保 存
+ 取 消
+ 保 存
@@ -615,7 +612,7 @@ export default {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
- roundButton: true,
+ roundButton: false,
type: 'warning'
}).then(() => {
this.$http.delete('sys/role/deleteList', {
@@ -640,7 +637,7 @@ export default {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
- roundButton: true,
+ roundButton: false,
type: 'warning'
}).then(() => {
this.$http.post('lawss/sarStandCompareBase/deletesSarStandCompareBase', {
diff --git a/src/pages/standardComparisonLibrary/view.vue b/src/pages/standardComparisonLibrary/view.vue
index b8999c797..b07519b8a 100644
--- a/src/pages/standardComparisonLibrary/view.vue
+++ b/src/pages/standardComparisonLibrary/view.vue
@@ -306,8 +306,8 @@
- {{$t('m.submit')}}
- {{$t('m.cancel')}}
+ {{$t('m.submit')}}
+ {{$t('m.cancel')}}
@@ -340,8 +340,8 @@
@close="selectStandardDrawerVisible = false" />
@@ -379,8 +379,8 @@
@@ -433,8 +433,8 @@
点击或拖拽上传文件
- 取 消
- 保 存
+ 取 消
+ 保 存
@@ -459,8 +459,8 @@
点击或拖拽导入文件
- 取 消
- 导 入
+ 取 消
+ 导 入
diff --git a/src/router/index.js b/src/router/index.js
index 351399ded..c20d91851 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,6 +47,18 @@ const routes = [
isBoolean: true
}
},
+ {
+ path: '/home1',
+ name: 'Home',
+ component: () =>
+ import('@/pages/home1'),
+ meta: {
+ requireAuth: true,
+ title: '福田首页',
+ menuId: '',
+ isBoolean: true
+ }
+ },
// 个人中心
{
path: '/personal',
@@ -1843,6 +1855,19 @@ const routes = [
menuId: 'A59EFAQ7AC'
}
},
+ // 标准征求意见
+ {
+ path: '/standardForComments',
+ name: 'standardForComments',
+ component: () =>
+ import('@/pages/regulatoryRepository/standardForComments/index'),
+ meta: {
+ requireAuth: true,
+ title: '标准征求意见',
+ menuId: ''
+ }
+ },
+
// 本地产品/项目库
{
path: '/localProductsOrProjectLibrary',
@@ -2350,6 +2375,31 @@ const routes = [
},
// 详情页
// ************************** 其他详情页 ******************************* //
+ {
+ path: '/categoryDetails/:id',
+ name: 'categoryDetails',
+ component: () =>
+ import('@/pages/regulatoryRepository/standardForComments/pags/categoryDetails'),
+ meta: {
+ requireAuth: true,
+ parentPath: '/standardForComments',
+ title: '管理征求意见',
+ // isBoolean: true,
+ // menuId: ''
+ }
+ },
+ {
+ path: '/consultationDetails/:id/:pageType',
+ name: 'consultationDetails',
+ component: () =>
+ import('@/pages/regulatoryRepository/standardForComments/pags/consultationDetails'),
+ meta: {
+ requireAuth: true,
+ title: '征求意见详情',
+ // isBoolean: true,
+ // menuId: ''
+ }
+ },
{
path: '/details',
name: 'Details',
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index aa1e74cb8..f4040b04f 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -3,11 +3,12 @@
* @author: chenxiaoxi
* @date: 2018-09-04 17:47:46
*/
+// 后台地址
+const devIp = '192.168.10.145'
+const devInterfacePORT = '9999'
// 服务器地址
-// const devIp = '192.168.10.211'
-// const devInterfacePORT = '8888'
-const devIp = '39.98.140.126'
-const devInterfacePORT = '10005'
+// const devIp = '39.98.140.126'
+// const devInterfacePORT = '10005'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -41,7 +42,7 @@ const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLO
module.exports = {
serverUrl: 'http://' + serverIP, // 服务器IP地址
- interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
+ interfaceUrl: 'http://' + serverIP + ':' + interfacePORT, // 服务器端接口访问地址,
cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址
diff --git a/vue.config.js b/vue.config.js
index 40b40d896..84f1e541f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -82,7 +82,7 @@ module.exports = {
target: interfaceUrl,
changeOrigin: true,
pathRewrite: {
- '^/api': ''
+ '^/api': '/'
}
},
'/onlyOffice': {