策略名称默认时间戳、系统名称修改、监控看板详情列表条件

.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = SAAS综合管理平台
+VUE_APP_TITLE = 智融云管理平台
 
 # 开发环境配置
 ENV = 'development'
 
-# SAAS管理系统/开发环境
+# 智融云管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = SAAS综合管理平台
+VUE_APP_TITLE = 智融云管理平台
 
 # 生产环境配置
 ENV = 'production'
 
-# SAAS管理系统/生产环境
+# 智融云管理系统/生产环境
 VUE_APP_BASE_API = 'http://172.16.15.102:8080'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = SAAS综合管理平台
+VUE_APP_TITLE = 智融云管理平台
 
 BABEL_ENV = production
 
@@ -8,5 +8,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'
 
-# SAAS管理系统/测试环境
+# 智融云管理系统/测试环境
 VUE_APP_BASE_API = 'http://172.16.15.51:8080'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.6.6",
-  "description": "SAAS综合管理平台",
+  "description": "智融云管理平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {

src/components/echartsList/line.vue

@@ -185,7 +185,7 @@
               type: 'value',
               name: dataXY?.yAxisName || ' ',
               nameTextStyle: dataXY && dataXY.unitSelList && dataXY.unitSelList.length > 0 ? {color: 'transparent'} : {},  // 将名称文本颜色设为透明，使其不可见
-              min: 0,    // 自定义最小刻度（根据业务需求调整，如 0）
+              min: dataXY && dataXY.data && dataXY.data.length > 0 ? null : dataXY && dataXY.dataList && dataXY.dataList[0] && dataXY.dataList[0].data.length > 0 ? null : 0,    // 自定义最小刻度（根据业务需求调整，如 0）
               max: dataXY && dataXY.data && dataXY.data.length > 0 ? null : dataXY && dataXY.dataList && dataXY.dataList[0] && dataXY.dataList[0].data.length > 0 ? null : 100,
               splitLine: {
                 show: true,

src/views/earnManage/businessIssued/details.vue

@@ -102,7 +102,7 @@
           }];
         } else {
           this.formList = [{
-            config: {title: '基本信息', colSpan: this.paramsData && this.paramsData.readonly ? '' : 'disBlock', readonly: this.paramsData && this.paramsData.readonly},
+            config: {title: this.open ? ' ' : '基本信息', colSpan: this.paramsData && this.paramsData.readonly ? '' : 'disBlock', readonly: this.paramsData && this.paramsData.readonly},
             controls: {
               id: {label: 'ID',hidden: true},
               taskName: {label: '任务名称', span: 12, type: 'input', required: true},

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{title}}</h3>
+      <h3 class="title"><img :src="logo" alt="" class="loginTitleImg">{{title}}</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -62,6 +62,7 @@
 </template>
 
 <script>
+import logoImg from '@/assets/logo/logo2.png'
 import { getCodeImg } from "@/api/login"
 import Cookies from "js-cookie"
 import { encrypt, decrypt } from '@/utils/jsencrypt'
@@ -71,6 +72,7 @@ export default {
   data() {
     return {
       title: process.env.VUE_APP_TITLE,
+      logo: logoImg,
       codeUrl: "",
       loginForm: {
         username: "",
@@ -169,7 +171,7 @@ export default {
   background-size: cover;
 }
 .title {
-  margin: 0px auto 30px auto;
+  margin: 0px auto 15px auto;
   text-align: center;
   color: #707070;
 }
@@ -221,4 +223,10 @@ export default {
 .login-code-img {
   height: 38px;
 }
+.loginTitleImg {
+  width: 60px;
+  height: 50px;
+  vertical-align: middle;
+  margin-right: 12px;
+}
 </style>

src/views/resource/monitorBoard/monitorBoardView.vue

@@ -337,9 +337,10 @@
         }
       },
       getList(val) {
+        this.queryParams = Object.assign({}, this.queryParams, val);
         if (this.reserveForm && (this.reserveForm.resourceType === '1' || this.reserveForm.resourceType === '3')) {
           this.$modal.loading();
-          getBandWidthList(Object.assign({}, this.queryParams, val)).then(response => {
+          getBandWidthList(this.queryParams).then(response => {
             this.roleList = response.rows;
             this.queryParams.total = response.total;
             this.$modal.closeLoading();
@@ -348,7 +349,7 @@
           });
         } else if (this.reserveForm.resourceType === '2') {
           this.$modal.loading();
-          getSwitchInfoList(Object.assign({}, this.queryParams, val)).then(response => {
+          getSwitchInfoList(this.queryParams).then(response => {
             this.roleList = response.rows;
             this.queryParams.total = response.total;
             this.$modal.closeLoading();

src/views/resource/mtrAgent/lossRateChart.vue

@@ -5,7 +5,12 @@
         <el-collapse-item :title="`【${val && val.title || ''}】${val && val.jointName || ''}`" :name="val && val.title || ''">
           <div class="mt10 w100">
             <div v-for="item of val && val.echartList || []" :key="`div-${val && val.title || ''}-${item && item.title || ''}-${index}`" class="w100" style="height: 200px;">
-              <EchartsLine class="w100 h100" :key="`chart-${val && val.title || ''}-${item && item.title || ''}-${index}`" :lineData="item && item.dataVal || {}" :dateDataTrans="item && item.dateDataTrans || {}" :dateShowType="item && item.dateShowType || 'datetimerange'" :title="item && item.title || '图表数据'" :chartData="(valData) => chartDataEvent(valData,val.title)"></EchartsLine>
+              <div class="w100 h100" style="position: relative;">
+                <EchartsLine class="w100 h100" :key="`chart-${val && val.title || ''}-${item && item.title || ''}-${index}`" :lineData="item && item.dataVal || {}" :dateDataTrans="item && item.dateDataTrans || {}" :dateShowType="item && item.dateShowType || 'datetimerange'" :title="item && item.title || '图表数据'" :chartData="(valData) => chartDataEvent(valData,val.title)"></EchartsLine>
+                <div v-if="val &&val.failFlag === 1" class="failFlagSty">
+                  探测失败 <br/>{{val.mtrClientId}}
+                </div>
+              </div>
             </div>
           </div>
         </el-collapse-item>
@@ -118,4 +123,18 @@
     padding-left: 20px;
     font-size: 1rem;
   }
+  .failFlagSty {
+    width: 200px;
+    height: 60px;
+    color: #98989899;
+    position: absolute;
+    margin: auto;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    text-align: center;
+    font-size: 1rem;
+    /*transform: rotateZ(-15deg);*/
+  }
 </style>

src/views/resource/mtrProbe/mtrProbeView.vue

@@ -27,6 +27,8 @@
           if (val === 'type_true') {
             this.paramsData = {};
             this.$set(this.ruleForm, 'mtrClientId', this.dialogRowData && this.dialogRowData.mtrClientId || '');
+            this.$set(this.ruleForm, 'policyName', Date.now());
+            this.$set(this.ruleForm, 'probeFrequency', '300');
             this.$set(this.ruleForm, 'clientAllId', false);
             if (this.formList && this.formList.length > 0) {
               this.formList[0].controls.serveripGroup['hidden'] = true;
@@ -43,7 +45,8 @@
     },
     data() {
       return {
-        ruleForm: {probeFlag: '1'},
+        loading: false,
+        ruleForm: {probeFlag: '1', policyName: Date.now(), probeFrequency: '300'},
         formList: [],
         paramsData: {},
         config: {},
@@ -199,18 +202,22 @@
               }
               break;
             case 'submit':
+              if (this.loading) return;
+              this.loading = true;
               let fnType = addMtrPolicy;
               if (dataVal && dataVal.id) {
                 fnType = updateMtrPolicy;
               }
               fnType(dataVal).then(response => {
                 this.$modal.msgSuccess(response.msg);
+                this.loading = false;
                 if (this.open) {
                   this.$emit("dialogResult", {open: true});
                 } else {
                   this.$router.push("/resource/mtrProbe")
                 }
               }).catch(() => {
+                this.loading = false;
                 this.$modal.msgError("操作失败")
               });
               break;

src/views/resource/serverMonitorStrat/monitorStrategy.vue

@@ -157,6 +157,8 @@
           if (val === 'type_true') {
             this.paramsData = {};
             this.$set(this.ruleFormData, 'deployDevice', this.dialogRowData.clientId);
+            this.$set(this.ruleFormData, 'policyName', Date.now()
+            );
           } else if (val === 'type_false') {
             // 清空form
             this.$refs['formRef'].$refs.ruleForm.resetFields();
@@ -172,7 +174,9 @@
         firstChangeTime: '',
         activeTwoName: [0,1,2,3,4,5],
         timeOptions: [],
-        ruleFormData: {},
+        ruleFormData: {
+          policyName: Date.now(),
+        },
         formList: [],
         firstData: {
           cpu: {title: 'CPU监控', time: '',

src/views/resource/serverScriptStrat/details.vue

@@ -29,6 +29,7 @@
           if (val === 'type_true') {
             this.paramsData = {};
             this.$set(this.ruleForm, 'deployDevice', this.dialogRowData.clientId);
+            this.$set(this.ruleForm, 'policyName', Date.now());
           } else if (val === 'type_false') {
             // 清空form
             this.$refs['formRef'].$refs.ruleForm.resetFields();
@@ -41,7 +42,7 @@
     data() {
       return {
         loading: false,
-        ruleForm: {},
+        ruleForm: {policyName: Date.now()},
         formList: [],
         paramsData: {},
         scriptList: {},

src/views/resource/switchMonitorStrat/monitorStrategy.vue

@@ -148,6 +148,7 @@
         activeTwoName: [0,1,2,3,4],
         timeOptions: [],
         ruleFormData: {
+          policyName: Date.now(),
           deployDevice: []
         },
         formList: [],
@@ -260,7 +261,7 @@
         getMonitorPolicy(id).then(val => {
           if (val && val.data) {
             if (val.data && val.data.policy) {
-              val.data.policy['policyName'] = btnGain && btnGain ? val.data.policy['policyName'] + '-' + Date.now() : val.data.policy['policyName'];
+              val.data.policy['policyName'] = btnGain && btnGain ? Date.now() : val.data.policy['policyName'];
               val.data.policy['deployDevice'] = val.data.policy.deployDevice.split('\n');
               // val.data.policy['status'] = Number(val.data.policy.status);
               this.ruleFormData = val.data.policy;

src/views/welcome.vue

@@ -1,7 +1,7 @@
 <template>
 <!--    <div class="w100" style="height: calc(100vh - 85px);overflow: auto;">-->
 <!--      <div class="pt50">-->
-<!--        <div class="textAlignCenter" style="font-size: 3rem;color: #BFBF00;font-weight: 600;">彤然科技-分布式SaaS收益管理平台</div>-->
+<!--        <div class="textAlignCenter" style="font-size: 3rem;color: #BFBF00;font-weight: 600;">彤然科技-智融云管理平台</div>-->
 <!--        <div class="textAlignCenter" style="font-size: 1.8rem;">欢迎您{{user.nickName}}：现在是{{newDateTime}}</div>-->
 <!--        <div class="w100 m0Auto">-->
 <!--          <div style="width: 85%;margin: 10px auto;">-->
@@ -15,7 +15,7 @@
   <div class="welcome-container">
     <div class="header-section textAlignCenter">
       <div class="main-title" :style="{ backgroundImage: `url(${require('@/assets/images/headerBg.png')})`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',backgroundPosition: 'center', }">
-        <div class="titleMargBtom">分布式SaaS收益管理平台</div>
+        <div class="titleMargBtom">智融云管理平台</div>
       </div>
       <div class="welcome-text">
         <div class="animated-text class-method" :class="{ 'slide-in': showContent }" style="--animation-duration: 1200ms">

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || 'SAAS综合管理平台' // 网页标题
+const name = process.env.VUE_APP_TITLE || '智融云管理平台' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy  http://192.168.9.143:8080
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.9.140:8080`,
+        target: `http://192.168.9.153:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''