caiaa 1 rok pred
rodič
commit
51a13c9d32

+ 5 - 4
src/components/HeaderSearch/index.vue

@@ -8,7 +8,8 @@
       filterable
       default-first-option
       remote
-      placeholder="搜索"
+      placeholder="找应用、功能、标准规范等"
+      size="small"
       class="header-search-select"
       @change="change"
     >
@@ -133,7 +134,7 @@ export default {
 
   .search-icon {
     cursor: pointer;
-    font-size: 18px;
+    font-size: 14px;
     vertical-align: middle;
   }
 
@@ -142,11 +143,11 @@ export default {
     // overflow: hidden;
     ::v-deep .el-input__inner {
       background-color: transparent;
-      border-radius: 13px;
+      border-radius: 22px;
       // box-shadow: none !important;
       border: 2px solid #ffffff;
       color: #ffffff;
-      font-size: 1.1em;
+      font-size: 14px;
     }
   }
 }

+ 1 - 1
src/layout/components/AppMain.vue

@@ -52,7 +52,7 @@ export default {
         }
       }).catch(error => {
         console.log(error)
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 10 - 4
src/layout/components/HeaderTop.vue

@@ -16,13 +16,19 @@
       <div class="right-top">
         <el-popover class="right-top-item" placement="bottom-start" width="400" trigger="click" @show="showData">
           <el-row v-for="item in gridData" :key="item.id">item.title</el-row>
-          <div slot="reference"><svg-icon icon-class="yingyong" />应用热榜推荐</div>
+          <div slot="reference"><svg-icon icon-class="yingyong" /><span class="item-title">应用热榜推荐</span></div>
         </el-popover>
-        <div class="right-top-item"><svg-icon icon-class="quanxian" />用户权限管理</div>
-        <div class="right-top-item"><el-badge :value="messageCount.todo" class="item"><svg-icon icon-class="xiaoxi" /></el-badge>消息提醒</div>
+        <div class="right-top-item"><svg-icon icon-class="quanxian" /><span class="item-title">个性化设置</span></div>
+        <div class="right-top-item"><svg-icon icon-class="quanxian" /><span class="item-title">用户权限管理</span></div>
+        <div class="right-top-item">
+          <el-badge :value="messageCount.todo" class="badge-item"><svg-icon icon-class="xiaoxi" /></el-badge>
+          <span class="item-title">消息提醒</span>
+        </div>
+        <div class="right-top-item"><svg-icon icon-class="quanxian" /><span class="item-title">换肤</span></div>
+        <div class="right-top-item"><svg-icon icon-class="quanxian" /><span class="item-title">意见建议</span></div>
         <el-dropdown trigger="click" class="right-top-item">
           <div>
-            <el-avatar src="/images/avatar.png" />
+            <el-avatar :size="36" src="/images/avatar.png" />
             <span class="user-name">{{ name }}<i class="el-icon-caret-bottom" /></span>
           </div>
           <el-dropdown-menu slot="dropdown" size="small">

+ 18 - 2
src/styles/headertop.scss

@@ -2,6 +2,7 @@ $headerTextColor: #ffffff;
 
 #app {
   .header-container {
+    min-width: 1300px;
     position: fixed;
     top: 0;
     left: 0;
@@ -60,9 +61,10 @@ $headerTextColor: #ffffff;
 
     .right-top {
       height: $headerHeight / 2;
+      margin-top: 5px;
       display: flex;
       align-items: center;
-      font-size: 1.2em;
+      font-size: 14px;
     }
 
     .right-top-item {
@@ -83,10 +85,24 @@ $headerTextColor: #ffffff;
         margin-left: 10px;
       }
 
+      .badge-item {
+        .el-badge__content {
+          font-size: 8px;
+          height: 15px;
+          line-height: 14px;
+          padding: 0 3px;
+
+          &.is-fixed {
+            top: -3px;
+            transform: translateY(-50%) translateX(100%) scale(0.8);
+          }
+        }
+      }
+
       .el-avatar,
       .user-name {
         vertical-align: middle;
-        font-size: 1.2em;
+        font-size: 14px;
         color: $headerTextColor;
       }
 

+ 4 - 1
src/styles/sidebar.scss

@@ -111,6 +111,8 @@
       position: relative;
 
       &.el-menu-item {
+        height: 60px;
+
         .menu-box {
           line-height: 0 !important;
           text-align: center;
@@ -123,7 +125,8 @@
 
         .menu-title {
           display: block;
-          font-size: 10px;
+          font-size: 12px;
+          transform: scale(0.9);
           height: 30px;
           line-height: 30px;
         }

+ 1 - 1
src/styles/variables.scss

@@ -21,7 +21,7 @@ $subMenuHover: #f0f2f5;
 
 $sideBarWidth: 210px;
 $siderBarCollapseWidth: 64px;
-$headerHeight: 120px;
+$headerHeight: 100px;
 $footerHeight: 32px; // must greater than 15px
 $tagHeight: 42px; // must greater than 40px
 $layoutHeight: $headerHeight + $footerHeight + $tagHeight;

+ 21 - 17
src/views/application/index.vue

@@ -40,7 +40,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-tabs v-model="curTab" class="list-tabs" @tab-click="getTablelist">
+      <el-tabs v-model="curTab" class="list-tabs" @tab-click="searchTable">
         <el-tab-pane v-for="typeItem in typeData" :key="dictType + '-' + typeItem.id" :label="typeItem.label" :name="typeItem.id + ''">
           <div v-loading="loading" class="list-box">
             <el-scrollbar class="list-scrollbar">
@@ -212,7 +212,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -225,19 +225,23 @@ export default {
       item.downloads++
     },
     deleteItem(id) {
-      this.loading = true
-      pushDeleteFile(id).then(res => {
-        this.getTablelist()
-      }).catch(error => {
-        console.log(error)
-        this.loading = false
-        this.$message.error({
-          type: 'error',
-          duration: 0,
-          showClose: true,
-          message: '删除软件出错: ' + error.message
-        })
+      this.$message({
+        type: 'info',
+        message: '开发中'
       })
+      // this.loading = true
+      // pushDeleteFile(id).then(res => {
+      //   this.getTablelist()
+      // }).catch(error => {
+      //   console.log(error)
+      //   this.loading = false
+      //   this.$message({
+      //     type: 'error',
+      //     duration: 0,
+      //     showClose: true,
+      //     message: '删除软件出错: ' + error.message
+      //   })
+      // })
     },
     getTopNData() {
       const typeIds = this.typeData.map(item => item.id).join(',')
@@ -251,7 +255,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.topLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -276,7 +280,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.topLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -300,7 +304,7 @@ export default {
     },
     uploadError(error) {
       this.uploadLoading = false
-      this.$message.error({
+      this.$message({
         type: 'error',
         duration: 0,
         showClose: true,

+ 2 - 2
src/views/business/components/DetailEdit.vue

@@ -176,7 +176,7 @@ export default {
           }).catch(error => {
             console.log(error)
             this.loading = false
-            this.$message.error({
+            this.$message({
               type: 'error',
               duration: 0,
               showClose: true,
@@ -203,7 +203,7 @@ export default {
         }
       }).catch(error => {
         console.log(error)
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 3 - 3
src/views/business/index.vue

@@ -156,7 +156,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -174,7 +174,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -194,7 +194,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.typeLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 9 - 7
src/views/home/Business.vue

@@ -11,18 +11,18 @@
           <el-tab-pane label="所有" name="all">
             <div v-for="bizType in bizTypeData" :key="bizType.id" class="type-box">
               <div class="type-title">{{ bizType.label }}</div>
-              <el-button v-for="item in bizData[bizType.value]" :key="item.id" plain @click="$jumpTo('business', item.id, item.businessNumber, item.url)">{{ item.businessName }}</el-button>
+              <el-button v-for="item in bizData[bizType.id]" :key="item.id" plain @click="$jumpTo('business', item.id, item.businessNumber, item.url)">{{ item.businessName }}</el-button>
             </div>
           </el-tab-pane>
           <el-tab-pane v-for="bizType in bizTypeData" :key="bizType.id" :label="bizType.label" :name="bizType.type + bizType.id">
             <div class="type-box">
-              <el-button v-for="item in bizData[bizType.value]" :key="item.id" plain @click="$jumpTo('business', item.id, item.businessNumber, item.url)">{{ item.businessName }}</el-button>
+              <el-button v-for="item in bizData[bizType.id]" :key="item.id" plain @click="$jumpTo('business', item.id, item.businessNumber, item.url)">{{ item.businessName }}</el-button>
             </div>
           </el-tab-pane>
         </el-tabs>
       </el-scrollbar>
     </el-card>
-    <business-edit ref="businessEdit" />
+    <business-edit ref="businessEdit" @refreshData="getBizTypeData" />
   </div>
 </template>
 
@@ -70,7 +70,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -80,6 +80,8 @@ export default {
     },
     getBizData() {
       const promises = []
+      this.bizTypeData = []
+      this.bizData = {}
       for (let i = 0; i < this.allBizTypeData.length; i++) {
         const type = this.allBizTypeData[i]
         const params = {
@@ -87,20 +89,20 @@ export default {
           size: this.size,
           params: {
             delFlag: 0,
-            businessType: type.value
+            businessType: type.id
           }
         }
         promises.push(
           new Promise((resolve, reject) => {
             fetchMyBizList(params).then(response => {
               if (hasValidRecords(response)) {
-                this.bizData[type.value] = response.data.records
+                this.bizData[type.id] = response.data.records
                 this.bizTypeData.push(type)
               }
               resolve()
             }).catch(error => {
               console.log(error)
-              this.$message.error({
+              this.$message({
                 type: 'error',
                 duration: 0,
                 showClose: true,

+ 1 - 1
src/views/home/Information.vue

@@ -76,7 +76,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 46 - 17
src/views/home/Link.vue

@@ -5,31 +5,33 @@
         <span>外部应用导航</span>
         <el-button style="float: right; padding: 3px 0" type="text">更多<i class="el-icon-arrow-right" /></el-button>
       </div>
-      <el-scrollbar class="link-content">
-        <ellipsis-tooltip v-for="item in linkData" :key="item.id" :content="item.name" placement="top" class="link-item" width="200px">
-          <a>{{ item.name }}</a>
-        </ellipsis-tooltip>
-      </el-scrollbar>
+      <div class="link-content">
+        <div class="link-box">
+          <div class="link-item-box">
+            <a v-for="item in linkData" :key="item.id" class="link-item">
+              {{ item.name }}
+            </a>
+          </div>
+        </div>
+        <div class="link-btn">
+          <el-button type="text">添加</el-button>
+        </div>
+      </div>
     </el-card>
   </div>
 </template>
 
 <script>
-import EllipsisTooltip from '@/components/EllipsisTooltip'
-
 export default {
   name: 'HomeLink',
-  components: {
-    EllipsisTooltip
-  },
   data() {
     return {
       linkData: [
         { id: '1', name: 'LinkLinkLink1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1Link1', link: '', createDate: '2023-07-07 10:01:02' },
         { id: '2', name: 'LinkLinkLink2', link: '', createDate: '2023-07-07 10:01:02' },
+        { id: '5', name: 'LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5', link: '', createDate: '2023-07-07 10:01:02' },
         { id: '3', name: 'LinkLinkLinkAAA3', link: '', createDate: '2023-07-07 10:01:02' },
         { id: '4', name: 'LinkLinkLinkBB4', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '5', name: 'LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5LinkLinkLinkCCCCC5', link: '', createDate: '2023-07-07 10:01:02' },
         { id: '6', name: 'LinkLinkLink6', link: '', createDate: '2023-07-07 10:01:02' },
         { id: '7', name: 'LinkLinkLink7', link: '', createDate: '2023-07-07 10:01:02' },
         { id: '8', name: 'LinkLinkLink8', link: '', createDate: '2023-07-07 10:01:02' },
@@ -43,14 +45,41 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.link-content {
+  height: calc(100% - 40px) !important;
+  margin: 20px 0;
+  background-color: rgba(0,0,0,0.02);
+}
+
+.link-box {
+  width: calc(100% - 60px);
+  height: 100%;
+  display: inline-block;
+}
+
+.link-item-box {
+  height: 100%;
+  display: flex;
+  justify-content: space-around;
+  overflow: hidden;
+  flex-wrap: wrap;
+}
+
 .link-item {
+  display: flex;
+  align-items: center;
+  height: 100%;
+  font-size: 14px;
+  color: rgba(0,0,0,0.85);
+
+  &+.link-item {
+    margin-left: 20px;
+  }
+}
+
+.link-btn {
   display: inline-block;
-  height: 43px;
-  line-height: 43px;
-  vertical-align: middle;
+  width: 60px;
   text-align: center;
-  margin: 2px 5px 2px 0px;
-  background-color: #f5f7fa;
-  color: #2a7fca;
 }
 </style>

+ 4 - 4
src/views/home/Message.vue

@@ -61,7 +61,7 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-    <message-list ref="messageList" :type-data="typeData" @updateMessage="updateMessage" />
+    <message-list ref="messageList" :type-data="typeData" @refreshData="updateMessage" />
   </div>
 </template>
 
@@ -153,7 +153,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -167,7 +167,7 @@ export default {
         this.todoData.splice(index, 1)
       }).catch(error => {
         console.log(error)
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -195,7 +195,7 @@ export default {
       //   }
       // }).catch(error => {
       //   console.log(error)
-      //   this.$message.error({
+      //   this.$message({
       //     type: 'error',
       //     duration: 0,
       //     showClose: true,

+ 57 - 16
src/views/home/Specification.vue

@@ -3,39 +3,80 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span>标准规范</span>
-        <el-button style="float: right; padding: 3px 0" type="text">更多<i class="el-icon-arrow-right" /></el-button>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="showMore">更多<i class="el-icon-arrow-right" /></el-button>
       </div>
       <el-scrollbar class="spec-content">
-        <el-table :data="specData" :show-header="false">
+        <el-table v-loading="loading" :data="tableData" :show-header="false">
           <el-table-column show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-link :underline="false">{{ scope.row.name }}</el-link>
+              <el-link :underline="false" @click="showDetail(scope.row.id)">{{ scope.row.title }}</el-link>
             </template>
           </el-table-column>
-          <el-table-column prop="createDate" width="150" />
+          <el-table-column prop="createTime" width="150" />
         </el-table>
       </el-scrollbar>
     </el-card>
+    <info-view ref="infoView" :type-data="typeData" is-home />
   </div>
 </template>
 
 <script>
+import { fetchTableList } from '@/api/info'
+
+import { hasValidRecords } from '@/utils/convert'
+
+import InfoView from '@/views/info/InfoView'
+
 export default {
   name: 'HomeSpec',
+  components: {
+    InfoView
+  },
   data() {
     return {
-      specData: [
-        { id: '1', name: 'Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1Spec1', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '2', name: 'Spec2', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '3', name: 'Spec3', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '4', name: 'Spec4', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '5', name: 'Spec5', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '6', name: 'Spec6', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '7', name: 'Spec7', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '8', name: 'Spec8', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '9', name: 'Spec9', link: '', createDate: '2023-07-07 10:01:02' },
-        { id: '10', name: 'Spec10', link: '', createDate: '2023-07-07 10:01:02' }
-      ]
+      tableData: [],
+      typeData: [{ 'id': 1, 'label': '通知通告' }, { 'id': 2, 'label': '信息交流' }, { 'id': 3, 'label': '标准规范' }],
+      // others
+      loading: false
+    }
+  },
+  created() {
+    this.getSpecData()
+  },
+  methods: {
+    getSpecData() {
+      this.loading = true
+      const params = {
+        current: 1,
+        size: 50,
+        delFlag: 0,
+        messageType: 3
+      }
+      fetchTableList(params).then(response => {
+        this.loading = false
+        if (hasValidRecords(response)) {
+          this.tableData = response.data.records
+          this.total = response.data.total
+        } else {
+          this.tableData = []
+          this.total = 0
+        }
+      }).catch(error => {
+        console.log(error)
+        this.loading = false
+        this.$message({
+          type: 'error',
+          duration: 0,
+          showClose: true,
+          message: '获取标准规范列表出错: ' + error.message
+        })
+      })
+    },
+    showMore() {
+      this.$router.push('/info')
+    },
+    showDetail(id) {
+      this.$refs['infoView'].open(id)
     }
   }
 }

+ 2 - 2
src/views/home/System.vue

@@ -16,7 +16,7 @@
         </el-carousel-item>
       </el-carousel>
     </el-card>
-    <system-edit ref="systemEdit" :title="title.startsWith('我的') ? title.substr(2) : title" :app-type="appType" />
+    <system-edit ref="systemEdit" :title="title.startsWith('我的') ? title.substr(2) : title" :app-type="appType" @refreshData="getMySystemData" />
   </div>
 </template>
 
@@ -90,7 +90,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 4 - 3
src/views/home/components/BusinessEdit.vue

@@ -182,7 +182,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.allLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -211,7 +211,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.myLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -232,6 +232,7 @@ export default {
       pushSaveFavorite(data).then(res => {
         this.loading = false
         this.visible = false
+        this.$emit('refreshData')
         this.$message({
           type: 'success',
           message: '保存成功!'
@@ -239,7 +240,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 4 - 4
src/views/home/components/MessageList.vue

@@ -161,7 +161,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -179,7 +179,7 @@ export default {
     },
     close() {
       this.visible = false
-      this.$emit('updateMessage')
+      this.$emit('refreshData')
     },
     viewDetail(content) {
       this.content = content
@@ -198,7 +198,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -223,7 +223,7 @@ export default {
         }
       }).catch(error => {
         console.log(error)
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 5 - 4
src/views/home/components/SystemEdit.vue

@@ -14,7 +14,7 @@
         <div v-loading="allLoading" class="drag-left">
           <div class="list-filter">
             <span class="filter-title">{{ title + '列表' }}</span>
-            <el-input v-model="formData.systemName" clearable>
+            <el-input v-model="formData.systemName" clearable size="small">
               <el-button slot="append" icon="el-icon-search" @click="searchTable" />
             </el-input>
           </div>
@@ -181,7 +181,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.allLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -212,7 +212,7 @@ export default {
         console.log(error)
         this.myLoading = false
         this.allLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -236,10 +236,11 @@ export default {
           type: 'success',
           message: '保存成功!'
         })
+        this.$emit('refreshData')
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 3 - 3
src/views/info/CommAdd.vue

@@ -127,7 +127,7 @@ export default {
       this.formData.attachmentName = data.fileName + '.' + data.extension
     },
     uploadError(error) {
-      this.$message.error({
+      this.$message({
         type: 'error',
         duration: 0,
         showClose: true,
@@ -161,7 +161,7 @@ export default {
           }).catch(error => {
             console.log(error)
             this.loading = false
-            this.$message.error({
+            this.$message({
               type: 'error',
               duration: 0,
               showClose: true,
@@ -179,7 +179,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 1 - 1
src/views/info/CommView.vue

@@ -92,7 +92,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 8 - 2
src/views/info/NoticeView.vue → src/views/info/InfoView.vue

@@ -6,7 +6,8 @@
       :close-on-press-escape="true"
       :close-on-click-modal="false"
       :show-close="false"
-      custom-class="main-edit-dialog"
+      :append-to-body="isHome"
+      :custom-class="isHome? 'home-more-dialog' :'main-edit-dialog'"
       :title="title"
     >
       <el-form :ref="formName" :model="formData" label-width="120px" class="dialog-form">
@@ -52,7 +53,12 @@ import { formatDictData } from '@/utils/convert'
 import { fetchDetailData } from '@/api/info'
 
 export default {
+  name: 'InfoView',
   props: {
+    isHome: {
+      type: Boolean,
+      default: false
+    },
     typeData: {
       type: Array,
       default() {
@@ -92,7 +98,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 2 - 2
src/views/info/NoticeAdd.vue

@@ -113,7 +113,7 @@ export default {
       this.formData.attachmentName = data.fileName + '.' + data.extension
     },
     uploadError(error) {
-      this.$message.error({
+      this.$message({
         type: 'error',
         duration: 0,
         showClose: true,
@@ -147,7 +147,7 @@ export default {
           }).catch(error => {
             console.log(error)
             this.loading = false
-            this.$message.error({
+            this.$message({
               type: 'error',
               duration: 0,
               showClose: true,

+ 1 - 3
src/views/info/NoticeEdit.vue

@@ -1,5 +1,3 @@
 <template>
-  <div>
-    test
-  </div>
+  <div />
 </template>

+ 2 - 2
src/views/info/SpecAdd.vue

@@ -117,7 +117,7 @@ export default {
       this.formData.attachmentName = data.fileName + '.' + data.extension
     },
     uploadError(error) {
-      this.$message.error({
+      this.$message({
         type: 'error',
         duration: 0,
         showClose: true,
@@ -155,7 +155,7 @@ export default {
           }).catch(error => {
             console.log(error)
             this.loading = false
-            this.$message.error({
+            this.$message({
               type: 'error',
               duration: 0,
               showClose: true,

+ 1 - 1
src/views/info/SpecView.vue

@@ -92,7 +92,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 1 - 1
src/views/info/components/DeptTree.vue

@@ -89,7 +89,7 @@ export default {
         this.$emit('updateValue', checkedNodes)
         this.visible = false
       } else {
-        this.$message.error({
+        this.$message({
           type: 'warning',
           message: '请选择接收单位!'
         })

+ 2 - 2
src/views/info/components/DeptUser.vue

@@ -174,7 +174,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -209,7 +209,7 @@ export default {
         this.$emit('updateValue', checkedNodes)
         this.visible = false
       } else {
-        this.$message.error({
+        this.$message({
           type: 'warning',
           message: '请选择接收单位!'
         })

+ 7 - 7
src/views/info/index.vue

@@ -85,7 +85,7 @@
     <comm-add ref="commAdd" :dept-data="deptData" @refreshData="searchTable" />
     <spec-add ref="specAdd" :dept-data="deptData" @refreshData="searchTable" />
     <notice-edit ref="noticeEdit" :dept-data="deptData" @refreshData="searchTable" />
-    <notice-view ref="noticeView" :type-data="typeData" />
+    <info-view ref="infoView" :type-data="typeData" />
   </div>
 </template>
 
@@ -99,7 +99,7 @@ import NoticeAdd from './NoticeAdd'
 import CommAdd from './CommAdd'
 import SpecAdd from './SpecAdd'
 import NoticeEdit from './NoticeEdit'
-import NoticeView from './NoticeView'
+import InfoView from './InfoView'
 
 import TreeSelect from '@/components/Select/TreeSelect'
 export default {
@@ -110,7 +110,7 @@ export default {
     CommAdd,
     SpecAdd,
     NoticeEdit,
-    NoticeView
+    InfoView
   },
   data() {
     return {
@@ -205,7 +205,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -226,7 +226,7 @@ export default {
       }
     },
     viewItem(id) {
-      this.$refs['noticeView'].open(id)
+      this.$refs['infoView'].open(id)
     },
     editItem(id) {
       console.log(id)
@@ -245,7 +245,7 @@ export default {
       // }).catch(error => {
       //   console.log(error)
       //   this.topLoading = false
-      //   this.$message.error({
+      //   this.$message({
       //     type: 'error',
       //     duration: 0,
       //     showClose: true,
@@ -263,7 +263,7 @@ export default {
         }
       }).catch(error => {
         console.log(error)
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,

+ 5 - 5
src/views/system/components/DetailEdit.vue

@@ -198,7 +198,7 @@ export default {
       this.fileName = data.fileName + '.' + data.extension
     },
     uploadError(error) {
-      this.$message.error({
+      this.$message({
         type: 'error',
         duration: 0,
         showClose: true,
@@ -259,7 +259,7 @@ export default {
           }).catch(error => {
             console.log(error)
             this.loading = false
-            this.$message.error({
+            this.$message({
               type: 'error',
               duration: 0,
               showClose: true,
@@ -279,7 +279,7 @@ export default {
         }
       }).catch(error => {
         console.log(error)
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -297,7 +297,7 @@ export default {
           }
         }).catch(error => {
           console.log(error)
-          this.$message.error({
+          this.$message({
             type: 'error',
             duration: 0,
             showClose: true,
@@ -313,7 +313,7 @@ export default {
           }
         }).catch(error => {
           console.log(error)
-          this.$message.error({
+          this.$message({
             type: 'error',
             duration: 0,
             showClose: true,

+ 3 - 3
src/views/system/index.vue

@@ -181,7 +181,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -199,7 +199,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.loading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,
@@ -219,7 +219,7 @@ export default {
       }).catch(error => {
         console.log(error)
         this.typeLoading = false
-        this.$message.error({
+        this.$message({
           type: 'error',
           duration: 0,
           showClose: true,