diff --git a/.gitignore b/.gitignore index f585be5..93148de 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,5 @@ pnpm-debug.log* *.suo *.ntvs* *.njsproj -*.sln +*.sln *.sw? diff --git a/babel.config.js b/babel.config.js index e955840..37e0998 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,12 @@ module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' + presets: ['@vue/app'], + plugins: [ + [ + 'component', + { + libraryName: 'element-ui', + styleLibraryName: 'theme-chalk' + } + ] ] } diff --git a/package-lock.json b/package-lock.json index 5ba5339..7ba2362 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2867,6 +2867,38 @@ "schema-utils": "^2.6.5" } }, + "babel-plugin-component": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/babel-plugin-component/-/babel-plugin-component-1.1.1.tgz", + "integrity": "sha512-WUw887kJf2GH80Ng/ZMctKZ511iamHNqPhd9uKo14yzisvV7Wt1EckIrb8oq/uCz3B3PpAW7Xfl7AkTLDYT6ag==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "7.0.0-beta.35" + }, + "dependencies": { + "@babel/helper-module-imports": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.35.tgz", + "integrity": "sha512-vaC1KyIZSuyWb3Lj277fX0pxivyHwuDU4xZsofqgYAbkDxNieMg2vuhzP5AgMweMY7fCQUMTi+BgPqTLjkxXFg==", + "dev": true, + "requires": { + "@babel/types": "7.0.0-beta.35", + "lodash": "^4.2.0" + } + }, + "@babel/types": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.0.0-beta.35.tgz", + "integrity": "sha512-y9XT11CozHDgjWcTdxmhSj13rJVXpa5ZXwjjOiTedjaM0ba5ItqdS02t31EhPl7HtOWxsZkYCCUNrSfrOisA6w==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.2.0", + "to-fast-properties": "^2.0.0" + } + } + } + }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npmmirror.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -3604,6 +3636,11 @@ } } }, + "comutils": { + "version": "1.1.19", + "resolved": "https://registry.npmmirror.com/comutils/-/comutils-1.1.19.tgz", + "integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz", @@ -11207,6 +11244,14 @@ "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz", "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==" }, + "vue-seamless-scroll": { + "version": "1.1.23", + "resolved": "https://registry.npmmirror.com/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz", + "integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==", + "requires": { + "comutils": "^1.1.9" + } + }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz", diff --git a/package.json b/package.json index 1a79011..ff31042 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "vue-cookie": "^1.1.4", "vue-lazyload": "^3.0.0", "vue-router": "^3.5.1", + "vue-seamless-scroll": "^1.1.23", "vuex": "^3.6.2" }, "devDependencies": { @@ -28,6 +29,7 @@ "@vue/cli-plugin-router": "~5.0.0", "@vue/cli-plugin-vuex": "~5.0.0", "@vue/cli-service": "~5.0.0", + "babel-plugin-component": "^1.1.1", "eslint": "^7.32.0", "eslint-plugin-vue": "^8.0.3", "sass": "^1.32.7", diff --git a/src/api/index.js b/src/api/index.js index c859bed..9530532 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -12,3 +12,14 @@ export function getOrgTree() { data: {} }) } + +//获取党员风采列表 + +export function getDyfcList() { + return request({ + baseURL, + url: 'https://epmet-cloud.elinkservice.cn/api/resi/partymember/icpartymemberstyle/list', + method: 'POST', + data: {} + }) +} diff --git a/src/assets/icon/jiantou-D@2x.png b/src/assets/icon/arrow.png similarity index 100% rename from src/assets/icon/jiantou-D@2x.png rename to src/assets/icon/arrow.png diff --git a/src/assets/icon/arrow2.png b/src/assets/icon/arrow2.png new file mode 100644 index 0000000..7b400f4 Binary files /dev/null and b/src/assets/icon/arrow2.png differ diff --git a/src/assets/icon/框@2x.png b/src/assets/icon/bg-part.png similarity index 100% rename from src/assets/icon/框@2x.png rename to src/assets/icon/bg-part.png diff --git a/src/assets/icon/dyfc1.png b/src/assets/icon/dyfc1.png new file mode 100644 index 0000000..1dcc9d3 Binary files /dev/null and b/src/assets/icon/dyfc1.png differ diff --git a/src/assets/icon/dyfc2.png b/src/assets/icon/dyfc2.png new file mode 100644 index 0000000..dd85d7e Binary files /dev/null and b/src/assets/icon/dyfc2.png differ diff --git a/src/assets/icon/dyfc3.png b/src/assets/icon/dyfc3.png new file mode 100644 index 0000000..0aeabe2 Binary files /dev/null and b/src/assets/icon/dyfc3.png differ diff --git a/src/assets/icon/jiantou-D 拷贝@2x.png b/src/assets/icon/jiantou-D 拷贝@2x.png deleted file mode 100644 index 0b4465a..0000000 Binary files a/src/assets/icon/jiantou-D 拷贝@2x.png and /dev/null differ diff --git a/src/assets/icon/点1@2x.png b/src/assets/icon/point.png similarity index 100% rename from src/assets/icon/点1@2x.png rename to src/assets/icon/point.png diff --git a/src/components/screen-popup-ydzl/index.vue b/src/components/screen-popup-ydzl/index.vue new file mode 100644 index 0000000..f307a29 --- /dev/null +++ b/src/components/screen-popup-ydzl/index.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/src/components/screen-popup/index.vue b/src/components/screen-popup/index.vue new file mode 100644 index 0000000..7b1754a --- /dev/null +++ b/src/components/screen-popup/index.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/main.js b/src/main.js index 396943a..f1c1670 100644 --- a/src/main.js +++ b/src/main.js @@ -5,11 +5,20 @@ import store from './store' import App from './App.vue' import 'components/index' //注册components下的组件 +import scroll from 'vue-seamless-scroll' //滚动 import './style/global.scss' import './style/font.scss' // 字体文件 +import { Popover } from 'element-ui' +import { Button } from 'element-ui' + Vue.config.productionTip = false +// Vue.component(Popover.name, Popover) +Vue.use(Popover) +Vue.use(Button) + +Vue.use(scroll) new Vue({ router, diff --git a/src/style/agencySelect.scss b/src/style/agencySelect.scss new file mode 100644 index 0000000..d3ffc14 --- /dev/null +++ b/src/style/agencySelect.scss @@ -0,0 +1,43 @@ +.agency-select { + box-sizing: border-box; + + // margin-top: 0px; + margin-left: 39px; + display: flex; + font-size: 18px; + font-family: PingFang SC; + font-weight: bold; + color: #fefefe; + letter-spacing: 3px; + .name-item { + height: 45px; + align-items: center; + line-height: 40px; + } + .item { + box-sizing: border-box; + position: relative; + width: 210px; + height: 42px; + padding: 13px 11px 15px 10px; + margin-left: 20px; + display: flex; + justify-content: space-between; + align-items: center; + background: rgba(0, 159, 199, 0.23); + border-radius: 1px; + font-size: 15px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #c1e8ff; + letter-spacing: 2px; + + // white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + + &:hover { + cursor: pointer; + } + } +} diff --git a/src/style/global.scss b/src/style/global.scss index daa35b6..627ca11 100644 --- a/src/style/global.scss +++ b/src/style/global.scss @@ -2,10 +2,12 @@ .bg-content{ width: 620px; height: 972px; - border: 1px solid; - border-image: linear-gradient(0deg, #4ba3da, #0097d6) 10 10; - background: linear-gradient(0deg, #006a90 0%, #00354b 100%); - box-sizing: border-box; + // border: 1px solid; + // border-image: linear-gradient(0deg, #4ba3da, #0097d6) 10 10; + // background: linear-gradient(0deg, #006a90 0%, #00354b 100%); + background-image: url("./../assets/icon/bg-part.png") ; + background-size: 100% 100%; + // box-sizing: border-box; } diff --git a/src/style/left2.scss b/src/style/left2.scss new file mode 100644 index 0000000..0862c6f --- /dev/null +++ b/src/style/left2.scss @@ -0,0 +1,215 @@ +.left2 { + margin-right: 12px; +} +.d-title { + margin-top: 17px; + margin-left: 36px; + display: flex; + align-items: center; + + > img { + width: 26px; + height: 26px; + } + > div { + font-size: 18px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #ffffff; + margin-left: 2px; + } +} +.grid-title { + margin-top: 5px; + height: 40px; +} + +.frame { + padding: 20px 20px 10px; + + &-row { + width: 580px; + height: 36px; + background: #24bef1; + border-radius: 1px; + + font-size: 20px; + font-family: Alibaba PuHuiTi; + font-weight: bold; + color: #ffffff; + text-shadow: 0px 2px 4px #007fa9; + + text-align: center; + line-height: 36px; + } + + &-onerow { + position: relative; + margin-top: 5px; + width: 578px; + height: 30px; + background: rgba(36, 190, 241, 0.7); + border-radius: 2px; + + text-align: center; + line-height: 30px; + + .rowitem { + font-size: 18px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #ffffff; + cursor: pointer; + } + } + + &-arrow { + margin-top: 5px; + display: flex; + justify-content: center; + + > img { + height: 34px; + width: 34px; + } + } + + &-multirow { + width: 580px; + height: 60px; + border: 2px dashed #92b5cd; + + border-radius: 2px; + + display: flex; + justify-content: space-around; + align-items: center; + + .multirowitem { + position: relative; + width: 174px; + height: 30px; + background-color: rgba(36, 190, 241, 0.7); + border-radius: 2px; + + line-height: 30px; + text-align: center; + font-size: 18px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: rgb(255, 255, 255); + cursor: pointer; + } + } +} + +.grid { + margin-top: 3px; + display: flex; + justify-content: space-between; + + .grid-item { + text-align: center; + + .frame-arrow2 { + > img { + height: 24px; + width: 24px; + } + } + + .grid-member { + width: 285px; + height: 254px; + background: rgba(36, 190, 241, 0.3); + border-radius: 4px; + box-sizing: border-box; + + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + padding: 14px 0 14px 14px; + + &-title { + width: 100px; + height: 26px; + background: rgba(255, 255, 255, 0.8); + border-radius: 2px; + + text-align: center; + font-size: 16px; + font-family: Alibaba PuHuiTi; + font-weight: 500; + color: #006fbd; + line-height: 26px; + } + + &-main { + display: flex; + justify-content: flex-start; + align-content: flex-start; + flex-wrap: wrap; + overflow-y: auto; + overflow-x: hidden; + height: 200px; + + .memberitem { + margin-top: 14px; + margin-right: 12px; + width: 76px; + height: 26px; + background: rgba(36, 190, 241, 0.8); + + border-radius: 2px; + position: relative; + + font-size: 16px; + font-family: Alibaba PuHuiTi; + font-weight: 300; + color: #ffffff; + line-height: 26px; + cursor: pointer; + } + + &::-webkit-scrollbar { + /*滚动条整体样式*/ + width: 6px; /*高宽分别对应横竖滚动条的尺寸*/ + height: 1px; + } + &::-webkit-scrollbar-thumb { + /*滚动条里面小方块*/ + background: linear-gradient(-90deg, #09b8e5 0%, #09f0e3 99%); + border-radius: 3px; + } + &::-webkit-scrollbar-track { + /*滚动条里面轨道*/ + // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); + background: #428ba2; + border-radius: 3px; + } + } + } + } +} + +.left2-static { + margin-top: 10px 23px; + display: flex; + justify-content: space-around; + + .static-item { + &-title { + font-size: 16px; + font-family: Alibaba PuHuiTi; + font-weight: 400; + color: #c1e8ff; + } + &-num { + font-size: 24px; + font-family: Microsoft YaHei; + font-weight: bold; + color: #ffffff; + } + } +} diff --git a/src/utils/request.js b/src/utils/request.js index 417ad9e..2cb8ba2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,13 +11,13 @@ const request = axios.create({ // 添加一个请求拦截器 request.interceptors.request .use - // config => { + // (config) => { // if (getCookie('token')) { // config.headers.Authorization = `Bearer ${getCookie('token')}` // } // return config // }, - // err => { + // (err) => { // return Promise.reject(err) // } () diff --git a/src/views/agencySelect.vue b/src/views/agencySelect.vue index 59c2659..3b7537a 100644 --- a/src/views/agencySelect.vue +++ b/src/views/agencySelect.vue @@ -1,5 +1,6 @@ + + \ No newline at end of file