Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -48,7 +48,7 @@
         <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
         <p class="reset-button-one" @click="resetQuery">重置</p>
       </el-form-item>
-      <el-form-item style="float: right;" v-hasPermi="['safety:dataItem:export','safety:dataCollegeItem:export']">
+      <el-form-item style="float: right;" v-hasPermi="['safety:dataSub:export']">
         <el-dropdown @command="exportButton">
           <div class="form-dropdown-box">
             <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">

src/views/safetyCheck/dataStatistics/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container dataStatistics">
     <div class="title-box">
-      <div :class="pageType == 1?'checkTitle':''" @click="checkTitleButton(1)" v-hasPermi="['safety:dataSub:list']">
+      <div :class="pageType == 1?'checkTitle':''" @click="checkTitleButton(1)">
         <p>按实验室</p>
         <p></p>
       </div>
-      <div :class="pageType == 2?'checkTitle':''" @click="checkTitleButton(2)" v-hasPermi="['safety:dataHazard:list']">
+      <div :class="pageType == 2?'checkTitle':''" @click="checkTitleButton(2)">
         <p>按安全隐患</p>
         <p></p>
       </div>
-      <div :class="pageType == 3?'checkTitle':''" @click="checkTitleButton(3)" v-hasPermi="['safety:dataItem:list']">
+      <div :class="pageType == 3?'checkTitle':''" @click="checkTitleButton(3)">
         <p>按检查指标</p>
         <p></p>
       </div>

src/views/safetyCheck/dataStatistics/safetyHazardStatistics.vue

@@ -57,7 +57,7 @@
         <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
         <p class="reset-button-one" @click="resetQuery">重置</p>
       </el-form-item>
-      <el-form-item style="float: right;" v-hasPermi="['safety:dataHazard:export']">
+      <el-form-item style="float: right;" v-hasPermi="['safety:dataSub:export']">
         <el-dropdown @command="exportButton">
           <div class="form-dropdown-box">
             <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">