Merge branch '20245024-wz' of http://116.204.71.86:3000/UDI/udi-cpt-vue into 20245024-wz

# Conflicts:
#	.env.development
#	package.json
20245024-wz
qiuyt 8 months ago
commit 1323effc5d

@ -5,7 +5,8 @@ VUE_APP_TITLE = UDI追溯监管平台
ENV = 'development' ENV = 'development'
# VUE_APP_BASE_API = 'https://ts.udims.com/api/' # VUE_APP_BASE_API = 'https://ts.udims.com/api/'
VUE_APP_BASE_API = 'http://192.168.0.166:9002' # VUE_APP_BASE_API = 'http://127.0.0.1:9002'
VUE_APP_BASE_API = 'http://139.159.224.202/api'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'

@ -11,3 +11,7 @@ npm run build:stage
# 构建生产环境 # 构建生产环境
npm run build:prod npm run build:prod
``` ```
npm install --save @antv/l7plot @jiaminghi/data-view --registry=https://mirrors.huaweicloud.com/repository/npm/
npm install --save vue-seamless-scroll --registry=https://mirrors.huaweicloud.com/repository/npm/

@ -5,7 +5,7 @@
"author": "LionLi", "author": "LionLi",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open",
"build:prod": "vue-cli-service build", "build:prod": "vue-cli-service build",
"build:test": "vue-cli-service build --mode test", "build:test": "vue-cli-service build --mode test",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
@ -37,12 +37,15 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git" "url": "https://gitee.com/y_project/RuoYi-Vue.git"
}, },
"dependencies": { "dependencies": {
"element-china-area-data": "^5.0.2", "@antv/l7plot": "^0.5.11",
"@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "0.4.0", "@riophae/vue-treeselect": "0.4.0",
"@tinymce/tinymce-vue": "3.0.1",
"axios": "0.24.0", "axios": "0.24.0",
"clipboard": "2.0.8", "clipboard": "2.0.8",
"core-js": "3.19.1", "core-js": "3.19.1",
"echarts": "4.9.0", "echarts": "4.9.0",
"element-china-area-data": "^5.0.2",
"element-ui": "2.15.8", "element-ui": "2.15.8",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"fuse.js": "6.4.3", "fuse.js": "6.4.3",
@ -56,16 +59,16 @@
"quill": "1.3.7", "quill": "1.3.7",
"screenfull": "5.0.2", "screenfull": "5.0.2",
"sortablejs": "1.10.2", "sortablejs": "1.10.2",
"tinymce": "^6.2.0",
"vue": "2.6.12", "vue": "2.6.12",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-cropper": "0.5.5", "vue-cropper": "0.5.5",
"vue-meta": "2.4.0", "vue-meta": "2.4.0",
"vue-router": "3.4.9", "vue-router": "3.4.9",
"vue-seamless-scroll": "^1.1.23",
"vue2-verify": "^1.1.5", "vue2-verify": "^1.1.5",
"vuedraggable": "2.24.3", "vuedraggable": "2.24.3",
"vuex": "3.6.0", "vuex": "3.6.0"
"@tinymce/tinymce-vue": "3.0.1",
"tinymce": "^6.2.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "4.4.6", "@vue/cli-plugin-babel": "4.4.6",

@ -1,4 +1,3 @@
/* /*
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @LastEditTime: 2022-04-28 10:25:38 * @LastEditTime: 2022-04-28 10:25:38
@ -15,7 +14,7 @@ import store from "@/store";
import {isRelogin} from "@/api/utils/request"; import {isRelogin} from "@/api/utils/request";
// import cache from "@/plugins/cache"; // import cache from "@/plugins/cache";
let baseUrl =`http://127.0.0.1:9002/` let baseUrl = process.env.VUE_APP_BASE_API
const CancelToken = axios.CancelToken; const CancelToken = axios.CancelToken;
export {baseUrl}; export {baseUrl};
// axios.defaults.withCredentials = true; // axios.defaults.withCredentials = true;

@ -1,7 +1,5 @@
@import "./modules/reset.scss";
@import "./modules/variables.scss";
@import './theme/index.css';
@import '../iconfont/iconfont.css';
[class*=" blq-icon-"], [class*=" blq-icon-"],
[class^=blq-icon-] { [class^=blq-icon-] {
font-family: iconfont !important; font-family: iconfont !important;

@ -191,6 +191,6 @@ aside {
} }
.el-table--mini .el-table__cell { //.el-table--mini .el-table__cell {
padding:0px!important; // padding:0px!important;
} //}

@ -82,10 +82,10 @@ Vue.use(borderBox13)
Vue.use(borderBox8) Vue.use(borderBox8)
Vue.use(digitalFlop) Vue.use(digitalFlop)
Vue.use(capsuleChart) Vue.use(capsuleChart)
import '@/assets/css/public.scss' // import '@/assets/css/public.scss'
import "@/assets/css/index.scss" // import "@/assets/css/index.scss"
import "@/assets/css/common.css" // import "@/assets/css/common.css"
import "@/assets/css/visual.css" // import "@/assets/css/visual.css"
// import "@/assets/css/dialogBg.css" // import "@/assets/css/dialogBg.css"
DictData.install() DictData.install()

@ -298,7 +298,6 @@ export default {
}); });
}, },
@ -402,8 +401,7 @@ export default {
}); });
}, },
}, },
components: { components: {},
},
created() { created() {
} }
}; };

@ -9,7 +9,7 @@
<div> <div>
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">--> <!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<el-table v-loading="loading" :data="manuList" <el-table v-loading="loading" :data="manuList"
style="width: 100%;margin-top: 1px" style="width: 100%;margin-top: 1px" :row-style="{height:'38px'}"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"

@ -176,6 +176,16 @@ export default {
}; };
</script> </script>
<style lang='scss' scoped> <style lang='scss' scoped>
@import "../../../assets/css/modules/reset.scss";
@import "../../../assets/css/modules/variables.scss";
@import '../../../assets/css/theme/index.css';
@import '../../../assets/iconfont/iconfont.css';
@import "../../../assets/css/public.scss";
@import "../../../assets/css/index.scss";
@import "../../../assets/css/common.css";
@import "../../../assets/css/visual.css";
@import "../../../assets/css/dialogBg.css";
.user_Overview { .user_Overview {
li { li {
flex: 1; flex: 1;

@ -72,6 +72,7 @@ export default {
} }
console.log("单位分类统计返回的code", res.data.code) console.log("单位分类统计返回的code", res.data.code)
if (res.data.code == 20000) { if (res.data.code == 20000) {
if (res.data.data != null)
this.countUserNumData = res.data.data this.countUserNumData = res.data.data
this.$nextTick(() => { this.$nextTick(() => {
this.init() this.init()
@ -104,7 +105,9 @@ export default {
}); });
}, },
init() { init() {
let total = this.countUserNumData.hospCount + this.countUserNumData.supCount + this.countUserNumData.manuCount; let total = 0;
if (this.countUserNumData != null)
total = this.countUserNumData.hospCount + this.countUserNumData.supCount + this.countUserNumData.manuCount;
let colors = ["#ffca29", "#01c6fd", "#3cb879"]; let colors = ["#ffca29", "#01c6fd", "#3cb879"];
let piedata = { let piedata = {
name: "单位分类", name: "单位分类",

@ -10,7 +10,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick" type="card"> <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
<el-tab-pane label="生产企业" name="first"> <el-tab-pane label="生产企业" name="first">
<el-table v-loading="loading" :data="manuList" <el-table v-loading="loading" :data="manuList"
style="width: 100%;margin-top: -10px" style="width: 100%;margin-top: -10px" :row-style="{height:'38px'}"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@row-click="intentDetail" @row-click="intentDetail"
@ -31,7 +31,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="经营企业" name="second"> <el-tab-pane label="经营企业" name="second">
<el-table v-loading="loading" :data="supList" <el-table v-loading="loading" :data="supList"
style="width: 100%;margin-top: -10px" style="width: 100%;margin-top: -10px" :row-style="{height:'38px'}"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@row-click="intentDetail" @row-click="intentDetail"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
@ -52,7 +52,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="医疗机构" name="third"> <el-tab-pane label="医疗机构" name="third">
<el-table v-loading="loading" :data="hospList" <el-table v-loading="loading" :data="hospList"
style="width: 100%;margin-top: -10px" style="width: 100%;margin-top: -10px" :row-style="{height:'38px'}"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@row-click="intentDetail" @row-click="intentDetail"

@ -10,7 +10,7 @@
<template> <template>
<div> <div>
<el-table v-loading="loading" :data="dataList" <el-table v-loading="loading" :data="dataList"
style="width: 100%;margin-top: 10px" style="width: 100%;margin-top: 10px" :row-style="{height:'38px'}"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@row-click="intentDetail" @row-click="intentDetail"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"

@ -27,6 +27,7 @@
<el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px" <el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px"
:header-cell-style="{ color: '#fff',backgroundColor:'#d21010', fontWeight:'bold',fontSize:'15px'}" :header-cell-style="{ color: '#fff',backgroundColor:'#d21010', fontWeight:'bold',fontSize:'15px'}"
:row-style="{height:'38px'}"
border> border>
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>

@ -19,7 +19,7 @@
</el-descriptions> </el-descriptions>
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="list"
style="width: 100%;margin-top: 15px" style="width: 100%;margin-top: 15px"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }" :row-style="{height:'38px'}"
:header-cell-style="{ color: '#FFFFFF'}" :header-cell-style="{ color: '#FFFFFF'}"
highlight-current-row highlight-current-row
:row-class-name="tableRowClassName"> :row-class-name="tableRowClassName">

@ -60,7 +60,7 @@
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"
highlight-current-row highlight-current-row
:row-style="{height:'38px'}"
:row-class-name="tableRowClassName"> :row-class-name="tableRowClassName">
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="单位名称" prop="corpName" width="280" show-overflow-tooltip></el-table-column> <el-table-column label="单位名称" prop="corpName" width="280" show-overflow-tooltip></el-table-column>
@ -86,7 +86,7 @@
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="list"
style="width: 100%" style="width: 100%"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }" :row-style="{height:'38px'}"
highlight-current-row highlight-current-row
@row-click="intentDetail" @row-click="intentDetail"
:row-class-name="tableRowClassName"> :row-class-name="tableRowClassName">
@ -588,6 +588,15 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../assets/css/modules/reset.scss";
@import "../../../assets/css/modules/variables.scss";
@import '../../../assets/css/theme/index.css';
@import '../../../assets/iconfont/iconfont.css';
@import "../../../assets/css/public.scss";
@import "../../../assets/css/index.scss";
@import "../../../assets/css/common.css";
@import "../../../assets/css/visual.css";
@import "../../../assets/css/dialogBg.css";
// //
.contents { .contents {
.contetn_left { .contetn_left {

@ -9,7 +9,7 @@
<div> <div>
<el-table v-loading="loading" :data="manuList" <el-table v-loading="loading" :data="manuList"
style="width: 100%;margin-top: 10px" style="width: 100%;margin-top: 10px"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }" :row-style="{height:'38px'}"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@row-click="intentDetail" @row-click="intentDetail"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"

@ -26,7 +26,7 @@
</el-descriptions> </el-descriptions>
<el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px" <el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px"
border> :row-style="{height:'38px'}" border>
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>

@ -144,10 +144,19 @@ export default {
}; };
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
@import "./home.scss"; @import "./home.scss";
@import "../../assets/css/modules/reset.scss";
@import "../../assets/css/modules/variables.scss";
@import '../../assets/css/theme/index.css';
@import '../../assets/iconfont/iconfont.css';
@import "../../assets/css/public.scss";
@import "../../assets/css/index.scss";
@import "../../assets/css/common.css";
@import "../../assets/css/visual.css";
@import "../../assets/css/dialogBg.css";
.el-radio-button { ::v-deep .el-radio-button {
margin-right: 15px; margin-right: 15px;
margin-top: 15px; margin-top: 15px;
text-align: center; text-align: center;
@ -190,10 +199,10 @@ export default {
</style> </style>
<style lang="scss" scoped> <!-- <style lang="scss" scoped>-->
.el-radio-button--mini .el-radio-button__inner { <!-- .el-radio-button&#45;&#45;mini .el-radio-button__inner {-->
/* padding: 7px 15px; */ <!-- /* padding: 7px 15px; */-->
/* font-size: 12px; */ <!-- /* font-size: 12px; */-->
/* border-radius: 0; */ <!-- /* border-radius: 0; */-->
} <!--}-->
</style> <!--</style>-->

@ -60,6 +60,7 @@
<ItemWrap class="contetn_lr-item2" style="margin-top: 18px;height: 500px;width: 32%" title="单位检查情况"> <ItemWrap class="contetn_lr-item2" style="margin-top: 18px;height: 500px;width: 32%" title="单位检查情况">
<el-table :data="corpList" <el-table :data="corpList"
style="width: 100%" style="width: 100%"
:row-style="{height:'38px'}"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"
highlight-current-row highlight-current-row
@ -82,7 +83,7 @@
</ItemWrap> </ItemWrap>
<ItemWrap class="contetn_lr-item2" style="margin-top: 18px;height: 500px;width: 68%" title="现场检查记录列表"> <ItemWrap class="contetn_lr-item2" style="margin-top: 18px;height: 500px;width: 68%" title="现场检查记录列表">
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="list"
style="width: 100%" style="width: 100%" :row-style="{height:'38px'}"
:cell-style="{ color: '#fff' }" :cell-style="{ color: '#fff' }"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"
highlight-current-row highlight-current-row
@ -472,7 +473,15 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../assets/css/modules/reset.scss";
@import "../../../assets/css/modules/variables.scss";
@import '../../../assets/css/theme/index.css';
@import '../../../assets/iconfont/iconfont.css';
@import "../../../assets/css/public.scss";
@import "../../../assets/css/index.scss";
@import "../../../assets/css/common.css";
@import "../../../assets/css/visual.css";
@import "../../../assets/css/dialogBg.css";
// //
.contents { .contents {
overflow: auto; overflow: auto;

@ -9,7 +9,7 @@
<div> <div>
<el-table v-loading="loading" :data="dataList" <el-table v-loading="loading" :data="dataList"
style="width: 100%;margin-top: 10px" style="width: 100%;margin-top: 10px"
:cell-style="{ color: '#fff' }" :row-style="{height:'38px'}" :cell-style="{ color: '#fff' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@row-click="intentDetail" @row-click="intentDetail"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"

@ -26,7 +26,7 @@
</el-descriptions> </el-descriptions>
<el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px" <el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px"
border> :row-style="{height:'38px'}" border>
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>

@ -2,7 +2,7 @@
<div class="block"> <div class="block">
<el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: -10px" <el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: -10px"
@row-click="intentDetail" :row-style="{height:'38px'}" @row-click="intentDetail"
> >
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="公告时间" prop="eventTime" width="170" show-overflow-tooltip></el-table-column> <el-table-column label="公告时间" prop="eventTime" width="170" show-overflow-tooltip></el-table-column>

@ -78,7 +78,7 @@
<ItemWrap class=" contetn_lr-item2" style="margin-top: 15px;height: 550px" title="追溯信息"> <ItemWrap class=" contetn_lr-item2" style="margin-top: 15px;height: 550px" title="追溯信息">
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="list"
style="width: 100%" style="width: 100%"
:cell-style="{ color: '#fff' }" :row-style="{height:'38px'}" :cell-style="{ color: '#fff' }"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"
highlight-current-row highlight-current-row
:row-class-name="tableRowClassName"> :row-class-name="tableRowClassName">

@ -9,7 +9,7 @@
<div> <div>
<el-table v-loading="loading" :data="list" <el-table v-loading="loading" :data="list"
style="width: 100%" style="width: 100%"
:cell-style="{ color: '#fff' }" :row-style="{height:'38px'}" :cell-style="{ color: '#fff' }"
:header-cell-style="{ color: '#fff' }" :header-cell-style="{ color: '#fff' }"
highlight-current-row highlight-current-row
@row-click="intentDetail" @row-click="intentDetail"

@ -26,7 +26,7 @@
</el-descriptions> </el-descriptions>
<el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px" <el-table v-loading="loading" :data="list" key="1" style="width: 100%;margin-top: 20px"
border> :row-style="{height:'38px'}" border>
<el-table-column label="序号" type="index" width="55"></el-table-column> <el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column> <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>

@ -219,6 +219,15 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../assets/css/modules/reset.scss";
@import "../../../assets/css/modules/variables.scss";
@import '../../../assets/css/theme/index.css';
@import '../../../assets/iconfont/iconfont.css';
@import "../../../assets/css/public.scss";
@import "../../../assets/css/index.scss";
@import "../../../assets/css/common.css";
@import "../../../assets/css/visual.css";
@import "../../../assets/css/dialogBg.css";
// //
.contents { .contents {
//background: #000d4a url(../../assets/img/other/bg.jpg) center top; //background: #000d4a url(../../assets/img/other/bg.jpg) center top;

Loading…
Cancel
Save