update code

src/api/index.js

@@ -25,6 +25,7 @@ import gzDict from './gzaiBox/dict'
 import plan from './plan/index'
 import periodical from './periodical/index'
 import engin from './engin'
+import quality from './quality'
 import {axios,download} from '@/utils/request'
 export default {
     project,
@@ -55,5 +56,6 @@ export default {
     downFile:download,
     engin,
     gzAiBoxVideo,
-    gzDict
+    gzDict,
+    quality
 }

src/pages/projectQuality.vue

@@ -181,6 +181,9 @@
           </module-one-1-1>
         </el-col>
         <el-col :span="6">
+          <module-one-1-1 label="工程功能检验">
+            <funVerifyGroupByCheckType ref="funGroupByCheckType"/>
+        </module-one-1-1>
           <projectChecking></projectChecking>          
         </el-col>
       </el-row>
@@ -209,6 +212,7 @@ import materialSealListDlg from "./quality/materialSealListDlg.vue";
 import projectChecking from "./quality/projectChecking.vue";
 import debounce from "lodash.debounce";
 import ProblemmodifyList from './components/ProblemmodifyList.vue'
+import funVerifyGroupByCheckType from './quality/funVerifyGroupByCheckType.vue'
 export default {
   components: {
     materialSealListDlg,
@@ -218,7 +222,8 @@ export default {
     materialSealDetialDlg,
     checkDetectionDlg,
     measuredDlg,
-    projectChecking,ProblemmodifyList
+    projectChecking,ProblemmodifyList,
+    funVerifyGroupByCheckType
   },
   data() {
     return {

src/pages/quality/projectChecking.vue

@@ -1,6 +1,8 @@
 <template>
     <div class="project-quality-checking">
-        <module-one-1-1 label="举牌验收">
+        <module-one-2-1 label="举牌验收" style="position: relative;">
+            <img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 12px;top: 12px;"
+                @click="doShowCheckingListDlg(showChart1?1:2)" v-if="prjs.length>1">
             <div class="checking-row1" style="position: relative;height: 310px;overflow: hidden;">
                 <div class="checking-chart-nav">
                     <span class="chart-nv-item" @click="showChart1 = true"
@@ -15,13 +17,15 @@
                     </enginChart>
                 </div>
             </div>
-        </module-one-1-1>
-        <module-one-1-1 label="常规验收" class="scroll checking-row2" style="position: relative;">
-            <img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 12px;top: 12px;"
-                @click="doShowCheckingListDlg(1)" v-if="prjs.length>1">
+        <div class="div-nav">
+            <span class="nav-item" :class="showChart1?'active':''"  >常规验收</span>
+            <span class="nav-item" :class="!showChart1?'active':''" >隐蔽验收</span>            
+        </div>
+        <div  v-show="showChart1" class="scroll checking-row2" style="position: relative;">
+            
             <div class="checking-group-nav warning-info-title" style="padding-left: 20px;">
                 <div class="nav-item" :class="nav1 == it.dictValue ? 'active' : ''"
-                    @click="doQueryGroup(it.dictValue, 'a')" v-for="(it, idx) in dict1" :key="it.dictValue">{{
+                    @click="doQueryGroup(it.dictValue, 'a')" v-for="(it) in dict1" :key="it.dictValue">{{
                             it.dictLabel }}</div>
             </div>
             <div v-if="(!projectInfo || projectInfo.id == 0)&& !isTypeBuser()">
@@ -83,13 +87,11 @@
                     </div>
                 </div>
             </div>
-        </module-one-1-1>
-        <module-one-1-1 label="隐蔽验收" class="scroll checking-row3" style="position: relative;">
-            <img src="images/icon2001.png" style="position: absolute;cursor: pointer;right: 12px;top: 12px;"
-                @click="doShowCheckingListDlg(2)"  v-if="prjs.length>1">
+        </div>
+        <div v-show="!showChart1" class="scroll checking-row3" style="position: relative;">    
             <div class="checking-group-nav warning-info-title" style="padding-left: 20px;">
                 <div class="nav-item" :class="nav2 == it.dictValue ? 'active' : ''"
-                    @click="doQueryGroup(it.dictValue, 'b')" v-for="(it, idx) in dict2" :key="it.dictValue">{{
+                    @click="doQueryGroup(it.dictValue, 'b')" v-for="(it) in dict2" :key="it.dictValue">{{
                             it.dictLabel }}</div>
             </div>
             <div v-if="(!projectInfo || projectInfo.id == 0) && !isTypeBuser()">
@@ -151,13 +153,15 @@
                     </div>
                 </div>
             </div>
-        </module-one-1-1>
+        </div>
+        </module-one-2-1>
         <showCheckingDlg ref="checkDlg"></showCheckingDlg>
         <listDlg ref="listDlg"></listDlg>
     </div>
 </template>
 
 <script>
+import "../../components/module/module-one-2-1";
 import debounce from "lodash.debounce";
 import throttle from 'lodash.throttle'
 import enginChart from '../engin/enginChart.vue'
@@ -186,6 +190,7 @@ export default {
             dataList1: [],
             dataList2: [],
             prjs:[],
+            showList:"1"
         };
     },
     created() {
@@ -461,6 +466,26 @@ export default {
         }
     }
 
+    .div-nav{
+        line-height: 30px;
+        padding:0px 10px;
+        position: relative;
+        top:-30px;
+        .nav-item{
+            display: inline-block;
+            color: #eee;
+            margin-right: 10px;
+            cursor: pointer;
+            &.active{
+                color:#fff;
+                font-weight: bold;
+            }
+        }
+    }
+    .checking-row2,.checking-row3{
+        position: relative;
+        top:-30px;
+    }
     .problemmodify_list {
         &.idle-list {
             .el-table__body .el-table__row {

vue.config.js

@@ -37,8 +37,8 @@ module.exports = defineConfig({
         }
       },
       '/jhapi':{
-        target: `http://62.234.3.186/jhapi/`,
-        //target: `http://127.0.0.1:8090/jhapi/`,
+        //target: `http://62.234.3.186/jhapi/`,
+        target: `http://127.0.0.1:8090/jhapi/`,
         //target: `http://szgc.jhncidg.com/jhapi/`,
         changeOrigin: true,
         pathRewrite: {