Browse Source

修改测试计划中修改测试时间

plg 5 months ago
parent
commit
b23fe0cfe5

+ 56 - 56
src/components/Report.vue

@@ -273,62 +273,7 @@ export default {
   mounted() {
     this.echarts_ld = this.$refs.echarts_ld;
     this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
-    //查询用户下边的计划
-    this.searchTarget();
-    //获取渠道信息
-    // this.option.radar.indicator=[] //name
-    this.option = {
-      title: {
-        // text: 'Basic Radar Chart'
-      },
-      legend: {
-        // data: ['Allocated Budget', 'Actual Spending']
-      },
-      radar: {
-        shape: "square", //设置雷达图形状,值有circle、square,默认为方形
-        splitNumber: 3, // 雷达图圈数设置
-        // shape: 'circle',
-        indicator: this.echarts_name_list,
-        name: {
-          //修改indicator文字的颜色
-          textStyle: {
-            // color: "#999999",
-          },
-        },
-      },
-      series: [
-        {
-          type: "radar",
-          symbolSize: 6,
-          data: [
-            {
-              value: this.echarts_data_list,
-              lineStyle: {
-                normal: {
-                  color: "#FF1E00",
-                },
-              },
-              //折线拐点颜色
-              itemStyle: {
-                normal: {
-                  color: "#FF1E00",
-                  borderWidth: 3, //拐点边框大小
-                },
-                // emphasis: {
-                //     color: '#000000'//hover拐点颜色定义
-                // }
-              },
-              // name: 'Actual Spending'
-              areaStyle: {
-                //阴影区域背景
-                // color: 'rgba(255, 228, 52, 0.6)'
-                color: "#F8B4AB",
-              },
-            },
-          ],
-        },
-      ],
-    };
+  
   },
   methods: {
     forMatCom(val) {
@@ -530,6 +475,61 @@ export default {
     open(val) {
       this.proDataLin = val;
       this.dialogVisible = true;
+        //查询用户下边的计划
+    //获取渠道信息
+    // this.option.radar.indicator=[] //name
+    this.option = {
+      title: {
+        // text: 'Basic Radar Chart'
+      },
+      legend: {
+        // data: ['Allocated Budget', 'Actual Spending']
+      },
+      radar: {
+        shape: "square", //设置雷达图形状,值有circle、square,默认为方形
+        splitNumber: 3, // 雷达图圈数设置
+        // shape: 'circle',
+        indicator: this.echarts_name_list,
+        name: {
+          //修改indicator文字的颜色
+          textStyle: {
+            // color: "#999999",
+          },
+        },
+      },
+      series: [
+        {
+          type: "radar",
+          symbolSize: 6,
+          data: [
+            {
+              value: this.echarts_data_list,
+              lineStyle: {
+                normal: {
+                  color: "#FF1E00",
+                },
+              },
+              //折线拐点颜色
+              itemStyle: {
+                normal: {
+                  color: "#FF1E00",
+                  borderWidth: 3, //拐点边框大小
+                },
+                // emphasis: {
+                //     color: '#000000'//hover拐点颜色定义
+                // }
+              },
+              // name: 'Actual Spending'
+              areaStyle: {
+                //阴影区域背景
+                // color: 'rgba(255, 228, 52, 0.6)'
+                color: "#F8B4AB",
+              },
+            },
+          ],
+        },
+      ],
+    };
       this.searchTarget();
     },
     edit(val) {

+ 11 - 8
src/views/manage/channelInfo/channelUserManage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="record-warp">
     <div class="record-main">
-      <el-row>
+      <el-row >
         <el-col :span="24">
           <div class="search-head">
             <el-input v-model="name" clearable placeholder="请输入姓名"></el-input
@@ -61,14 +61,9 @@
           </div>
         </el-col>
       </el-row>
-      <el-row class="add_user_class">
-        <el-col :span="24">
-          <div class="search-head"></div>
-        </el-col>
-      </el-row>
-
       <div class="table-content">
         <el-table
+          height="100%"
           :data="tableData"
           :row-style="{ height: '0px' }"
           :cell-style="{ padding: '5px' }"
@@ -437,14 +432,17 @@ export default {
     },
     //根据现有情况进行搜索
     searchList() {
+      console.log(this.userInfo)
       let url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
         this.pageNum
-      }${this.sex == "" ? "" : `&gender=${this.sex}`}${
+      }&roleType=1${this.sex == "" ? "" : `&gender=${this.sex}`}${
         this.group.length == 0 ? `&orgNo=${this.userInfo.orgNo}` : `&orgNo=${this.group[this.group.length - 1]}`
       }${this.name == "" ? "" : `&userName=${this.name}`}${
         this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
       }`;
+      debugger;
       this.$http.get(url, {}, (res) => {
+        debugger;
         console.log(res);
         if (res && res.code == 200) {
           this.tableData = res.data.content;
@@ -507,6 +505,8 @@ export default {
     height: 100%;
     box-sizing: border-box;
     overflow-y: auto;
+    display: flex;
+    flex-direction: column;
 
     .search-head {
       width: 100%;
@@ -522,7 +522,10 @@ export default {
     }
 
     .table-content {
+      display: flex;
+      flex: 1;
       margin: 10px 0;
+      overflow: auto;
     }
   }
 }

+ 3 - 2
src/views/manage/channelInfo/invite.vue

@@ -68,9 +68,10 @@
             width=""
           >
           </el-table-column>
-          <el-table-column prop="createDate" label="创建时间" align="center" width="">
+          <el-table-column prop="createTime" label="创建时间"  :show-overflow-tooltip="true" align="center" width="">
           </el-table-column>
           <el-table-column
+          :show-overflow-tooltip="true"
             prop="planEndTime"
             label="结束时间"
             align="center"
@@ -508,7 +509,7 @@ export default {
     },
     viewPlan(row) {
       this.view.planName = row.planName;
-      this.view.creatTime = row.createDate;
+      this.view.creatTime = row.createTime;
       this.view.endTime = row.planEndTime;
       this.view.creatUser = row.createUserName;
       let st = "";