合并冲突

back/src/views/modules/abilityStatistics/index.vue

@@ -26,25 +26,14 @@
         <!--起始日期 @keyup.enter.native="getDataList()"-->
         <el-form-item>
           <span>日期：</span>
-          <el-date-picker
-            v-model="value1"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
-          >
+          <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
           </el-date-picker>
         </el-form-item>
         <!--审核状态-->
         <el-form-item>
           <span>审核状态：</span>
-          <el-select
-            v-model="examineStatus"
-            placeholder="请选审核状态"
-            clearable
-          >
+          <el-select v-model="examineStatus" placeholder="请选审核状态" clearable>
             <el-option label="全部" value="-1"></el-option>
             <el-option label="审核中" value="0"></el-option>
             <el-option label="通过" value="1"></el-option>
@@ -62,11 +51,7 @@
             clearable
           >
             <el-option label="全部" value=""></el-option>
-            <el-option
-              v-for="item in departmentSelects"
-              :key="item.label"
-              v-bind="item"
-            ></el-option>
+            <el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
           </el-select>
         </el-form-item>
 
@@ -75,13 +60,8 @@
           <span>类型：</span>
           <el-select v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>
-            <el-option
-              v-for="item in typeOptions"
-              :key="item.name"
-              :label="item.name"
-              :value="item.name"
-              v-bind="item"
-            ></el-option>
+            <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
+            </el-option>
           </el-select>
         </el-form-item>
 
@@ -113,25 +93,18 @@
         </div> -->
 
           <div class="second-title">
-            <span
-              style="margin-right: 30px"
-              :class="[
+            <span style="margin-right: 30px" :class="[
               departmentId === 1 || departmentId === 3
                 ? 'departmentStyle'
                 : ''
-              ]"
-              @click="handleChose(3)"
-            >
+            ]" @click="handleChose(3)">
               能力上架统计
             </span>
-            <span
-              :class="[
+            <span :class="[
               departmentId === 2 || departmentId === 4
                 ? 'departmentStyle'
                 : ''
-              ]"
-              @click="handleChose(4)"
-            >
+            ]" @click="handleChose(4)">
               能力使用统计
             </span>
             <!--   <span v-if='this.choseId===0' :class="[departmentId===3?'departmentStyle':'']"  @click="handleChose(3)">
@@ -150,14 +123,8 @@
           </div>
           <div class="line-style"></div>
           <!--统计表-->
-          <el-table
-            :data="tableData"
-            :header-cell-style="{ textAlign: 'center' }"
-            :cell-style="{ textAlign: 'center' }"
-            border
-            style="width: 100%"
-            v-show="this.departmentId === 1"
-          >
+          <el-table :data="tableData" :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
+            border style="width: 100%" v-show="this.departmentId === 1">
             <el-table-column prop="name" label="上架部门" min-width="100%">
             </el-table-column>
             <el-table-column label="组件">
@@ -165,17 +132,9 @@
               </el-table-column>
               <el-table-column prop="tcfw" label="图层服务" min-width="100%">
               </el-table-column>
-              <el-table-column
-                prop="kfzj"
-                label="通用开发组件"
-                min-width="100%"
-              >
+              <el-table-column prop="kfzj" label="通用开发组件" min-width="100%">
               </el-table-column>
-              <el-table-column
-                prop="ywzj"
-                label="业务能力组件"
-                min-width="100%"
-              >
+              <el-table-column prop="ywzj" label="业务能力组件" min-width="100%">
               </el-table-column>
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
@@ -183,14 +142,8 @@
             <el-table-column prop="zj" label="总计" min-width="100%">
             </el-table-column>
           </el-table>
-          <el-table
-            :data="tableData"
-            :header-cell-style="{ textAlign: 'center' }"
-            :cell-style="{ textAlign: 'center' }"
-            border
-            style="width: 100%"
-            v-show="this.departmentId === 2"
-          >
+          <el-table :data="tableData" :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
+            border style="width: 100%" v-show="this.departmentId === 2">
             <el-table-column prop="name" label="申请部门" min-width="100%">
             </el-table-column>
             <el-table-column label="组件">
@@ -198,17 +151,9 @@
               </el-table-column>
               <el-table-column prop="tcfw" label="图层服务" min-width="100%">
               </el-table-column>
-              <el-table-column
-                prop="kfzj"
-                label="通用开发组件"
-                min-width="100%"
-              >
+              <el-table-column prop="kfzj" label="通用开发组件" min-width="100%">
               </el-table-column>
-              <el-table-column
-                prop="ywzj"
-                label="业务能力组件"
-                min-width="100%"
-              >
+              <el-table-column prop="ywzj" label="业务能力组件" min-width="100%">
               </el-table-column>
             </el-table-column>
             <el-table-column prop="yyzy" label="应用资源" min-width="100%">
@@ -246,39 +191,22 @@
               </template>
             </el-table-column>
           </el-table>
-          <!-- <div class="block">
-            <el-pagination
-              @current-change="handleCurrentChange"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-              :page-size="5"
-              :current-page="currentPage"
-            >
+          <div class="block">
+            <el-pagination @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper"
+              :total="total" :page-size="pageSize" :current-page="currentPage">
             </el-pagination>
-          </div> -->
+          </div>
         </div>
       </el-card>
     </div>
-    <component-used
-      v-if="UsedIsShow"
-      :tableId="tableId"
-      :fatherId="fatherId"
-      @closeChild2="closeChild2"
-    ></component-used>
-    <component-services
-      v-if="servicesIsShow"
-      :tableId="tableId"
-      :fatherId="fatherId"
-      @closeChild="closeChild"
-    ></component-services>
-    <application-resources
-      v-if="resourcesIsShow"
-      :tableId="tableId"
-      :fatherId="fatherId"
-      @closeApplication="closeApplication"
-    ></application-resources>
-  <ability-detail  v-if="detailsVisible"
-  :detailsVisible="detailsVisible" :detailParamss="detailParamss"  :detailType="detailType" @closeModal="closeModal">
+    <component-used v-if="UsedIsShow" :tableId="tableId" :fatherId="fatherId" @closeChild2="closeChild2">
+    </component-used>
+    <component-services v-if="servicesIsShow" :tableId="tableId" :fatherId="fatherId" @closeChild="closeChild">
+    </component-services>
+    <application-resources v-if="resourcesIsShow" :tableId="tableId" :fatherId="fatherId"
+      @closeApplication="closeApplication"></application-resources>
+    <ability-detail v-if="detailsVisible" :detailsVisible="detailsVisible" :detailParamss="detailParamss"
+      :detailType="detailType" @closeModal="closeModal">
     </ability-detail>
   </div>
 
@@ -382,6 +310,7 @@ export default {
       choseId: 0,
       departmentId: 1,
       currentPage: 1,
+      pageSize: 10,
       homeIsShow: true,
       servicesIsShow: false,
       resourcesIsShow: false,
@@ -475,11 +404,21 @@ export default {
       this.detailsVisible = false
     },
     handleCurrentChange(val) {
-      if (this.choseId === 0) {
-        this.getFirstTree(val)
-      } else if (this.choseId === 1) {
-        this.getReleaseTree(val)
+      console.log('val------------>', val);
+      this.currentPage = val;
+      // todo
+      if(this.departmentId === 3) {
+        this.getOneDetail(val)
       }
+      if(this.departmentId === 4) {
+        this.getTwoDetail(val)
+      }
+      
+      // if (this.choseId === 0) {
+      //   this.getFirstTree(val)
+      // } else if (this.choseId === 1) {
+      //   this.getReleaseTree(val)
+      // }
     },
     getTreeName(data) {
       this.$http
@@ -591,8 +530,8 @@ export default {
       this.$http
         .get('/census/center/selectApplyDeptDetailTypeCountList', {
           params: {
-            // page: page || 1,
-            // limit: 5,
+            page: page || 1,
+            limit: this.pageSize,
             approveStatus: this.status,
             deptId: this.abilityDepartment,
             params: '',
@@ -682,7 +621,7 @@ export default {
           })
       }
     },
-    // 能力上架明细
+    // 能力上架明细  能力上架统计
     getOneDetail(page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
@@ -699,8 +638,8 @@ export default {
       this.$http
         .get('/census/center/selectCensusResourceTable', {
           params: {
-            // limit: 5,
-            // page: page || 1,
+            limit: this.pageSize,
+            page: this.currentPage,
             approveStatus: this.status,
             deptId: this.abilityDepartment,
             type: this.abilityType,
@@ -710,8 +649,8 @@ export default {
         })
         .then((res) => {
           console.log('111111', this.tableData, res.data.data)
-          this.tableData = res.data.data
-          this.tableDataClone = res.data.data
+          this.tableData = res.data.data.list
+          this.tableDataClone = res.data.data.list
           this.total = res.data.data.total
           this.exportExcelCondition = qs.stringify({
             approveStatus: this.status,
@@ -721,7 +660,7 @@ export default {
           })
         })
     },
-    // 能力使用明细
+    // 能力使用明细 能力使用统计
     getTwoDetail(page) {
       var passAndReview = '' // 转变"通过"字段为通过
       if (this.examineStatus == '-1') {
@@ -738,8 +677,8 @@ export default {
       this.$http
         .get('/census/center/selectCensusApplyTable', {
           params: {
-            // limit: 5,
-            // page: page || 1,
+            limit: this.pageSize,
+            page: this.currentPage,
             approveStatus: this.status,
             deptId: this.abilityDepartment,
             type: this.abilityType,
@@ -748,8 +687,8 @@ export default {
           }
         })
         .then((res) => {
-          this.tableData = res.data.data
-          this.tableDataClone = res.data.data
+          this.tableData = res.data.data.list
+          this.tableDataClone = res.data.data.list
           this.total = res.data.data.total
           this.exportExcelCondition = qs.stringify({
             approveStatus: this.status,
@@ -1051,6 +990,7 @@ export default {
   display: flex;
   flex-direction: column;
 }
+
 .container-left {
   width: 250px;
   height: 1000px;
@@ -1058,11 +998,13 @@ export default {
   // background-color: #ffffff;
   margin-right: 10px;
 }
+
 .left-search {
   width: 250px;
   height: 76px;
   background-color: #ffffff;
 }
+
 .input-style {
   width: 210px;
   height: 36px;
@@ -1072,11 +1014,13 @@ export default {
   border: 1px solid transparent;
   background-color: #f2f4fa;
 }
+
 input::placeholder {
   font-weight: 400;
   font-size: 14px;
   color: #b0b3ca;
 }
+
 .input-search {
   width: 44px;
   height: 30px;
@@ -1086,10 +1030,12 @@ input::placeholder {
   top: 38px;
   left: 196px;
 }
+
 ::v-deep.tree-style {
   .el-tree-node__label {
     font-size: 16px;
   }
+
   .el-tree-node__content {
     width: 240px;
     overflow: hidden;
@@ -1105,6 +1051,7 @@ input::placeholder {
   background-color: #fafafc;
   display: inline-block;
 }
+
 .title {
   display: flex;
   font-size: 20px;
@@ -1113,10 +1060,12 @@ input::placeholder {
   padding-left: 15px;
   padding-top: 10px;
 }
+
 .title-list-style {
   display: flex;
   margin-top: 10px;
 }
+
 .title-single {
   font-size: 14px;
   width: 90px;
@@ -1127,6 +1076,7 @@ input::placeholder {
   border-radius: 12px;
   cursor: pointer;
 }
+
 .box-style {
   width: 90px;
   height: 24px;
@@ -1135,11 +1085,13 @@ input::placeholder {
   align-items: center;
   padding-bottom: 2px;
 }
+
 .second-title {
   margin-top: 20px;
   font-size: 14px;
   color: #979eb9;
   cursor: pointer;
+
   .detail-button {
     width: 60px;
     height: 30px;
@@ -1153,6 +1105,7 @@ input::placeholder {
     color: #fff;
   }
 }
+
 .line-style {
   width: 100%;
   height: 1px;
@@ -1160,23 +1113,28 @@ input::placeholder {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+
 .aui-card--fill {
   width: 100% !important;
   padding: 0px !important;
 }
+
 .choseStyle {
   color: #526aff;
   border: 1px solid #526aff;
 }
+
 .departmentStyle {
   color: #526aff;
 }
+
 ::v-deep .tree-text-styleJ {
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
   word-break: break-all;
 }
+
 .export {
   display: inline-block;
   width: 70px;
@@ -1188,18 +1146,21 @@ input::placeholder {
   border: 1px solid #dcdfe6;
   color: #000;
 }
+
 .export:hover {
   border-color: #c5ddfd;
   background-color: #ecf4fe;
   color: #0058e1;
   text-decoration: none;
 }
+
 .export:active {
   border-color: #c5ddfd;
   background-color: #ecf4fe;
   color: #0058e1;
   text-decoration: none;
 }
+
 .export:visited {
   color: #fff;
   text-decoration: none;

front/src/views/home/infrastructurePage.vue

@@ -312,7 +312,13 @@
               <span>{{ statusText[record.status] || '' }}</span>
             </template>
             <template v-if="column.dataIndex === 'operation'">
-              <a :class="record.status != 1 ? 'disabled-text' : ''" @click="
+              <!-- 离线 -->
+              <a v-if="record.status != 1" class="disabled-text">
+                预览
+              </a>
+              <a-tooltip v-else placement="top">
+                <template #title>请申请后在我的申请中预览视频!</template>
+                <a @click="
                   openVideo(
                     record.channelCode ||
                       record.channelId ||
@@ -322,6 +328,8 @@
                 ">
                   预览
                 </a>
+              </a-tooltip>
+
             </template>
           </template>
         </a-table>
@@ -343,7 +351,12 @@
         </a-table>
       </div>
       <!-- 单个预览弹窗 -->
-      <a-modal wrapClassName="single-preview-modal" v-model:visible="visible" title="视频预览" :width="960" destroyOnClose>
+      <a-modal wrapClassName="single-preview-modal" v-model:visible="visible" :width="960" destroyOnClose>
+        <!-- title="视频预览" -->
+        <template #title>
+          <span>视频预览</span>
+          <span style="color: #ff4d4f;margin-left:10px">{{`(请申请后在我的申请中预览视频)`}}</span>
+        </template>
         <template #footer></template>
         <div style="width: 100%; display: flex; justify-content: center">
           <div style="width: 100%; height: 100%; position: relative" v-show="isXiHaiAn">
@@ -2370,6 +2383,7 @@ video::-webkit-media-controls {
   cursor: not-allowed;
   opacity: 0.5;
   color: #666666;
+
   &:hover {
     color: #666666;
   }