Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

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

@@ -59,13 +59,17 @@
         <!--类型-->
         <el-form-item>
           <span>类型：</span>
-          <el-select v-model="abilityType" placeholder="请选择类型" clearable>
+          <el-select v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></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-select v-else v-model="abilityType" placeholder="请选择类型" clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
+            </el-option>
+          </el-select>
         </el-form-item>
-
         <!--操作按钮查询-->
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -348,6 +352,14 @@ export default {
         { name: '应用资源', value: 5 },
         { name: '会议室', value: 6 }
       ], // 类型备选列表
+      typeOptions1: [//能力上架隐藏会议室
+        { name: '智能算法', value: 1 },
+        { name: '图层服务', value: 2 },
+        { name: '通用开发组件', value: 3 },
+        { name: '页面开发组件', value: 4 },
+        { name: '应用资源', value: 5 },
+
+      ], // 类型备选列表
       detailFlag: false, // 明细返回按钮显示标志位
       startDate: '', // 开始时间
       endDate: '' // 结束时间