bug 修改

新增错误消息弹窗显示

src/components/tools/UserMenu.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="user-wrapper" :class="theme">
-    <header-notice class="action"/>
+    <header-notice class="action" />
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
-        <img src="@/assets/images/header/avatar.png" alt="">
+        <img src="@/assets/images/header/avatar.png" alt="" />
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
+        <!-- <a-menu-item key="0">
           <router-link :to="{ name: 'account-center' }">
             <a-icon type="user"/>
             <span>个人中心</span>
@@ -21,24 +21,24 @@
         <a-menu-item key="3"  @click="systemSetting">
            <a-icon type="tool"/>
            <span>系统设置</span>
-        </a-menu-item>
+        </a-menu-item> -->
         <a-menu-item key="4" @click="updatePassword">
-          <a-icon type="setting"/>
+          <a-icon type="setting" />
-          <span>密码修改</span>
+          <span>Change Password</span>
         </a-menu-item>
-        <a-menu-item key="5" @click="updateCurrentDepart">
+        <!-- <a-menu-item key="5" @click="updateCurrentDepart">
           <a-icon type="cluster"/>
           <span>切换部门</span>
         </a-menu-item>
         <a-menu-item key="6" @click="clearCache">
           <a-icon type="sync"/>
           <span>清理缓存</span>
-        </a-menu-item>
+        </a-menu-item> -->
       </a-menu>
     </a-dropdown>
     <span class="action">
       <a class="logout_title" href="javascript:;" @click="handleLogout">
-        <img src="@/assets/images/header/close.png" alt="">
+        <img src="@/assets/images/header/close.png" alt="" />
       </a>
     </span>
     <user-password ref="userPassword"></user-password>
@@ -48,201 +48,205 @@
 </template>
 
 <script>
-  import HeaderNotice from './HeaderNotice'
+import HeaderNotice from './HeaderNotice'
-  import UserPassword from './UserPassword'
+import UserPassword from './UserPassword'
-  import SettingDrawer from "@/components/setting/SettingDrawer";
+import SettingDrawer from '@/components/setting/SettingDrawer'
-  import DepartSelect from './DepartSelect'
+import DepartSelect from './DepartSelect'
-  import { mapActions, mapGetters,mapState } from 'vuex'
+import { mapActions, mapGetters, mapState } from 'vuex'
-  import { mixinDevice } from '@/utils/mixin.js'
+import { mixinDevice } from '@/utils/mixin.js'
-  import { getFileAccessHttpUrl,getAction } from "@/api/manage"
+import { getFileAccessHttpUrl, getAction } from '@/api/manage'
-  import Vue from 'vue'
+import Vue from 'vue'
-  import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
 
-  export default {
+export default {
-    name: "UserMenu",
+  name: 'UserMenu',
-    mixins: [mixinDevice],
+  mixins: [mixinDevice],
-    data(){
+  data() {
-      return{
+    return {
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-        searchMenuOptions:[],
+      searchMenuOptions: [],
-        searchMenuComp: 'span',
+      searchMenuComp: 'span',
-        searchMenuVisible: false,
+      searchMenuVisible: false,
-        // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
+      // update-begin author:sunjianlei date:20200219 for: 头部菜单搜索规范命名 --------------
-      }
+    }
-    },
+  },
-    components: {
+  components: {
-      HeaderNotice,
+    HeaderNotice,
-      UserPassword,
+    UserPassword,
-      DepartSelect,
+    DepartSelect,
-      SettingDrawer
+    SettingDrawer,
-    },
+  },
-    props: {
+  props: {
-      theme: {
+    theme: {
-        type: String,
+      type: String,
-        required: false,
+      required: false,
-        default: 'dark'
+      default: 'dark',
+    },
+  },
+  /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  created() {
+    let lists = []
+    this.searchMenus(lists, this.permissionMenuList)
+    this.searchMenuOptions = [...lists]
+  },
+  mounted() {
+    //如果是单点登录模式
+    if (process.env.VUE_APP_SSO == 'true') {
+      let depart = this.userInfo().orgCode
+      if (!depart) {
+        this.updateCurrentDepart()
       }
+    }
+  },
+  computed: {
+    ...mapState({
+      // 后台菜单
+      permissionMenuList: (state) => state.user.permissionList,
+    }),
+  },
+  /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+  watch: {
+    // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+    device: {
+      immediate: true,
+      handler() {
+        this.searchMenuVisible = false
+        this.searchMenuComp = this.isMobile() ? 'a-modal' : 'span'
+      },
     },
+    // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+  },
+  methods: {
     /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    created() {
+    showClick() {
-      let lists = []
+      this.searchMenuVisible = true
-      this.searchMenus(lists,this.permissionMenuList)
-      this.searchMenuOptions=[...lists]
     },
-    mounted() {
+    hiddenClick() {
-      //如果是单点登录模式
+      this.shows = false
-      if (process.env.VUE_APP_SSO == 'true') {
-        let depart = this.userInfo().orgCode
-        if (!depart) {
-          this.updateCurrentDepart()
-        }
-      }
-    },
-    computed: {
-      ...mapState({
-        // 后台菜单
-        permissionMenuList: state => state.user.permissionList
-
-      })
     },
     /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-    watch: {
+    ...mapActions(['Logout']),
-      // update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
+    ...mapGetters(['nickname', 'avatar', 'userInfo']),
-      device: {
+    getAvatar() {
-        immediate: true,
+      return getFileAccessHttpUrl(this.avatar())
-        handler() {
-          this.searchMenuVisible = false
-          this.searchMenuComp = this.isMobile() ? 'a-modal' : 'span'
-        },
-      },
-      // update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框
     },
-    methods: {
+    handleLogout() {
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+      const that = this
-      showClick() {
-        this.searchMenuVisible = true
-      },
-      hiddenClick(){
-        this.shows = false
-      },
-      /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      ...mapActions(["Logout"]),
-      ...mapGetters(["nickname", "avatar","userInfo"]),
-      getAvatar(){
-        return getFileAccessHttpUrl(this.avatar())
-      },
-      handleLogout() {
-        const that = this
 
-        this.$confirm({
+      this.$confirm({
-          title: 'Prompt',
+        title: 'Prompt',
-          content: 'Ensure Log Out?',
+        content: 'Ensure Log Out?',
-          cancelButtonProps: {
+        cancelButtonProps: {
-            props: {
+          props: {
-              type: 'warn'
+            type: 'warn',
-            }
           },
-          onOk() {
+        },
-            return that.Logout({}).then(() => {
+        onOk() {
+          return that
+            .Logout({})
+            .then(() => {
               // update-begin author:scott date:20211223 for:【JTC-198】退出登录体验不好
               //that.$router.push({ path: '/user/login' });
               window.location.reload()
               // update-end author:scott date:20211223 for:【JTC-198】退出登录体验不好
-            }).catch(err => {
+            })
+            .catch((err) => {
               that.$message.error({
                 title: 'Error',
-                description: err.message
+                description: err.message,
               })
             })
-          },
+        },
-          onCancel() {
+        onCancel() {},
-          },
+      })
-        });
+    },
-      },
+    updatePassword() {
-      updatePassword(){
+      let username = this.userInfo().username
-        let username = this.userInfo().username
+      this.$refs.userPassword.show(username)
-        this.$refs.userPassword.show(username)
+    },
-      },
+    updateCurrentDepart() {
-      updateCurrentDepart(){
+      this.$refs.departSelect.show()
-        this.$refs.departSelect.show()
+    },
-      },
+    systemSetting() {
-      systemSetting(){
+      this.$refs.settingDrawer.showDrawer()
-        this.$refs.settingDrawer.showDrawer()
+    },
-      },
+    /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
-      /* update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    searchMenus(arr, menus) {
-      searchMenus(arr,menus){
+      for (let i of menus) {
-        for(let i of menus){
+        if (!i.hidden && 'layouts/RouteView' !== i.component) {
-          if(!i.hidden && "layouts/RouteView"!==i.component){
+          arr.push(i)
-           arr.push(i)
-          }
-          if(i.children&& i.children.length>0){
-            this.searchMenus(arr,i.children)
-          }
         }
-      },
+        if (i.children && i.children.length > 0) {
-      filterOption(input, option) {
+          this.searchMenus(arr, i.children)
-        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      },
-      // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      searchMethods(value) {
-        let route = this.searchMenuOptions.filter(item => item.id === value)[0]
-        //update-begin-author:sunjianlei date:20220111 for: 【JTC-702】【菜单搜索】菜单搜索里点击跳转的菜单，无法将Token信息传递过去
-        if(route.component.includes('layouts/IframePageView')){
-          this.$router.push(route)
-        }else{
-          this.$router.push({ path: route.path })
         }
-        //update-end-author:sunjianlei date:20220111 for: 【JTC-702】【菜单搜索】菜单搜索里点击跳转的菜单，无法将Token信息传递过去
+      }
-        this.searchMenuVisible = false
+    },
-      },
+    filterOption(input, option) {
-      // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    },
-      /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
+    // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
-      clearCache(){
+    searchMethods(value) {
-        getAction("sys/dict/refleshCache").then((res) => {
+      let route = this.searchMenuOptions.filter((item) => item.id === value)[0]
+      //update-begin-author:sunjianlei date:20220111 for: 【JTC-702】【菜单搜索】菜单搜索里点击跳转的菜单，无法将Token信息传递过去
+      if (route.component.includes('layouts/IframePageView')) {
+        this.$router.push(route)
+      } else {
+        this.$router.push({ path: route.path })
+      }
+      //update-end-author:sunjianlei date:20220111 for: 【JTC-702】【菜单搜索】菜单搜索里点击跳转的菜单，无法将Token信息传递过去
+      this.searchMenuVisible = false
+    },
+    // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
+    /*update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
+    /*update_begin author:liushaoqian date:20200507 for: 刷新缓存*/
+    clearCache() {
+      getAction('sys/dict/refleshCache')
+        .then((res) => {
           if (res.success) {
             //重新加载缓存
-            getAction("sys/dict/queryAllDictItems").then((res) => {
+            getAction('sys/dict/queryAllDictItems').then((res) => {
               if (res.success) {
                 Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
                 Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result, 7 * 24 * 60 * 60 * 1000)
               }
             })
-            this.$message.success("刷新缓存完成！");
+            this.$message.success('刷新缓存完成！')
           }
-        }).catch(e=>{
-          this.$message.warn("刷新缓存失败！");
-          console.log("刷新失败",e)
         })
-      }
+        .catch((e) => {
-      /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
+          this.$message.warn('刷新缓存失败！')
-    }
+          console.log('刷新失败', e)
-  }
+        })
+    },
+    /*update_end author:liushaoqian date:20200507 for: 刷新缓存*/
+  },
+}
 </script>
 
 <style lang="less" scoped>
-  /* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update_begin author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
-  /* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+/* update-begin author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
-  .user-wrapper .search-input {
+.user-wrapper .search-input {
-    width: 180px;
+  width: 180px;
-    color: inherit;
+  color: inherit;
 
-    /deep/ .ant-select-selection {
+  /deep/ .ant-select-selection {
-      background-color: inherit;
+    background-color: inherit;
-      border: 0;
+    border: 0;
-      border-bottom: 1px solid white;
+    border-bottom: 1px solid white;
-      &__placeholder, &__field__placeholder {
+    &__placeholder,
-        color: inherit;
+    &__field__placeholder {
-      }
+      color: inherit;
     }
   }
-  /* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+}
-  /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
+/* update-end author:sunjianlei date:20191220 for: 解决全局样式冲突问题 */
+/* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
 
 <style scoped>
-  .logout_title {
+.logout_title {
-    color: inherit;
+  color: inherit;
-    text-decoration: none;
+  text-decoration: none;
-  }
+}
 </style>

src/views/abnormalAlarm/databaseMonitor/instances/conditionBox.vue

@@ -75,8 +75,16 @@ export default {
   mounted() {
     this.getDbList()
   },
-  activated() {
+  watch: {
-    this.getDbList()
+    $route: {
+      handler: function (val, oldVal) {
+        if (val.query && val.query.id) {
+          this.getDbList()
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
     getBeforeHours(num) {

src/views/abnormalAlarm/emailMonitor/instances/index.vue

@@ -239,10 +239,19 @@ export default {
   mounted() {
     this.getEmailList()
   },
-  activated() {
+  // activated() {
-    this.getEmailList()
+  //   this.getEmailList()
-  },
+  // },
   watch: {
+    $route: {
+      handler: function (val, oldVal) {
+        if (val.query && val.query.emailId) {
+          this.getEmailList()
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
     emailId(newValue, oldValue) {
       this.currId = newValue
       this.getEmailStatus()

src/views/abnormalAlarm/serverMonitor/instances/cpu.vue

@@ -237,8 +237,16 @@ export default {
   mounted() {
     this.getServerList()
   },
-  activated() {
+  watch: {
-    this.getServerList()
+    $route: {
+      handler: function (val, oldVal) {
+        if (val.query && val.query.serverId) {
+          this.getServerList()
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
     handleRefresh() {

src/views/abnormalAlarm/serverMonitor/instances/details.vue

@@ -280,6 +280,7 @@
           <BoxTitle title="Alarm information"></BoxTitle>
           <div
             class="alarm-info-list"
+            style="margin-bottom: 15px"
             v-infinite-scroll="handleInfiniteAlarmInfo"
             :infinite-scroll-disabled="busy_alarm_info"
             :infinite-scroll-distance="10"
@@ -451,84 +452,58 @@ export default {
       },
     }
   },
+  watch: {
+    $route: {
+      handler: function (val, oldVal) {
+        if (val.query && val.query.serverId) {
+          this.getData()
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   mounted() {
-    this.getSysServer((res) => {
+    this.getData()
-      this.loading = false
-      if (res.success) {
-        this.ipagination.total = res.result.total
-        this.dataSource = res.result.records
-        if (this.$route.query.serverId) {
-          this.serverId = this.$route.query.serverId
-          this.currIndex = this.dataSource.findIndex((item) => item.sourceId === this.serverId)
-          this.currHostId = this.dataSource.find((item) => item.sourceId === this.serverId).hostId
-          this.currSourceId = this.dataSource.find((item) => item.sourceId === this.serverId).sourceId
-          this.currItemId = this.dataSource.find((item) => item.sourceId === this.serverId).cpuUsedItemId
-        } else {
-          this.currHostId = this.dataSource[0].hostId
-          this.currSourceId = this.dataSource[0].sourceId
-          this.currItemId = this.dataSource[0].cpuUsedItemId
-          this.currIndex = 0
-        }
-        this.getBasiclnfo(this.currHostId)
-        this.getCpuUtilizationData()
-        this.getTimeLineData()
-        // this.EchartsTimeline()
-        this.getDetailsAlarmInfo((res) => {
-          this.loading_alarm_info = false
-          if (res.success) {
-            this.ipagination_alarm_info.total = res.result.total
-            this.dataSource_alarm_info = res.result.records
-          } else {
-            this.$message.warning('This operation fails. Contact your system administrator')
-          }
-        })
-      } else {
-        this.$message.warning('This operation fails. Contact your system administrator')
-      }
-    })
-    // this.$nextTick(() => {
-    //   setTimeout(() => {
-    //     this.drawGuageLoads()
-    //   }, 0)
-    // })
-  },
-  activated() {
-    this.getSysServer((res) => {
-      this.loading = false
-      if (res.success) {
-        this.ipagination.total = res.result.total
-        this.dataSource = res.result.records
-        if (this.$route.query.serverId) {
-          this.serverId = this.$route.query.serverId
-          this.currIndex = this.dataSource.findIndex((item) => item.sourceId === this.serverId)
-          this.currHostId = this.dataSource.find((item) => item.sourceId === this.serverId).hostId
-          this.currSourceId = this.dataSource.find((item) => item.sourceId === this.serverId).sourceId
-          this.currItemId = this.dataSource.find((item) => item.sourceId === this.serverId).cpuUsedItemId
-        } else {
-          this.currHostId = this.dataSource[0].hostId
-          this.currSourceId = this.dataSource[0].sourceId
-          this.currItemId = this.dataSource[0].cpuUsedItemId
-          this.currIndex = 0
-        }
-        this.getBasiclnfo(this.currHostId)
-        this.getCpuUtilizationData()
-        this.getTimeLineData()
-        // this.EchartsTimeline()
-        this.getDetailsAlarmInfo((res) => {
-          this.loading_alarm_info = false
-          if (res.success) {
-            this.ipagination_alarm_info.total = res.result.total
-            this.dataSource_alarm_info = res.result.records
-          } else {
-            this.$message.warning('This operation fails. Contact your system administrator')
-          }
-        })
-      } else {
-        this.$message.warning('This operation fails. Contact your system administrator')
-      }
-    })
   },
+  // activated() {},
   methods: {
+    getData() {
+      this.getSysServer((res) => {
+        this.loading = false
+        if (res.success) {
+          this.ipagination.total = res.result.total
+          this.dataSource = res.result.records
+          if (this.$route.query.serverId) {
+            this.serverId = this.$route.query.serverId
+            this.currIndex = this.dataSource.findIndex((item) => item.sourceId === this.serverId)
+            this.currHostId = this.dataSource.find((item) => item.sourceId === this.serverId).hostId
+            this.currSourceId = this.dataSource.find((item) => item.sourceId === this.serverId).sourceId
+            this.currItemId = this.dataSource.find((item) => item.sourceId === this.serverId).cpuUsedItemId
+          } else {
+            this.currHostId = this.dataSource[0].hostId
+            this.currSourceId = this.dataSource[0].sourceId
+            this.currItemId = this.dataSource[0].cpuUsedItemId
+            this.currIndex = 0
+          }
+          this.getBasiclnfo(this.currHostId)
+          this.getCpuUtilizationData()
+          this.getTimeLineData()
+          // this.EchartsTimeline()
+          this.getDetailsAlarmInfo((res) => {
+            this.loading_alarm_info = false
+            if (res.success) {
+              this.ipagination_alarm_info.total = res.result.total
+              this.dataSource_alarm_info = res.result.records
+            } else {
+              this.$message.warning('This operation fails. Contact your system administrator')
+            }
+          })
+        } else {
+          this.$message.warning('This operation fails. Contact your system administrator')
+        }
+      })
+    },
     moment,
     // Basic lnformation
     getBasiclnfo(sourceId) {

src/views/abnormalAlarm/serverMonitor/instances/monitor.vue

@@ -166,8 +166,16 @@ export default {
   mounted() {
     this.getServerList()
   },
-  activated() {
+  watch: {
-    this.getServerList()
+    $route: {
+      handler: function (val, oldVal) {
+        if (val.query && val.query.serverId) {
+          this.getServerList()
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
     handleRefresh() {

src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue

@@ -286,8 +286,16 @@ export default {
       setTimeout(() => {}, 0)
     })
   },
-  activated() {
+  watch: {
-    this.getServerList()
+    $route: {
+      handler: function (val, oldVal) {
+        if (val.query && val.query.serverId) {
+          this.getServerList()
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
     handleRefresh() {

src/views/system/DataBase.vue

@@ -28,6 +28,10 @@
         {{ index + 1 }}
       </template>
     </custom-table>
+    <!-- 日志列表结束 -->
+    <custom-modal title="List Of File Deletion Failures" :width="950" v-model="visibleInfo" :footer="null">
+      <a-table :columns="columnsModal" :data-source="dataInfo" :pagination="false"> </a-table>
+    </custom-modal>
   </div>
 </template>
 
@@ -163,11 +167,24 @@ const columns = [
     dataIndex: 'status',
   },
 ]
+const columnsModal = [
+  {
+    title: 'Index',
+    dataIndex: 'rowCount',
+    align: 'center',
+  },
+  {
+    title: 'Information',
+    dataIndex: 'info',
+    align: 'left',
+  },
+]
 
 export default {
   mixins: [JeecgListMixin],
   data() {
     this.columns = columns
+    this.columnsModal = columnsModal
     return {
       queryParam: {
         collectStart: this.getBeforeDate(6),
@@ -183,6 +200,8 @@ export default {
       },
       stationList: [],
       detectorList: [],
+      visibleInfo: false,
+      dataInfo: [],
     }
   },
   created() {
@@ -264,7 +283,7 @@ export default {
           cancelText: 'Cancel',
           onOk: async () => {
             try {
-              const { success, message } = await deleteAction('/gardsSampleData/deleteById', {
+              const { success, message, result } = await deleteAction('/gardsSampleData/deleteById', {
                 sampleId: this.selectedRowKeys[0],
                 ...this.delParams,
               })
@@ -273,6 +292,13 @@ export default {
                 that.loadData()
               } else {
                 this.$message.error(message)
+                this.visibleInfo = true
+                this.dataInfo = result.map((item, index) => {
+                  return {
+                    rowCount: `${index + 1}`,
+                    info: item,
+                  }
+                })
               }
             } catch (error) {
               console.error(error)