合并

back/src/components/ren-dept-tree/src/ren-dept-tree.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog">
+    <el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog" readonly
+      @paste.native.capture.prevent="handlePaste">
       <el-button slot="append" icon="el-icon-search" @click="deptDialog"></el-button>
     </el-input>
     <el-input :value="value" style="display: none"></el-input>
@@ -63,6 +64,9 @@ export default {
     }
   },
   methods: {
+    handlePaste() {
+      return false
+    },
     deptDialog() {
       this.expandedKeys = null
       if (this.$refs.tree) {

back/src/views/main-navbar.vue

@@ -41,7 +41,8 @@
         </el-menu-item> -->
       </el-menu>
       <el-menu class="aui-navbar__menu" mode="horizontal">
-        <el-menu-item index="1">
+        <!-- 暂时隐藏切换语言--勿删 -->
+        <!-- <el-menu-item index="1">
           <el-dropdown placement="bottom" :show-timeout="0">
             <el-button size="mini">{{ $t("_lang") }}</el-button>
             <el-dropdown-menu slot="dropdown">
@@ -53,14 +54,14 @@
               >
             </el-dropdown-menu>
           </el-dropdown>
-        </el-menu-item>
+        </el-menu-item> -->
-        <el-menu-item index="2">
+        <!-- <el-menu-item index="2">
           <a href="//115.28.200.119:9091" target="_blank">
             <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
               <use xlink:href="#icon-earth"></use>
             </svg>
           </a>
-        </el-menu-item>
+        </el-menu-item> -->
         <el-menu-item index="3" v-if="$hasPermission('sys:notice:all')">
           <el-badge :is-dot="messageTip">
             <a href="#" @click="myNoticeRouter()"

back/src/views/main-theme-tools.vue

@@ -8,11 +8,11 @@
 -->
 <template>
   <div class="aui-theme-tools" :class="{ 'aui-theme-tools--open': isOpen }">
-    <div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
+    <!-- <div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
       <svg class="icon-svg" aria-hidden="true">
         <use xlink:href="#icon-setting"></use>
       </svg>
-    </div>
+    </div> -->
     <div class="aui-theme-tools__content">
       <div class="aui-theme-tools__item">
         <h3>Navbar</h3>

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

@@ -45,28 +45,27 @@
         <el-form-item>
           <span v-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
           <span v-else>申请部门：</span>
-          <el-select
+          <el-select v-model="abilityDepartment" placeholder="请选择部门" filterable clearable>
-            v-model="abilityDepartment"
-            placeholder="请选择部门"
-            filterable
-            clearable
-          >
             <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value" v-bind="item"></el-option>
+            <el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value"
+              v-bind="item"></el-option>
           </el-select>
         </el-form-item>
 
         <!--类型-->
         <el-form-item>
           <span>类型：</span>
-          <el-select v-if="this.departmentId === 2 || this.departmentId === 4"   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 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 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>
@@ -82,7 +81,8 @@
           }}</el-button>
         </el-form-item>
         <!-- 导出 -->
-        <a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出全部</a>
+        <a class='export'
+          :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
       </el-form>
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
@@ -117,7 +117,8 @@
                 能力使用明细
             </span> -->
             <template v-if="detailFlag">
-              <el-checkbox v-model="checked" @change='chagneCheckbox' style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
+              <el-checkbox v-model="checked" @change='chagneCheckbox'
+                style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
               <span class="detail-button" @click="goToDetail()">
                 明细
               </span>
@@ -168,13 +169,9 @@
           </el-table>
           <!--明细表-->
 
-          <el-table
+          <el-table :data="tableData" :header-cell-style="{ textAlign: 'center', height: '96px' }"
-            :data="tableData"
+            :cell-style="{ textAlign: 'center' }" style="width: 100%"
-            :header-cell-style="{ textAlign: 'center',height:'96px' }"
+            v-show="this.departmentId === 3 || this.departmentId === 4">
-            :cell-style="{ textAlign: 'center' }"
-            style="width: 100%"
-            v-show="this.departmentId === 3 || this.departmentId === 4"
-          >
             <el-table-column v-if="this.departmentId === 3" prop="deptName" label="上架部门" min-width="100%">
             </el-table-column>
             <el-table-column v-if="this.departmentId === 4" prop="deptName" label="申请部门" min-width="100%">
@@ -1170,24 +1167,16 @@ input::placeholder {
   background: #fff;
   border: 1px solid #dcdfe6;
   color: #000;
+  color: #FFF;
+  background-color: #0058e1;
+  border-color: #0058e1;
+  text-decoration: none;
 }
 
 .export:hover {
-  border-color: #c5ddfd;
+  background: #65a5f9;
-  background-color: #ecf4fe;
+  border-color: #65a5f9;
-  color: #0058e1;
+  color: #FFF;
-  text-decoration: none;
 }
 
-.export:active {
-  border-color: #c5ddfd;
-  background-color: #ecf4fe;
-  color: #0058e1;
-  text-decoration: none;
-}
-
-.export:visited {
-  color: #fff;
-  text-decoration: none;
-}
 </style>

back/src/views/modules/notice/notice.vue

@@ -15,16 +15,28 @@
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center" width="180">
+        </el-table-column>
+        <!-- 内容 prop="content"-->
+        <el-table-column :label="$t('news.content')" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-tooltip effect="dark" :content="scope.row.content" placement="top">
+              <span class="text-ellipsis">{{ scope.row.content }}</span>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column prop="type" :label="$t('notice.type')" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             {{ $getDictLabel("notice_type", scope.row.type) }}
           </template>
         </el-table-column>
-        <el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center"
-        <el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center" width="170"></el-table-column>
+          width="150"></el-table-column>
+        <el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center"
+          width="170"></el-table-column>
         <el-table-column prop="status" :label="$t('notice.status')" header-align="center" align="center" width="130">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('notice.status0') }}</el-tag>
@@ -33,19 +45,17 @@
         </el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
-            <el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{ $t('notice.view') }}</el-button>
+              {{ $t('update') }}</el-button>
+            <el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{
+                $t('notice.view')
+            }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
-        :current-page="page"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
@@ -93,3 +103,13 @@ export default {
   }
 }
 </script>
+<style scoped>
+.text-ellipsis {
+  /*1. 先强制一行内显示文本*/
+  white-space: nowrap;
+  /*2. 超出的部分隐藏*/
+  overflow: hidden;
+  /*3. 文字用省略号替代超出的部分*/
+  text-overflow: ellipsis;
+}
+</style>

front/src/views/personalCenter/components/MyApply.vue

@@ -208,6 +208,7 @@
     onBeforeUnmount,
     h,
     defineProps,
+    nextTick,
   } from 'vue'
   import {
     getMyProcessInstancePage,
@@ -252,16 +253,19 @@
     typeList.value.push('设备申请')
   }
   const typeStrObj = {
-    能力上架: 'resourcemountapply',
+    '能力上架': 'resourcemountapply',
-    能力下架: 'resourcundercarriageapply',
+    '能力下架': 'resourcundercarriageapply',
-    能力需求: 'abilitydemandapply',
+    '能力需求': 'abilitydemandapply',
-    需求评论: 'comment_review',
+    '需求评论': 'comment_review',
   }
   let tabList = ref(['全部', '审核中', '审核完成'])
   const contentList = reactive({ data: [] })
   let tabIndex = ref(0)
   let typeIndex = ref(0)
   let typeName = ref(typeList.value[0])
+  if(router.currentRoute.value.query.tabTypeName) {
+    typeName.value = router.currentRoute.value.query.tabTypeName
+  }
   const videoVisible = ref(false)
   const numFlag = ref(true)
   const columns = ref([
@@ -306,7 +310,7 @@
     ended.value = ''
     page.value = 1
     typeIndex.value = index
-    typeName.value = item
+    typeName.value = item;
     getApplyList()
   }
 
@@ -565,7 +569,6 @@
       params.processDefinitionKey = processDefinitionKey.value
       getMyProcessInstancePage(params).then((res) => {
         contentList.data = []
-        // initNum(name.value)
         console.log(res.data.data.list)
         contentList.data = res.data.data.list
         total.value = res.data.data.total