Merge remote-tracking branch 'origin/build' into build

packages/xbot/AppAiStatistics/AppAiStatistics.vue

@@ -156,7 +156,7 @@ export default {
         }
       }).then(res => {
         if (res?.data) {
-          this.info = res.data
+          this.info.trend = res.data.trend
           var trendX = []
           this.totalEcount = 0
           this.info.trend.map((item) => {
@@ -170,24 +170,37 @@ export default {
             })
           }
 
-          // var barX = []
+          // this.info.ranking.map((item, index)=> {
-          // this.info.typeList.map((item) => {
+          //   if(index < 100) {
-          //   barX.push(item.wordName)
+          //     item.rank = index+1
-          //   this.barData.push(item.c)
+          //     this.tableData.push(item)
-          // })
-          // if(this.barData.length) {
-          //   this.$nextTick(() => {
-          //     this.barChartInit(barX, this.barData)
-          //   })
           //   }
-
-          // this.info.wordNames.map((item) => {
-          //   var i = { name: item.wordName, value: item.wordCount };
-          //   this.wordData.push(i);
           // })
-          // if(this.wordData.length) {
+
+        }
+      })
+
+      this.instance.post('/app/appmasssendingtaskbaidu/statistics3', null, {
+        params: {
+          // deptFullId: departmentId,
+          areaId: this.areaId,
+          type: this.type,
+          startTime: this.startTime,
+          endTime: this.endTime,
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.info.ranking = res.data.ranking
+          // var trendX = []
+          // this.totalEcount = 0
+          // this.info.trend.map((item) => {
+          //   trendX.push(item.ymd)
+          //   this.totalEcount = this.totalEcount + item.ecount
+          //   this.trendData.push(item.ecount)
+          // })
+          // if(this.trendData.length) {
           //   this.$nextTick(() => {
-          //     this.wordChartInit(this.wordData)
+          //     this.trendChartInit(trendX, this.trendData)
           //   })
           // }
 

packages/xbot/AppSessionArchiveXbot/components/List.vue

@@ -229,6 +229,7 @@ export default {
     this.getTags()
     document.querySelector('html').addEventListener('click', this.bindEvent)
     document.addEventListener('keydown', (event) => {
+    console.log(event)
       if (event.ctrlKey && event.shiftKey && event.altKey && event.code === 'KeyD') {
         this.getType()
       }

packages/xbot/AppTaskAi/components/List.vue

@@ -96,7 +96,6 @@
 </template>
 
 <script>
-import { Divider } from 'element-ui';
 import { mapState } from "vuex";
 export default {
   name: "List",
@@ -163,12 +162,10 @@ export default {
   methods: {
     renderHead () {
       return(
-        
         <el-tooltip
           placement="right"
           content="正在执行/待执行">
           <span>任务数<i class="el-icon-warning-outline"></i></span>
-          
         </el-tooltip>
       )
     },

packages/xbot/AppTaskAi/components/TaskAdd.vue

@@ -59,8 +59,11 @@
                     </el-button>
                   </el-upload>
                 </el-form-item>
-                <el-form-item label="日调用次数" prop="dayLimit" style="width: 50%;" :rules="[{ required: true, message: '请输入日调用次数', trigger: 'blur' }]">
+                <el-form-item label="日调用次数" prop="dayLimit" style="width: 50%;" :rules="[{ required: true, message: '请输入日调用次数', trigger: 'blur'}]">
-                  <el-input-number size="small" v-model="form.dayLimit" :min="1" :max="1000000" label="请输入日调用次数" @change="handleChangeCount"></el-input-number>
+                  <div @click="isShowDay = true">
+                    <el-input size="small" placeholder="日调用次数" v-model="form.dayLimit" readonly @change="handleChangeCount"></el-input>
+                  </div>
+                  <!-- <el-input-number size="small" v-model="form.dayLimit" :min="1" :max="1000000" label="请输入日调用次数" @change="handleChangeCount"></el-input-number> -->
                 </el-form-item>
                 <el-form-item label="预计执行天数" prop="days" style="width: 50%;" :rules="[{ required: true, message: '请输入预计执行天数', trigger: 'blur' }]">
                   <el-input-number size="small" v-model="form.days" :min="1" :max="50" label="请输入预计执行天数" @change="handleChangeCount"></el-input-number>
@@ -215,10 +218,28 @@
             </div>
           </el-form>
           <div class="dialog-footer" slot="footer">
-            <el-button @click="onClose">取消</el-button>
+            <el-button @click="onClose" :loading="isLoading2">取消</el-button>
             <el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button>
           </div>
         </ai-dialog>
+
+        <ai-dialog
+          :visible.sync="isShowDay"
+          width="700px"
+          title="各时间段调用量设置"
+          customFooter>
+          <el-form ref="dateForm" label-width="130px" label-position="right">
+            <div class="ai-form">
+              <el-form-item :label="item.label" style="width: 50%;" v-for="(item, index) in dayList" :key="index">
+                <el-input-number size="small" v-model="item.value" :min="0" :max="200000" label="请输入正整数" ></el-input-number>
+              </el-form-item>
+            </div>
+          </el-form>
+          <div class="dialog-footer" slot="footer">
+            <el-button @click="onCloseDay">取消</el-button>
+            <el-button @click="onDayForm" type="primary" style="width: 92px;">确认</el-button>
+          </div>
+        </ai-dialog>
         <!-- <ChooseMaterial ref="ChooseMaterial" :instance="instance" @change="onChooseChange"></ChooseMaterial> -->
       </div>
     </template>
@@ -292,7 +313,9 @@ export default {
         filterCriteria: [],
         taskTitle: '',
         examinesName: '',
-        fileList: []
+        fileList: [],
+        timePlan: '',
+        dayLimit: ''
       },
       girdNames: '',
       id: '',
@@ -302,7 +325,106 @@ export default {
           return e.getTime() < (Date.now() - 60 * 1000 * 60 * 24)
         }
       },
-      fileContentList: []
+      fileContentList: [],
+      isShowDay: false,
+      dayList: [
+        {
+          label: '00点到01点',
+          value: 0
+        },
+        {
+          label: '01点到02点',
+          value: 0
+        },
+        {
+          label: '02点到03点',
+          value: 0
+        },
+        {
+          label: '03点到04点',
+          value: 0
+        },
+        {
+          label: '04点到05点',
+          value: 0
+        },
+        {
+          label: '05点到06点',
+          value: 0
+        },
+        {
+          label: '06点到07点',
+          value: 0
+        },
+        {
+          label: '07点到08点',
+          value: 0
+        },
+        {
+          label: '08点到09点',
+          value: 0
+        },
+        {
+          label: '09点到10点',
+          value: 0
+        },
+        {
+          label: '10点到11点',
+          value: 0
+        },
+        {
+          label: '11点到12点',
+          value: 0
+        },
+        {
+          label: '12点到13点',
+          value: 0
+        },
+        {
+          label: '13点到14点',
+          value: 0
+        },
+        {
+          label: '14点到15点',
+          value: 0
+        },
+        {
+          label: '15点到16点',
+          value: 0
+        },
+        {
+          label: '16点到17点',
+          value: 0
+        },
+        {
+          label: '18点到19点',
+          value: 0
+        },
+        {
+          label: '19点到20点',
+          value: 0
+        },
+        {
+          label: '10点到11点',
+          value: 0
+        },
+        {
+          label: '20点到21点',
+          value: 0
+        },
+        {
+          label: '21点到22点',
+          value: 0
+        },
+        {
+          label: '22点到23点',
+          value: 0
+        },
+        {
+          label: '23点到24点',
+          value: 0
+        }
+      ]
     }
   },
 
@@ -637,6 +759,7 @@ export default {
     },
 
     handleChangeCount() {
+      this.$refs.form.validateField('dayLimit')
       if(this.form.days > 0 && this.form.dayLimit > 0) {
         this.form.totalCount = this.form.days * this.form.dayLimit
       }
@@ -667,6 +790,24 @@ export default {
       this.fileContentList = []
     },
 
+    onCloseDay() {
+      this.dayList.map((item) => {
+        item.value = 0
+      })
+      this.isShowDay = false
+    },
+
+    onDayForm() {
+      this.form.dayLimit = 0
+      var timePlan = []
+      this.dayList.map((item) => {
+        this.form.dayLimit = this.form.dayLimit + item.value
+        timePlan.push(item.value)
+      })
+      this.form.timePlan = JSON.stringify(timePlan)
+      this.isShowDay = false
+    },
+
     cancel(isRefresh) {
       this.$emit('change', {
         type: 'TaskList',

packages/xbot/AppTaskAi/components/TaskDetail.vue

@@ -72,6 +72,8 @@
             </ai-info-item> -->
             <ai-info-item label="日调用次数" :value="info.dayLimit"></ai-info-item>
             <ai-info-item label="预计执行天数" :value="info.days"></ai-info-item>
+
+            <ai-info-item :label="dayList[index].label" :value="item" v-for="(item, index) in info.timePlan" :key="index" style="width:25%"></ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
@@ -322,7 +324,105 @@
         timer: null,
         min: 60,
         isDisabled: false,
-        rejecterId: ''
+        rejecterId: '',
+        dayList: [
+          {
+            label: '00点到01点',
+            value: 0
+          },
+          {
+            label: '01点到02点',
+            value: 0
+          },
+          {
+            label: '02点到03点',
+            value: 0
+          },
+          {
+            label: '03点到04点',
+            value: 0
+          },
+          {
+            label: '04点到05点',
+            value: 0
+          },
+          {
+            label: '05点到06点',
+            value: 0
+          },
+          {
+            label: '06点到07点',
+            value: 0
+          },
+          {
+            label: '07点到08点',
+            value: 0
+          },
+          {
+            label: '08点到09点',
+            value: 0
+          },
+          {
+            label: '09点到10点',
+            value: 0
+          },
+          {
+            label: '10点到11点',
+            value: 0
+          },
+          {
+            label: '11点到12点',
+            value: 0
+          },
+          {
+            label: '12点到13点',
+            value: 0
+          },
+          {
+            label: '13点到14点',
+            value: 0
+          },
+          {
+            label: '14点到15点',
+            value: 0
+          },
+          {
+            label: '15点到16点',
+            value: 0
+          },
+          {
+            label: '16点到17点',
+            value: 0
+          },
+          {
+            label: '18点到19点',
+            value: 0
+          },
+          {
+            label: '19点到20点',
+            value: 0
+          },
+          {
+            label: '10点到11点',
+            value: 0
+          },
+          {
+            label: '20点到21点',
+            value: 0
+          },
+          {
+            label: '21点到22点',
+            value: 0
+          },
+          {
+            label: '22点到23点',
+            value: 0
+          },
+          {
+            label: '23点到24点',
+            value: 0
+          }
+        ]
       }
     },
 
@@ -420,7 +520,9 @@
       getInfo (id) {
         this.instance.post(`/app/appmasssendingtaskbaidu/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
+            res.data.timePlan = JSON.parse(res.data.timePlan)
             this.info = res.data
+            
             if (res.data.status === '4' && res.data.remindTime) {
               this.countdown()
             }
@@ -454,6 +556,8 @@
                 this.rejecterId = user[0].examineUserId
               }
             }
+
+            
           }
         })
       },