diff --git a/src/assets/images/qualityManage/btnBg.png b/src/assets/images/qualityManage/btnBg.png
new file mode 100644
index 00000000..5f4cba84
Binary files /dev/null and b/src/assets/images/qualityManage/btnBg.png differ
diff --git a/src/assets/images/qualityManage/defBtn.png b/src/assets/images/qualityManage/defBtn.png
new file mode 100644
index 00000000..3d1a98f6
Binary files /dev/null and b/src/assets/images/qualityManage/defBtn.png differ
diff --git a/src/assets/images/qualityManage/secyre01.png b/src/assets/images/qualityManage/secyre01.png
new file mode 100644
index 00000000..0c5f0687
Binary files /dev/null and b/src/assets/images/qualityManage/secyre01.png differ
diff --git a/src/assets/images/qualityManage/secyre02.png b/src/assets/images/qualityManage/secyre02.png
new file mode 100644
index 00000000..6fbe7c4b
Binary files /dev/null and b/src/assets/images/qualityManage/secyre02.png differ
diff --git a/src/assets/images/qualityManage/secyre03.png b/src/assets/images/qualityManage/secyre03.png
new file mode 100644
index 00000000..44549f01
Binary files /dev/null and b/src/assets/images/qualityManage/secyre03.png differ
diff --git a/src/assets/images/qualityManage/secyre04.png b/src/assets/images/qualityManage/secyre04.png
new file mode 100644
index 00000000..311516eb
Binary files /dev/null and b/src/assets/images/qualityManage/secyre04.png differ
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 77c4d5a5..6358655c 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -35,11 +35,12 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL = 'http://14.29.220.211:6023/'
     // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
     // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' 
-    axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁   17512009894    123456789   gdjt   123456789
+
+    // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁   17512009894    123456789   gdjt   123456789
 
     // axios.defaults.baseURL = 'http://124.71.178.44:100/'
     // tag: 本地
-    // axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
+    axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
     // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
 
 
diff --git a/src/views/projectAdmin/dataBoardTwo/components/qualityAndsecure.vue b/src/views/projectAdmin/dataBoardTwo/components/qualityAndsecure.vue
new file mode 100644
index 00000000..a1f4d257
--- /dev/null
+++ b/src/views/projectAdmin/dataBoardTwo/components/qualityAndsecure.vue
@@ -0,0 +1,63 @@
+<template>
+ 
+    <div class="tabBox">
+      <div class="btnItem " :class="tabBoxIndex==0?'this_select':''" @click="tabSwitch('quality')">质量管理</div>
+      <div class="btnItem" :class="tabBoxIndex==1?'this_select':''" @click="tabSwitch('secure')">安全管理</div>
+    </div>
+
+</template>
+
+<script>
+export default {
+   name:'tabBox',
+   props:{
+    tabBoxIndex:{
+      type: Number,
+      default:0
+    },
+   },
+   data (){
+    return {
+        
+    }
+   },
+  created(){
+    console.log(this.tabBoxIndex,"tabBoxIndex")
+  },
+   methods:{
+      tabSwitch(v){
+          this.$router.push({path:v})
+      }
+   }
+}
+</script>
+
+<style lang="less" scoped>
+
+.btnItem {
+  width: 97px;
+  height: 41px;
+  background: url('../../../../assets/images/qualityManage/defBtn.png');
+  background-size: 100% 100%;
+  color: #5ce2f6;
+  font-size: 16px;
+  font-weight: bold;
+  text-align: center;
+  line-height: 41px;
+  margin-right: 12px;
+  margin-left: 12px;
+  cursor: pointer;
+}
+.this_select {
+  
+  color: #fff !important;
+  background: url('../../../../assets/images/qualityManage/btnBg.png') !important;
+}
+.tabBox {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  margin-bottom: 40px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/projectAdmin/dataBoardTwo/quality.vue b/src/views/projectAdmin/dataBoardTwo/quality.vue
index b60abd88..5cdf8b3f 100644
--- a/src/views/projectAdmin/dataBoardTwo/quality.vue
+++ b/src/views/projectAdmin/dataBoardTwo/quality.vue
@@ -6,6 +6,7 @@
         </vue-scroll>
     </div> -->
   <div v-if="COMPANY != 'longguang'" class="fullHeight dataBoardIndex">
+    <qualityAndsecureTab :tabBoxIndex="0"></qualityAndsecureTab>
     <div class="left fullHeight">
       <div class="blockBox blockBox2">
         <div class="blockTitle">
@@ -100,14 +101,15 @@
                 </p>
                 <p class="num">{{ total.jyUrgentLevelNum }}</p>
               </div>
-              <div class="descItem descItem1">
+               <!-- 严重问题 -->
+              <!-- <div class="descItem descItem1">
                 <p class="text">
                   <i class="dot purple"></i>
-                  <!-- 严重问题 -->
+                 
                   {{ $t("message.dataBoard.seriousnessProblem") }}
                 </p>
                 <p class="num">{{ total.yzUrgentLevelNum }}</p>
-              </div>
+              </div> -->
               <div class="descItem">
                 <p class="text">
                   <i class="dot green"></i>
@@ -127,26 +129,28 @@
         </div>
         <div class="blockContent">
           <div class="switchBox">
-            <span
+                 <!-- 全部 -->
+            <!-- <span
               @click="
                 dataType2 = 1;
                 getData2(2);
               "
               :class="dataType2 == 1 ? 'active' : ''"
             >
-              <!-- 全部 -->
+              
               {{ $t("message.dataBoard.all") }}
-            </span>
-            <span
+            </span> -->
+            <!-- 最近30天 -->
+            <!-- <span
               @click="
                 dataType2 = 2;
                 getData2(2);
               "
               :class="dataType2 == 2 ? 'active' : ''"
             >
-              <!-- 最近30天 -->
+              
               {{ $t("message.dataBoard.lately30days") }}
-            </span>
+            </span> -->
           </div>
           <div class="ratioChart" ref="frequentChart"></div>
           <div class="placeholderBox placeholderBox2" v-if="noData2">
@@ -164,6 +168,7 @@
 </template>
 <script>
 import echarts from "echarts4";
+import qualityAndsecureTab from "./components/qualityAndsecure"
 import {
   selectDangerTypeQualityCountApi,
   selectQualityStatisticsApi,
@@ -196,7 +201,7 @@ export default {
     };
   },
   components: {
-    QualityTwo,
+    QualityTwo,qualityAndsecureTab
   },
   created() {
     this.COMPANY = COMPANY;
diff --git a/src/views/projectAdmin/dataBoardTwo/secure.vue b/src/views/projectAdmin/dataBoardTwo/secure.vue
index 875d0fc1..316cfb20 100644
--- a/src/views/projectAdmin/dataBoardTwo/secure.vue
+++ b/src/views/projectAdmin/dataBoardTwo/secure.vue
@@ -7,6 +7,7 @@
     </div> -->
 
     <div v-if="COMPANY != 'longguang'" class="fullHeight dataBoardIndex">
+      <qualityAndsecureTab :tabBoxIndex="1"></qualityAndsecureTab>
         <div class="left fullHeight">
             <div class="blockBox blockBox2">
                 <div class="blockTitle">
@@ -26,6 +27,9 @@
                     <div class="circleBox">
                         <div class="ratioChart" ref="ratioChart4"></div>
                     </div>
+                    <div class="circleBox">
+                        <img src="../../../assets/images/qualityManage/secyre01.png" alt="">
+                    </div>
                 </div>
             </div>
             <div class="blockBox blockBox3" style="height:calc(66.66% - 25px)">
@@ -52,27 +56,28 @@
             <div class="blockBox">
                 <div class="blockTitle">
                 <!-- 待整改 -->
-                {{$t('message.dataBoard.awaitChange')}}
+                <!-- {{$t('message.dataBoard.awaitChange')}} -->
+                问题类型
                 </div>
                 <div class="blockContent alarmBlockContent">
-                    <vue-scroll>
+                    <!-- <vue-scroll>
                         <table class="greenTable">
                         <thead>
                             <tr>
                             <th width="150">
-                                <!-- 检查项 -->
+                               
                                  {{$t('message.dataBoard.checkedItem')}}
                             </th>
                             <th>
-                                <!-- 检查内容 -->
+                              
                                  {{$t('message.dataBoard.checkedContent')}}
                             </th>
                              <th>
-                                <!-- 检查时间 -->
+                               
                                 {{$t('message.dataBoard.checkedTime')}}
                             </th>
                             <th>
-                                <!-- 整改人 -->
+                               
                                 {{$t('message.dataBoard.changePeople')}}
                             </th>
                             </tr>
@@ -94,94 +99,77 @@
                         >
                         <img src="@/assets/images/noData3.png" alt="" srcset="" />
                         <p>
-                        <!-- 暂无数据 -->
+                     
                         {{$t('message.dataBoard.nodata')}}
                         </p>
                         </div>
-                    </vue-scroll>
+                    </vue-scroll> -->
+                    <img style="width:350px;height:212px" src="../../../assets/images/qualityManage/secyre02.png" alt="" srcset="">
                 </div>
             </div>
             <div class="blockBox">
                 <div class="blockTitle">
                 <!-- 问题占比 -->
-                {{$t('message.dataBoard.problemRatio')}}
+                <!-- {{$t('message.dataBoard.problemRatio')}} -->
+                安全预警
                 </div>
                 <div class="blockContent">
-                    <div class="safeTrainChart" ref="safeTrainChart"></div>
+                    <img style="width:350px;height:212px" src="../../../assets/images/qualityManage/secyre03.png" alt="" srcset="">
+                    <!-- <div class="safeTrainChart" ref="safeTrainChart"></div>
                     <div class="descBox fullHeight">
                         <div>
                             <div class="descItem descItem1">
                                 <p class="text"><i class="dot red"></i>
-                                <!-- 周检 -->
+                               
                                 {{$t('message.dataBoard.weekChecked')}}
                                 </p>
                                 <p class="num">{{total.weekInspectNum}}</p>
                             </div>
                             <div class="descItem descItem1">
                                 <p class="text"><i class="dot purple"></i>
-                                <!-- 月检 -->
+                           
                                 {{$t('message.dataBoard.monthChecked')}}
                                 </p>
                                 <p class="num">{{total.monthInspectNum}}</p>
                             </div>
                             <div class="descItem">
                                 <p class="text"><i class="dot green"></i>
-                                <!-- 其他 -->
+                               
                                 {{$t('message.dataBoard.elseChecked')}}
                                 </p>
                                 <p class="num">{{total.otherInspectNum}}</p>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="blockBox">
                 <div class="blockTitle">
                 <!-- 整改动态 -->
-                {{$t('message.dataBoard.changeDynamic')}}
+                <!-- {{$t('message.dataBoard.changeDynamic')}} -->
+                隐患排查
                 </div>
                 <div class="blockContent">
-                    <vue-scroll>
+                  <img style="width:350px;height:180px" src="../../../assets/images/qualityManage/secyre04.png" alt="" srcset="">
+                    <!-- <vue-scroll>
                         <ul class="greenTable dynamicList">
                             <li v-for="(item,index) in activityList" :key="index">
-                                {{item.rectifyPeopleAme}}<!-- 有一条 -->{{$t('message.dataBoard.hasOne')}}{{statusArr[item.state-1]}}{{$t('message.dataBoard.problen')}}<!-- 的问题 -->
+                                {{item.rectifyPeopleAme}}
+                                {{$t('message.dataBoard.hasOne')}}{{statusArr[item.state-1]}}{{$t('message.dataBoard.problen')}}
                             </li>
                         </ul>
-                        <!-- <table class="greenTable">
-                        <thead>
-                            <tr>
-                            <th>
-                                {{ $t("message.environmentalOverview.table2.th1") }}
-                            </th>
-                            <th>
-                                {{ $t("message.environmentalOverview.table2.th2") }}
-                            </th>
-                            <th>
-                                {{ $t("message.environmentalOverview.table2.th3") }}
-                            </th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr v-for="(item, index) in alarmList" :key="index">
-                            <td>
-                                {{ item.deviceName }}
-                            </td>
-                            <td>{{ item.alarmTime }}</td>
-                            <td>{{ item.alarmTypeName }}</td>
-                            </tr>
-                        </tbody>
-                        </table> -->
+                        
                         <div
                         class="placeholderBox placeholderBox2"
                         v-if="activityList.length == 0"
                         >
                         <img src="@/assets/images/noData3.png" alt="" srcset="" />
                         <p>
-                        <!-- 暂无数据 -->
+                       
                         {{$t('message.dataBoard.nodata')}}
                         </p>
                         </div>
-                    </vue-scroll>
+                    </vue-scroll> -->
                 </div>
             </div>
         </div>
@@ -189,7 +177,8 @@
     <SecureTwo v-else></SecureTwo>
 </template>
 <script>
-import echarts from 'echarts4';;
+import echarts from 'echarts4';
+import qualityAndsecureTab from "./components/qualityAndsecure"
 import {selectSecurityManageStatisticsApi,selectRectifiedSecurityManageList2Api,
 getNewestSecurityManageDataList2Api} from "@/assets/js/api/dataBoard"
 import SecureTwo from "./secureTwo";
@@ -219,7 +208,7 @@ export default {
         }
     },
     components: {
-        SecureTwo,
+        SecureTwo,qualityAndsecureTab
     },
     created(){
         this.COMPANY = COMPANY
@@ -254,7 +243,7 @@ export default {
           ],
           this.$refs.safeTrainChart,
           ["rgba(254, 108, 127, 1)","rgba(120, 111, 240, 1)", "rgba(68, 215, 182, 1)"],
-        this.$t('message.dataBoard.questionAllCounts') /*  "问题总数" */,this.total.totalNum
+          "检查总数",this.total.totalNum
         );
          this.createPieChart(
           [
@@ -279,7 +268,7 @@ export default {
           ],
           this.$refs.ratioChart2,
           ["#7718fe", "rgba(68, 215, 182, 0.2)"],
-         this.$t('message.dataBoard.statusArr')[1]+this.$t('message.dataBoard.problenNum') /* "待审核问题数" */,this.total.reviewedNum
+          "隐患总数" /* "待审核问题数" */,this.total.reviewedNum
         );
         this.createPieChart(
           [
@@ -291,7 +280,7 @@ export default {
           ],
           this.$refs.ratioChart3,
           ["#fe6c7f", "rgba(68, 215, 182, 0.2)"],
-          /* "待整改问题数" */this.$t('message.dataBoard.statusArr')[0]+this.$t('message.dataBoard.problenNum'),this.total.rectificationNum
+          /* "待整改问题数" */"重大隐患",this.total.rectificationNum
         );
         var ratioNum = this.total.totalNum?((this.total.closeNum/this.total.totalNum)*100).toFixed(2):0
         this.createPieChart(
@@ -304,7 +293,7 @@ export default {
           ],
           this.$refs.ratioChart4,
           ["rgba(68, 215, 182, 1)", "rgba(68, 215, 182, 0.2)"],
-         this.$t('message.dataBoard.onTimeChangeRate') /* "及时整改率" */,ratioNum+'%'
+            "超期未消隐患"/* "及时整改率" */,ratioNum+'%'
         );
         var arr = res.result.monthList
         var xData=[],yData1=[]
@@ -481,7 +470,7 @@ export default {
 }
 
 .circleBox{
-    width: 25%;
+    width: 20%;
     float: left;
     text-align: center;
     height: 100%;