大屏几个统计问题更改

部分细节bug先上传

src/api/api.js

@@ -78,17 +78,18 @@ service.interceptors.request.use(
         const s_data = sessionObj.data; // 请求数据
         const s_time = sessionObj.time; // 请求时间
         const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
-        if (
+        // if (
-          s_data === requestObj.data &&
+        //   s_data === requestObj.data &&
-          requestObj.time - s_time < interval &&
+        //   requestObj.time - s_time < interval &&
-          s_url === requestObj.url
+        //   s_url === requestObj.url
-        ) {
+        // ) {
-          const message = "数据正在处理，请勿重复提交";
+        //   const message = "数据正在处理，请勿重复提交";
-          console.warn(`[${s_url}]: ` + message);
+        //   console.warn(`[${s_url}]: ` + message);
-          return Promise.reject(new Error(message));
+        //   return Promise.reject(new Error(message));
-        } else {
+        // } else {
-          cache.session.setJSON("sessionObj", requestObj);
+        //   cache.session.setJSON("sessionObj", requestObj);
-        }
+        // }
+        cache.session.setJSON("sessionObj", requestObj);
       }
     }
     return config;

src/api/modules/index.js

@@ -34,7 +34,9 @@ export const paramType = {
     "companyBusTypeStat": "/udi/basic/company/bussinessType/stat",           //根据企业类型查询产品汇总
     "companyOnlineCheckStat": "/admin/auth/online/check/list",   //现场检查
     "onlineCheckStat": "/udi/basic/online/check/stat",
-    "monthStatList": "/bigVis/month/stat/list"
+    "monthStatList": "/bigVis/month/stat/list",
+    'getNetworkFirmCount': '/bigVis/import/corp/inv/getNetworkFirmCount',//获取入网企业填报情况
+
 
 }
 /******************      通用增删改查       ********************* */

src/api/utils/request.js

@@ -68,17 +68,18 @@ service.interceptors.request.use(
         const s_data = sessionObj.data; // 请求数据
         const s_time = sessionObj.time; // 请求时间
         const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
-        if (
+        // if (
-          s_data === requestObj.data &&
+        //   s_data === requestObj.data &&
-          requestObj.time - s_time < interval &&
+        //   requestObj.time - s_time < interval &&
-          s_url === requestObj.url
+        //   s_url === requestObj.url
-        ) {
+        // ) {
-          const message = "数据正在处理，请勿重复提交";
+        //   const message = "数据正在处理，请勿重复提交";
-          console.warn(`[${s_url}]: ` + message);
+        //   console.warn(`[${s_url}]: ` + message);
-          return Promise.reject(new Error(message));
+        //   return Promise.reject(new Error(message));
-        } else {
+        // } else {
-          cache.session.setJSON("sessionObj", requestObj);
+        //   cache.session.setJSON("sessionObj", requestObj);
-        }
+        // }
+        cache.session.setJSON("sessionObj", requestObj);
       }
     }
     return config;

src/utils/request.js

@@ -69,17 +69,19 @@ service.interceptors.request.use(
         const s_time = sessionObj.time; // 请求时间
         const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
 
-        if (
+        // if (
-          s_data === requestObj.data &&
+        //   s_data === requestObj.data &&
-          requestObj.time - s_time < interval &&
+        //   requestObj.time - s_time < interval &&
-          s_url === requestObj.url
+        //   s_url === requestObj.url
-        ) {
+        // ) {
-          const message = "数据正在处理，请勿重复提交";
+        //   const message = "数据正在处理，请勿重复提交";
-          console.warn(`[${s_url}]: ` + message);
+        //   console.warn(`[${s_url}]: ` + message);
-          return Promise.reject(new Error(message));
+        //   return Promise.reject(new Error(message));
-        } else {
+        // } else {
-          cache.session.setJSON("sessionObj", requestObj);
+        //   cache.session.setJSON("sessionObj", requestObj);
-        }
+        // }
+        cache.session.setJSON("sessionObj", requestObj);
+
       }
     }
     return config;

src/views/daping/hosp2/index.vue

@@ -244,11 +244,11 @@ export default {
     },
   },
   created() {
-    this.getStatCompany()
+
-    this.init()
   },
 
   mounted() {
+    this.getStatCompany();
   },
   methods: {
 
@@ -309,7 +309,7 @@ export default {
             name: '产品分类',
             type: 'bar',
             barWidth: 20,
-            data: [this.statBustype.purPreIn, this.statBustype.purNormal, this.statBustype.purPre,],
+            data: [this.statBustype.purPreIn, this.statBustype.purNormal, this.statBustype.purPre],
             label: {
               normal: {
                 show: true,//开启显示
@@ -325,10 +325,12 @@ export default {
     },
 
     getStatCompany() {
+
       currentGET('companyBusTypeStat', {bussinessStatus: 3}
       ).then(res => {
         // 复制过来的返回有两个层级 用三元智能判断转换
         res = typeof res.data === "undefined" ? res : res.data
+
         if (res.code == 20000) {
           this.statBustype = res.data
         } else {
@@ -337,6 +339,7 @@ export default {
             type: 'warning'
           })
         }
+        this.init()
       })
     }
 

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

@@ -5,26 +5,37 @@
         <div class="visual_conTop_box visual_conTop2">
           <div>
             <h3>入网总企业数</h3>
-            <p style="color: #F3DB5C;padding-left: 15px"> 8</p>
+            <p style="color: #F3DB5C;padding-left: 15px"> {{statNmapCount.sumCount}}</p>
           </div>
         </div>
         <div class="visual_conTop_box visual_conTop2"
         >
           <div>
             <h3>本期已填报数</h3>
-            <p style="color: #4ADEFE;padding-left: 15px"> 1</p>
+            <p style="color: #4ADEFE;padding-left: 15px"> {{statNmapCount.reportedCount}}</p>
           </div>
         </div>
         <div class="visual_conTop_box visual_conTop2">
           <div>
             <h3>本期未填报数</h3>
-            <p style="color: #d56e6e;padding-left: 15px"> 7</p>
+            <p style="color: #d56e6e;padding-left: 15px"> {{statNmapCount.notReportedCount}}</p>
           </div>
         </div>
         <div class="clear"></div>
       </div>
     </div>
-
+    <Echart
+      :options="corpOptions1"
+      style="width: 33%;display: inline-block;height: 200px;margin-top: 5px;"
+    ></Echart>
+    <Echart
+      :options="corpOptions2"
+      style="width: 33%;display: inline-block;height: 200px;margin-top: 5px;"
+    ></Echart>
+    <Echart
+      :options="corpOptions3"
+      style="width: 33%;display: inline-block;height: 200px;margin-top: 5px;"
+    ></Echart>
   </div>
 </template>
 
@@ -35,11 +46,21 @@ export default {
   name: "center-stat",
   data() {
     return {
+      corpOptions1: {},
+      corpOptions2: {},
+      corpOptions3: {},
       pageflag: false,
-      data: {
+      statNmapCount: {
-        productCount: 0,
+        sumCount:0,
-        fjProductCount: 0,
+        reportedCount:0,
-        fjCorpCount: 0,
+        notReportedCount:0,
+        oneReportedCount:0,
+        oneNotReportedCount:0,
+        twoReportedCount:0,
+        twoNotReportedCount:0,
+        threeReportedCount:0,
+        threeNotReportedCount:0,
+
       }
 
     }
@@ -50,17 +71,203 @@ export default {
   methods: {
     getData() {
       this.pageflag = true;
-      currentGET("nmapCount").then((res) => {
+      currentGET("getNetworkFirmCount").then((res) => {
         // 复制过来的返回有两个层级 用三元智能判断转换
         res = typeof res.data === "undefined" ? res : res.data
         if (res.code == 20000) {
-          this.data = res.data;
+          this.statNmapCount = res.data;
         } else {
           this.pageflag = false;
           this.$Message.warning(res.msg);
         }
+        this.init()
       });
     },
+    init() {
+
+
+      this.corpOptions1 = {
+        title: {
+          subtext: '生产企业',
+          color: "#fff",
+          left: 'center',
+          textStyle: {},
+          subtextStyle: {
+            color: "#fff"
+          }
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [
+          {
+            name: '生产企业',
+            type: 'pie',
+            radius: '50%',
+            data: [
+              {value: this.statNmapCount.oneReportedCount, name: '已上报'},
+              {value:  this.statNmapCount.oneNotReportedCount, name: '未上报'},
+            ],
+
+
+            rich: {
+              b: {
+                color: "#fff",
+                fontSize: 12,
+                lineHeight: 26,
+              },
+              c: {
+                color: "#31ABE3",
+                fontSize: 14,
+              },
+              per: {
+                color: "#31ABE3",
+                fontSize: 14,
+              },
+            },
+            label: {
+
+              normal: {
+                show: true,
+                position: 'inner',
+                formatter: "{b}/{c}  ",
+                color: "#fff",
+
+
+              },
+            },
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      };
+      this.corpOptions2 = {
+        title: {
+          subtext: '经营企业',
+          color: "#fff",
+          left: 'center',
+          textStyle: {},
+          subtextStyle: {
+            color: "#fff"
+          }
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [
+          {
+            name: '经营企业',
+            type: 'pie',
+            radius: '50%',
+            data: [
+              {value: this.statNmapCount.twoReportedCount, name: '已上报'},
+              {value:  this.statNmapCount.twoNotReportedCount, name: '未上报'},
+            ],
+
+
+            rich: {
+              b: {
+                color: "#fff",
+                fontSize: 12,
+                lineHeight: 26,
+              },
+              c: {
+                color: "#31ABE3",
+                fontSize: 14,
+              },
+              per: {
+                color: "#31ABE3",
+                fontSize: 14,
+              },
+            },
+            label: {
+
+              normal: {
+                show: true,
+                position: 'inner',
+                formatter: "{b}/{c}  ",
+                color: "#fff",
+
+
+              },
+            },
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      };
+      this.corpOptions3 = {
+        title: {
+          subtext: '医疗机构',
+          color: "#fff",
+          left: 'center',
+          textStyle: {},
+          subtextStyle: {
+            color: "#fff"
+          }
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        series: [
+          {
+            name: '医疗机构',
+            type: 'pie',
+            radius: '50%',
+            data: [
+              {value: this.statNmapCount.threeReportedCount, name: '已上报'},
+              {value:  this.statNmapCount.threeNotReportedCount, name: '未上报'},
+            ],
+
+
+            rich: {
+              b: {
+                color: "#fff",
+                fontSize: 12,
+                lineHeight: 26,
+              },
+              c: {
+                color: "#31ABE3",
+                fontSize: 14,
+              },
+              per: {
+                color: "#31ABE3",
+                fontSize: 14,
+              },
+            },
+            label: {
+
+              normal: {
+                show: true,
+                position: 'inner',
+                formatter: "{b}/{c}  ",
+                color: "#fff",
+
+
+              },
+            },
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      };
+
+    },
   },
 
 

src/views/daping/inout/index.vue

@@ -33,18 +33,7 @@
       <div class="contetn_left">
         <ItemWrap style="height: 440px;margin-top: 1px" title="入网企业填报情况">
           <centerTop></centerTop>
-          <Echart
+
-              :options="corpOptions1"
-              style="width: 33%;display: inline-block;height: 200px;margin-top: 5px;"
-          ></Echart>
-          <Echart
-              :options="corpOptions2"
-              style="width: 33%;display: inline-block;height: 200px;margin-top: 5px;"
-          ></Echart>
-          <Echart
-              :options="corpOptions3"
-              style="width: 33%;display: inline-block;height: 200px;margin-top: 5px;"
-          ></Echart>
 
         </ItemWrap>
         <!--        <item-wrap style="height: 220px;margin-top: 1px" title="单位类型">-->
@@ -183,9 +172,7 @@ export default {
   data() {
     return {
       ioOptions: {},
-      corpOptions1: {},
+
-      corpOptions2: {},
-      corpOptions3: {},
       curCorp: {},
       addDialogVisible: false,
       value2: new Date().getTime() - 3600 * 1000 * 24 * 30,
@@ -355,187 +342,6 @@ export default {
         ]
       };
 
-      this.corpOptions1 = {
-        title: {
-          subtext: '生产企业',
-          color: "#fff",
-          left: 'center',
-          textStyle: {},
-          subtextStyle: {
-            color: "#fff"
-          }
-        },
-        tooltip: {
-          trigger: 'item'
-        },
-        series: [
-          {
-            name: '生产企业',
-            type: 'pie',
-            radius: '50%',
-            data: [
-              {value: 0, name: '已上报'},
-              {value: 2, name: '未上报'},
-            ],
-
-
-            rich: {
-              b: {
-                color: "#fff",
-                fontSize: 12,
-                lineHeight: 26,
-              },
-              c: {
-                color: "#31ABE3",
-                fontSize: 14,
-              },
-              per: {
-                color: "#31ABE3",
-                fontSize: 14,
-              },
-            },
-            label: {
-
-              normal: {
-                show: true,
-                position: 'inner',
-                formatter: "{b}/{c}  ",
-                color: "#fff",
-
-
-              },
-            },
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      this.corpOptions2 = {
-        title: {
-          subtext: '经营企业',
-          color: "#fff",
-          left: 'center',
-          textStyle: {},
-          subtextStyle: {
-            color: "#fff"
-          }
-        },
-        tooltip: {
-          trigger: 'item'
-        },
-        series: [
-          {
-            name: '经营企业',
-            type: 'pie',
-            radius: '50%',
-            data: [
-              {value: 1, name: '已上报'},
-              {value: 0, name: '未上报'},
-            ],
-
-
-            rich: {
-              b: {
-                color: "#fff",
-                fontSize: 12,
-                lineHeight: 26,
-              },
-              c: {
-                color: "#31ABE3",
-                fontSize: 14,
-              },
-              per: {
-                color: "#31ABE3",
-                fontSize: 14,
-              },
-            },
-            label: {
-
-              normal: {
-                show: true,
-                position: 'inner',
-                formatter: "{b}/{c}  ",
-                color: "#fff",
-
-
-              },
-            },
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-      this.corpOptions3 = {
-        title: {
-          subtext: '医疗机构',
-          color: "#fff",
-          left: 'center',
-          textStyle: {},
-          subtextStyle: {
-            color: "#fff"
-          }
-        },
-        tooltip: {
-          trigger: 'item'
-        },
-        series: [
-          {
-            name: '医疗机构',
-            type: 'pie',
-            radius: '50%',
-            data: [
-              {value: 0, name: '已上报'},
-              {value: 5, name: '未上报'},
-            ],
-
-
-            rich: {
-              b: {
-                color: "#fff",
-                fontSize: 12,
-                lineHeight: 26,
-              },
-              c: {
-                color: "#31ABE3",
-                fontSize: 14,
-              },
-              per: {
-                color: "#31ABE3",
-                fontSize: 14,
-              },
-            },
-            label: {
-
-              normal: {
-                show: true,
-                position: 'inner',
-                formatter: "{b}/{c}  ",
-                color: "#fff",
-
-
-              },
-            },
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-
     },
     getCorpInvData() {
       currentGET('corpInvList', {page: this.page, limit: this.limit, uploadFlag: 1}).then(res => {

src/views/daping/manu/index.vue

@@ -235,16 +235,14 @@ export default {
     },
   },
   created() {
-    this.init()
   },
 
   mounted() {
-
+    this.getStatCompany()
   },
   methods: {
 
     init() {
-      this.getStatCompany()
       this.histogramChart1 = {
         color: ['#5bc0de'],
         grid: {
@@ -305,7 +303,7 @@ export default {
             name: '',
             type: 'bar',
             barWidth: 20,
-            data: [0, 1, 2],
+            data: [this.statBustype.levelOneCount, this.statBustype.levelTwoCount, this.statBustype.levelthreeCount],
             label: {
               normal: {
                 show: true,//开启显示
@@ -328,14 +326,17 @@ export default {
       currentGET('companyBusTypeStat', {bussinessStatus: 1}
       ).then(res => {
         if (res.data.code == 20000) {
-          console.log("生产企业分类",res.data.data)
+          // 复制过来的返回有两个层级 用三元智能判断转换
-          this.statBustype = res.data.data
+          res = typeof res.data === "undefined" ? res : res.data
+          this.statBustype = res.data
         } else {
           this.$Message({
             text: res.msg,
             type: 'warning'
           })
         }
+        this.init()
+
       })
     }
 

src/views/daping/mapIndex.vue

@@ -44,7 +44,7 @@
 
             <el-radio-button label="" style="width: 20px">
             </el-radio-button>
-            <el-radio-button label="/daping/mapIndex">
+            <el-radio-button label="/daping/mapIndex" >
               入网单位
             </el-radio-button>
             <el-radio-button label="/daping/mapIndex2">
@@ -65,9 +65,9 @@
             <el-radio-button label="/home14">
               预警信息
             </el-radio-button>
-            <el-radio-button label="/home6">
+<!--            <el-radio-button label="/home6">-->
-              不良事件
+<!--              不良事件-->
-            </el-radio-button>
+<!--            </el-radio-button>-->
           </el-radio-group>
         </div>
         <!-- 头部 e-->

src/views/daping/sup3/index.vue

@@ -234,12 +234,11 @@ export default {
   },
 
   mounted() {
-    this.init()
+    this.getStatCompany()
   },
   methods: {
 
     init() {
-      this.getStatCompany()
       this.histogramChart1 = {
         color: ['#5bc0de'],
         grid: {
@@ -300,7 +299,7 @@ export default {
             name: '',
             type: 'bar',
             barWidth: 20,
-            data: [0, 1, 1],
+            data: [this.statBustype.levelOneCount, this.statBustype.levelTwoCount, this.statBustype.levelthreeCount],
             label: {
               normal: {
                 show: true,//开启显示
@@ -332,6 +331,7 @@ export default {
             type: 'warning'
           })
         }
+        this.init()
       })
     }
   },

src/views/improveInfo.vue

@@ -185,7 +185,32 @@
 
         </el-row>
 
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px" v-if="inputQuery.bussinessStatus == 3">
+          <el-col :span="15" class="el-col">
+            <el-form-item label="医院等级:" prop="hospitalLevel">
+              <el-select
+                size="small"
+                v-model="inputQuery.hospitalLevel"
+                placeholder="医院等级"
+                style="width: 100%"
+              >
+                <el-option label="三级特等" value="1"></el-option>
+                <el-option label="三级甲等" value="2"></el-option>
+                <el-option label="三级乙等" value="3"></el-option>
+                <el-option label="三级丙等" value="4"></el-option>
+                <el-option label="二级甲等" value="5"></el-option>
+                <el-option label="二级乙等" value="6"></el-option>
+                <el-option label="二级丙等" value="7"></el-option>
+                <el-option label="一级甲等" value="8"></el-option>
+                <el-option label="一级乙等" value="9"></el-option>
+                <el-option label="一级丙等" value="10"></el-option>
+                <!--<el-option label="监管机构" value="4"></el-option>-->
+              </el-select>
+            </el-form-item>
+          </el-col>
 
+
+        </el-row>
         <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
           <el-col :span="15" class="el-col">
 
@@ -592,6 +617,7 @@ export default {
       inputQuery: {
         ucstatus: 0,
         formData: {},
+        hospitalLevel:'1',
       },
       headers: {},
       imgViewerVisible: false,

src/views/userManage/registerManage.vue

@@ -482,8 +482,8 @@
 
             <el-table-column label="备注" prop="remark" width="120"></el-table-column>
 
-            <el-table-column label="操作" width="120" fixed="right">
+            <el-table-column label="操作" width="200" fixed="right">
-              <template slot-scope="scope">
+              <template >
                 <el-button
                   type="text"
                   size="small"