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

# Conflicts:
#	.env.development
#	package.json

.env.development

@@ -5,7 +5,8 @@ VUE_APP_TITLE = UDI追溯监管平台
 ENV = 'development'
 
 # 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/
 VUE_APP_CONTEXT_PATH = '/'

README.md

@@ -11,3 +11,7 @@ npm run build:stage
 # 构建生产环境
 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/

package.json

@@ -5,7 +5,7 @@
   "author": "LionLi",
   "license": "MIT",
   "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:test": "vue-cli-service build --mode test",
     "preview": "node build/index.js --preview",
@@ -37,12 +37,15 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "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",
+    "@tinymce/tinymce-vue": "3.0.1",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.19.1",
     "echarts": "4.9.0",
+    "element-china-area-data": "^5.0.2",
     "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
@@ -56,16 +59,16 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "tinymce": "^6.2.0",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue-seamless-scroll": "^1.1.23",
     "vue2-verify": "^1.1.5",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0",
+    "vuex": "3.6.0"
-    "@tinymce/tinymce-vue": "3.0.1",
-    "tinymce": "^6.2.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

src/api/api.js

@@ -1,4 +1,3 @@
-
 /*
  * @LastEditors: Please set LastEditors
  * @LastEditTime: 2022-04-28 10:25:38
@@ -15,9 +14,9 @@ import store from "@/store";
 import {isRelogin} from "@/api/utils/request";
 // 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;
-export { baseUrl };
+export {baseUrl};
 // axios.defaults.withCredentials = true;
 
 
@@ -272,7 +271,7 @@ export const DELETE = async (url, params) => {
   // console.log(params)
   try {
     params = isEncryptionParam(params)
-        const data = await axios.delete(`${baseUrl}${url}`, { data: params, headers: configs_ENC.headers }, configs_ENC);
+    const data = await axios.delete(`${baseUrl}${url}`, {data: params, headers: configs_ENC.headers}, configs_ENC);
     return data;
   } catch (error) {
     return error;
@@ -284,7 +283,7 @@ export const DELETE = async (url, params) => {
  * @文件类型提交方法
  */
 let configs = {
-    headers: { 'Content-Type': 'multipart/form-data' },
+  headers: {'Content-Type': 'multipart/form-data'},
 
 }
 export const FILESubmit = async (url, params, config) => {

src/assets/css/index.scss

@@ -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-] {
   font-family: iconfont !important;

src/assets/styles/index.scss

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

src/main.js

@@ -82,10 +82,10 @@ Vue.use(borderBox13)
 Vue.use(borderBox8)
 Vue.use(digitalFlop)
 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"
 
 DictData.install()

src/views/basic/client/product/UdiInfoSelectLocalUdiManu.vue

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

src/views/daping/home/left-bottom1.vue

@@ -9,7 +9,7 @@
   <div>
     <!--    <el-tabs v-model="activeName" @tab-click="handleClick">-->
     <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' }"
               :row-class-name="tableRowClassName"
               :header-cell-style="{ color: '#fff' }"

src/views/daping/home/left-top.vue

@@ -176,6 +176,16 @@ export default {
 };
 </script>
 <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 {
   li {
     flex: 1;

src/views/daping/home/right-bottom.vue

@@ -65,13 +65,14 @@ export default {
       // this.pageflag =false
 
       currentGET('big1', {regionCode: this.regionCode}).then(res => {
-        console.log("单位分类统计",res)
+        console.log("单位分类统计", res)
         //只打印一次
         if (!this.timer) {
           console.log("设备总览", res);
         }
-        console.log("单位分类统计返回的code",res.data.code)
+        console.log("单位分类统计返回的code", res.data.code)
         if (res.data.code == 20000) {
+          if (res.data.data != null)
             this.countUserNumData = res.data.data
           this.$nextTick(() => {
             this.init()
@@ -104,7 +105,9 @@ export default {
       });
     },
     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 piedata = {
         name: "单位分类",

src/views/daping/home/right-top.vue

@@ -10,7 +10,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
       <el-tab-pane label="生产企业" name="first">
         <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' }"
                   :row-class-name="tableRowClassName"
                   @row-click="intentDetail"
@@ -31,7 +31,7 @@
       </el-tab-pane>
       <el-tab-pane label="经营企业" name="second">
         <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-click="intentDetail"
                   :cell-style="{ color: '#fff' }"
@@ -52,7 +52,7 @@
       </el-tab-pane>
       <el-tab-pane label="医疗机构" name="third">
         <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' }"
                   :row-class-name="tableRowClassName"
                   @row-click="intentDetail"

src/views/daping/hosp2/corpItem.vue

@@ -10,7 +10,7 @@
 <template>
   <div>
     <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-click="intentDetail"
               :cell-style="{ color: '#fff' }"

src/views/daping/hosp2/dialogCorpProduct.vue

@@ -27,6 +27,7 @@
 
     <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'}"
+              :row-style="{height:'38px'}"
               border>
       <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>

src/views/daping/inout/dialogInoutInfo.vue

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

src/views/daping/inout/index.vue

@@ -60,7 +60,7 @@
                     :cell-style="{ color: '#fff' }"
                     :header-cell-style="{ color: '#fff' }"
                     highlight-current-row
-
+                    :row-style="{height:'38px'}"
                     :row-class-name="tableRowClassName">
             <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>
@@ -86,7 +86,7 @@
           <el-table v-loading="loading" :data="list"
                     style="width: 100%"
                     :cell-style="{ color: '#fff' }"
-                    :header-cell-style="{ color: '#fff' }"
+                    :header-cell-style="{ color: '#fff' }" :row-style="{height:'38px'}"
                     highlight-current-row
                     @row-click="intentDetail"
                     :row-class-name="tableRowClassName">
@@ -588,6 +588,15 @@ export default {
 };
 </script>
 <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 {
   .contetn_left {

src/views/daping/manu/center-top.vue

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

src/views/daping/manu/dialogCorpProduct.vue

@@ -26,7 +26,7 @@
     </el-descriptions>
 
     <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="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>

src/views/daping/mapIndex.vue

@@ -88,7 +88,7 @@ import ScaleScreen from "@/components/scale-screen/scale-screen.vue";
 import index from "@/views/daping/home/index"
 
 export default {
-  name:"home",
+  name: "home",
   components: {Setting, ScaleScreen},
   data() {
     return {
@@ -144,10 +144,19 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 @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-top: 15px;
   text-align: center;
@@ -190,10 +199,10 @@ export default {
 
 
 </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>-->

src/views/daping/product/traceIndex.vue

@@ -60,6 +60,7 @@
         <ItemWrap class="contetn_lr-item2" style="margin-top: 18px;height: 500px;width: 32%" title="单位检查情况">
           <el-table :data="corpList"
                     style="width: 100%"
+                    :row-style="{height:'38px'}"
                     :cell-style="{ color: '#fff' }"
                     :header-cell-style="{ color: '#fff' }"
                     highlight-current-row
@@ -82,7 +83,7 @@
         </ItemWrap>
         <ItemWrap class="contetn_lr-item2" style="margin-top: 18px;height: 500px;width: 68%" title="现场检查记录列表">
           <el-table v-loading="loading" :data="list"
-                    style="width: 100%"
+                    style="width: 100%" :row-style="{height:'38px'}"
                     :cell-style="{ color: '#fff' }"
                     :header-cell-style="{ color: '#fff' }"
                     highlight-current-row
@@ -472,7 +473,15 @@ export default {
 };
 </script>
 <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 {
   overflow: auto;

src/views/daping/sup3/corpItem.vue

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

src/views/daping/sup3/dialogCorpProduct.vue

@@ -26,7 +26,7 @@
     </el-descriptions>
 
     <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="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>

src/views/daping/trace/dialogAdverseMsg.vue

@@ -2,7 +2,7 @@
   <div class="block">
 
     <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="公告时间" prop="eventTime" width="170" show-overflow-tooltip></el-table-column>

src/views/daping/trace/traceIndex.vue

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

src/views/daping/warn2/center-top.vue

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

src/views/daping/warn2/dialogCorpProduct.vue

@@ -26,7 +26,7 @@
     </el-descriptions>
 
     <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="产品通用名称" prop="cpmctymc" width="180" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>

src/views/daping/warn2/index.vue

@@ -219,6 +219,15 @@ export default {
 };
 </script>
 <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 {
   //background: #000d4a url(../../assets/img/other/bg.jpg) center top;