用户组信息修改

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -143,8 +143,8 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="模式值" prop="modeValue" v-if="groupRateForm.readMode != '1'">
-                <el-input v-model="groupRateForm.modeValue" placeholder="请输入模式值"
+              <el-form-item :label="modeValueTips" prop="modeValue" v-if="groupRateForm.readMode != '1'">
+                <el-input v-model="groupRateForm.modeValue" :placeholder="'请输入' + modeValueTips"
                           oninput="value=value.replace(/[^0-9.]/g,'')">
                   <template slot="append" v-if="groupRateForm.readMode == '0'">秒</template>
                 </el-input>
@@ -268,7 +268,7 @@
         </div>
         <!-- 已选择数据项 -->
         <div class="cy-transform-data">
-          <el-divider content-position="left">已选择数据项</el-divider>
+          <el-divider content-position="left">已选择数据项（{{ chooseItemDataListByTree.length }}）</el-divider>
           <div class="cy-line">
             <div style="height: 100%; overflow: auto;">
               <el-tree :data="chooseItemDataListByTree"
@@ -416,6 +416,7 @@ export default {
         isLeaf: 'leaf'
       },
       delFlag: true,
+      modeValueTips: '模式值',
       // 读取模式
       readModeList: [{
         'key': '按周期读取数据',
@@ -912,8 +913,16 @@ export default {
     /** 读取模式值改变事件 */
     readModeChange(val) {
       this.groupRateForm.readMode = val
-      if (val == 1) {
-        this.groupRateForm.valueMode = '0'
+      switch (val) {
+        case '0':
+          this.modeValueTips = '周期值'
+          break
+        case '1':
+          this.groupRateForm.valueMode = '0'
+          break
+        default:
+          this.modeValueTips = '阈值'
+          break
       }
     },
     /** 获取右侧数据源类型列表 */

chuanyi_client2/src/utils/request.js

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import router from "@/router";
 import {Notification, MessageBox, Message, Loading} from 'element-ui'
 import {removeAll, getToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
@@ -95,9 +96,12 @@ service.interceptors.response.use(res => {
                     isRelogin.show = false
                     logout().then(res => {
                         removeAll()
-                        location.href = '/index'
+                        // location.href = '/index'
+                        router.push({path: '/', query: {}})
+                        window.location.reload()
                     });
                 })
+                return
             }
             return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
         } else if (code === 403) {
@@ -108,8 +112,11 @@ service.interceptors.response.use(res => {
                 }).then(r => {
                     isRelogin.show = false
                     removeAll()
-                    location.href = '/index'
+                    router.push({path: '/', query: {}})
+                    window.location.reload()
+                    // location.href = '/index'
                 })
+                return
             }
             return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
         } else if (code === 500) {

chuanyi_client2/src/views/index.vue

@@ -37,7 +37,7 @@ export default {
   data() {
     return {
       defaultPercent: 20,
-      minPercent: 20,
+      minPercent: 5,
       mainViewType: 0,
       refreshReportTemplateDataFlag: false
     }

chuanyi_client2/src/views/report_template/index.vue

@@ -174,7 +174,7 @@
         :append-to-body="true">
       <div>
         <div style="margin-bottom: 10px;">
-          <span>组名称：{{ itemDataListByGroupName }}</span>
+          <span>组名称：{{ itemDataListByGroupName }}（共 {{ itemDataListByTree.length }} 项）</span>
           <el-checkbox v-model="isSelectAllItem" @change="selectAllItem" style="float: right;">全选</el-checkbox>
         </div>
         <el-input placeholder="请输入关键字进行过滤" v-model="filterItemData"></el-input>

chuanyi_client2/src/views/user_group/index.vue

@@ -280,6 +280,9 @@ export default {
     /** 获取用户组 */
     getAllUserGroup() {
       getAllUserGroup().then(res => {
+        if (!res.data) {
+          return
+        }
         this.$nextTick(() => {
           this.groupDataList = res.data
         })