diff --git a/.env.development b/.env.development index 5f5e6d9..0dc6f4b 100644 --- a/.env.development +++ b/.env.development @@ -5,6 +5,7 @@ VUE_APP_TITLE = 产品画像 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'https://dev-mssm-liaoning.imian.org.cn' +VUE_APP_BASE_API = 'https://dev-mssm-liaoning.lesdev.cn' +# VUE_APP_BASE_API = 'http://192.168.0.109:9023' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index 2b0efa1..4dadf7b 100644 --- a/.env.production +++ b/.env.production @@ -4,7 +4,7 @@ VUE_APP_TITLE = 产品画像 # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# 若依管理系统/生产环境 /api/ggfw/ VUE_APP_BASE_API = '/prod-api' VUE_APP_HOUTAI = /ggfw-jcphx diff --git a/src/api/largeScreen/index.js b/src/api/largeScreen/index.js index 0026c13..c1f88eb 100644 --- a/src/api/largeScreen/index.js +++ b/src/api/largeScreen/index.js @@ -56,3 +56,11 @@ export function getXXMSG(query) { params: query }) } +//根据产品画像类型查询产品 +export function findByType(query) { + return request({ + url: '/ggfw-api/pharmaceuticals/largeScreen/findByType', + method: 'get', + params: query + }) +} diff --git a/src/assets/images/icon-search.png b/src/assets/images/icon-search.png new file mode 100644 index 0000000..25d469a Binary files /dev/null and b/src/assets/images/icon-search.png differ diff --git a/src/assets/images/icon-type.png b/src/assets/images/icon-type.png new file mode 100644 index 0000000..ec104d1 Binary files /dev/null and b/src/assets/images/icon-type.png differ diff --git a/src/assets/images/icon-xxx1.png b/src/assets/images/icon-xxx1.png new file mode 100644 index 0000000..90dc692 Binary files /dev/null and b/src/assets/images/icon-xxx1.png differ diff --git a/src/assets/images/icon-xxx2.png b/src/assets/images/icon-xxx2.png new file mode 100644 index 0000000..906adf0 Binary files /dev/null and b/src/assets/images/icon-xxx2.png differ diff --git a/src/assets/images/icon-xxx3.png b/src/assets/images/icon-xxx3.png new file mode 100644 index 0000000..bf65d30 Binary files /dev/null and b/src/assets/images/icon-xxx3.png differ diff --git a/src/main.js b/src/main.js index 23a64b2..684b9e8 100644 --- a/src/main.js +++ b/src/main.js @@ -71,19 +71,20 @@ DictData.install() import { setToken } from '@/utils/auth' // 临时获取token -let token = async () => { - let Authentication = await API.login.frimLogin(); - localStorage.setItem( - "MSSM-LIAONING__TOKEN", - Authentication.data.result.userToken - ); -} -token() -let infor = async () => { - let response = await API.login.getuserinfo(); - localStorage.setItem("userDto", JSON.stringify(response?.result.userDto)); -} -infor() +// let token = async () => { +// let Authentication = await API.login.frimLogin(); +// localStorage.setItem( +// "MSSM-LIAONING__TOKEN", +// Authentication.data.result.userToken +// ); +// } + +// token() +// let infor = async () => { +// let response = await API.login.getuserinfo(); +// localStorage.setItem("userDto", JSON.stringify(response?.result.userDto)); +// } +// infor() /** diff --git a/src/utils/request.js b/src/utils/request.js index ba7ecc3..c252680 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,8 +16,10 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, - //!线上 - // baseURL:location.origin, + //!线上--2.17-198 + // baseURL:location.origin +"/api/ggfw", + //!其他 + // baseURL:location.origin, // 超时 timeout: 10000 }) diff --git a/src/views/bigpage/bigcomponents/informationBox.vue b/src/views/bigpage/bigcomponents/informationBox.vue index 7501bae..79a9914 100644 --- a/src/views/bigpage/bigcomponents/informationBox.vue +++ b/src/views/bigpage/bigcomponents/informationBox.vue @@ -113,14 +113,13 @@ export default { }, methods: { reducefn(data = []) { - return data.reduce((accumulator, current) => current.sampleType + accumulator, 0); + return data.length }, getData() { let newRouter = this.$route.query; getCPCJ({ name: newRouter.code }).then((res) => { if (res.code == 200) { if (res.data.result.length != 0) { - // 计算生产抽样数量 this.myChart1data[0].value = res.data.result.filter(item => item.inspectType === "生产环节").length this.myChart1data[0].percent = ((res.data.result.filter(item => item.inspectType === "生产环节").length / res.data.result.length) * 100).toFixed(1) @@ -131,11 +130,11 @@ export default { res.data.result.forEach((item) => { if (item.qualified === "合格") { if (mergedData[item.province]) { - mergedData[item.province].sampleType += item.sampleType; + mergedData[item.province].sampleType += 1; } else { mergedData[item.province] = { province: item.province, - sampleType: item.sampleType + sampleType: 1 }; } } @@ -145,8 +144,10 @@ export default { this.myChart2data.push(item.province) this.myChart2data2.push(item.sampleType) }) - // 国家次数显示 - this.countryC = res.data.result.length + // 国省次数显示 + this.countryC = res.data.result.filter(item => item.sampleType == "2").length + // 省 + this.provinceC = res.data.result.filter(item => item.sampleType == "1").length // 计算合格率 const filteredData = res.data.result.filter(item => item.qualified === "不合格"); this.pt = Math.floor(((this.reducefn(res.data.result) - this.reducefn(filteredData)) / this.reducefn(res.data.result)) * 100) @@ -248,10 +249,10 @@ export default { backgroundColor: "rgba(0,0,0,0)", // 设置为透明背景 tooltip: {}, grid: { - top: "8%", + top: "7%", left: "10%", right: "10%", - bottom: "8%", + bottom: "-5%", containLabel: true, }, xAxis: [ diff --git a/src/views/bigpage/index.vue b/src/views/bigpage/index.vue index 82f0aea..c6846f4 100644 --- a/src/views/bigpage/index.vue +++ b/src/views/bigpage/index.vue @@ -1,15 +1,15 @@ - - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/components/Pagination.vue b/src/views/components/Pagination.vue index f444a41..a11ec22 100644 --- a/src/views/components/Pagination.vue +++ b/src/views/components/Pagination.vue @@ -1,18 +1,8 @@ - @@ -41,6 +31,10 @@ export default { return [10, 20, 30, 50]; }, }, + smallShow: { + type: Boolean, + default: true + }, // 移动端页码按钮的数量端默认值5 pagerCount: { type: Number, @@ -72,7 +66,7 @@ export default { return this.page; }, set(val) { - this.$emit("update:page", val); + // this.$emit("update:page", val); }, }, pageSize: { @@ -80,7 +74,7 @@ export default { return this.limit; }, set(val) { - this.$emit("update:limit", val); + // this.$emit("update:limit", val); }, }, }, @@ -90,15 +84,15 @@ export default { this.currentPage = 1; } this.$emit("pagination", { page: this.currentPage, limit: val }); - if (this.autoScroll) { - scrollTo(0, 800); - } + // if (this.autoScroll) { + // scrollTo(0, 800); + // } }, handleCurrentChange(val) { this.$emit("pagination", { page: val, limit: this.pageSize }); - if (this.autoScroll) { - scrollTo(0, 800); - } + // if (this.autoScroll) { + // scrollTo(0, 800); + // } }, }, }; @@ -112,24 +106,29 @@ export default { box-sizing: border-box; overflow-y: auto; } + .box { background-color: transparent !important; } + ::v-deep .el-pagination.is-background .btn-prev { background-color: transparent !important; border: 1px solid #123864; color: #579acf; } + ::v-deep .el-pagination.is-background .btn-next { background-color: transparent !important; border: 1px solid #123864; color: #579acf; } + ::v-deep .el-pagination .el-pager li { background-color: transparent !important; border: 1px solid #123864; color: #579acf; } + // ::v-deep .el-pagination.is-background.el-pager li:not(.disabled).active { // background: rgba(20, 131, 242, 0.2) !important; // border: 1px solid #1483f2; @@ -139,12 +138,14 @@ export default { ::v-deep .el-pagination__jump { margin: 0; color: #2668d6; + .el-input__inner { background-color: transparent !important; border: 1px solid #123864; color: #2668d6; } } + ::v-deep .el-pager li.active { background: rgba(20, 131, 242, 0.52) !important; border: 1px solid #1483f2; @@ -153,5 +154,4 @@ export default { // ::v-deep .el-pagination__total { // color: #2668d6; -// } - +// } diff --git a/src/views/index.vue b/src/views/index.vue index c38c4f4..44662c4 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,4 +1,3 @@ -