1. 任务等级

src/api/logs.js

@@ -68,4 +68,10 @@ export const getList = (query) => {
     method: 'get',
     params:query
   })
+}
+export const getConditionData = () => {
+  return request({
+    url: '/api/blade-log/api/conditionData',
+    method: 'get',
+  })
 }

src/api/plugin/workflow/form.js

@@ -100,6 +100,13 @@ export const getTaskTypeData = (query) => {
     params:query
   })
 }
+// 任务等级
+export const getTaskLevel= () => {
+  return request({
+    url: '/api/blade-system/dict-biz/dictionary?code=task_level',
+    method: 'get',
+  })
+}
 // 系统名称/数据库
 export const getTaskAndDataBase = (query) => {
   return request({

src/api/wel/wel.js

@@ -14,3 +14,17 @@ export const getFlowListMonth = () => {
     method: 'get',
   })
 }
+// 任务耗时
+export const getFlowTakeTime = () => {
+  return request({
+    url: `${prefix}/flowTakeTime`,
+    method: 'get',
+  })
+}
+// 类型统计
+export const getFlowListType = () => {
+  return request({
+    url: `${prefix}/flowListType`,
+    method: 'get',
+  })
+}

src/const/journal/journal.js

@@ -32,7 +32,7 @@ export const tableOption = {
     {
       type: "input",
       label: "操作模块",
-      prop: "aa",
+      prop: "model",
       align: "left",
       overHidden: true,
     },

src/views/journal/index.vue

@@ -4,41 +4,41 @@
       <div class="search">
         <div style="display: flex; align-items: center">
           <el-select
-            v-model="searchForm.taskParentId"
-            placeholder="任务父类"
+            v-model="searchForm.createBy"
+            placeholder="用户"
             class="search-select"
           >
             <el-option
-              v-for="item in parentList"
-              :key="item.id"
-              :label="item.dictValue"
-              :value="item.id"
+              v-for="item in userList"
+              :key="item.createBy"
+              :label="item.createBy"
+              :value="item.createBy"
             >
             </el-option>
           </el-select>
           <el-select
-            v-model="searchForm.taskTypeName"
-            placeholder="任务种类"
+            v-model="searchForm.title"
+            placeholder="操作模块"
             class="search-select"
           >
             <el-option
-              v-for="item in taskTypeList"
-              :key="item.taskTypeName"
-              :label="item.taskTypeName"
-              :value="item.taskTypeName"
+              v-for="item in moduleList"
+              :key="item"
+              :label="item"
+              :value="item"
             >
             </el-option>
           </el-select>
           <el-select
-            v-model="searchForm.taskLevel"
-            placeholder="任务等级"
+            v-model="searchForm.remoteIp"
+            placeholder="IP地址"
             class="search-select"
           >
             <el-option
-              v-for="item in levelList"
-              :key="item.id"
-              :label="item.dictValue"
-              :value="item.id"
+              v-for="item in ipList"
+              :key="item.remoteIp"
+              :label="item.remoteIp"
+              :value="item.remoteIp"
             >
             </el-option>
           </el-select>
@@ -75,12 +75,18 @@
         @current-change="currentChange"
         @size-change="sizeChange"
       >
+        <template slot="model" slot-scope="scope">
+          {{ scope.row.title.split("-")[0] }}
+        </template>
+        <template slot="title" slot-scope="scope">
+          {{ scope.row.title.split("-")[1] }}
+        </template>
       </avue-crud>
     </div>
   </div>
 </template>
 <script>
-import { getList } from "@/api/logs";
+import { getList, getConditionData } from "@/api/logs";
 import { tableOption } from "@/const/journal/journal.js";
 export default {
   data() {
@@ -99,29 +105,25 @@ export default {
       loading: false,
       parentList: [],
       levelList: [],
+      userList: [],
+      moduleList: [],
+      ipList: [],
     };
   },
   created() {
-    // this.getDict();
+    this.getDict();
     this.onLoad();
   },
   methods: {
     // 字典请求
-    // getDict() {
-    //   getTaskParent().then((res) => {
-    //     this.parentList = res.data.data;
-    //     const column = this.findObject(this.option.column, "taskParentId");
-    //     column.dicData = res.data.data;
-    //   });
-    //   getTaskLevel().then((res) => {
-    //     this.levelList = res.data.data;
-    //     const column = this.findObject(this.option.column, "taskLevel");
-    //     column.dicData = res.data.data;
-    //   });
-    //   getTaskTypeData().then((res) => {
-    //     this.taskTypeList = res.data.data;
-    //   });
-    // },
+    getDict() {
+      getConditionData().then((res) => {
+        const { user, module, ip } = res.data.data;
+        this.userList = user;
+        this.moduleList = module;
+        this.ipList = ip;
+      });
+    },
     // 列表
     onLoad() {
       this.loading = true;
@@ -133,17 +135,11 @@ export default {
         this.searchForm.startTime = this.searchForm.timeArr[0];
         this.searchForm.endTime = this.searchForm.timeArr[1];
       }
-      const {
-        taskParentId,
-        taskTypeName,
-        taskLevel,
-        startTime,
-        endTime,
-      } = this.searchForm;
+      const { createBy, title, remoteIp, startTime, endTime } = this.searchForm;
       let params = {
-        taskParentId,
-        taskTypeName,
-        taskLevel,
+        createBy,
+        title,
+        remoteIp,
         startTime,
         endTime,
       };

src/views/plugin/workflow/process/components/examForm.vue

@@ -1,10 +1,12 @@
 <template>
   <avue-form v-model="examineForm"
              ref="examineForm"
-             :option="examineOption" :upload-after="uploadAfter"></avue-form>
+             :option="examineOption" :upload-after="uploadAfter"
+             ></avue-form>
 </template>
 
 <script>
+import {mapGetters} from "vuex";
 export default {
   name: 'wf-exam-form',
   props: {
@@ -13,6 +15,9 @@ export default {
       default: () => {
         return {}
       }
+    },
+    renwudengji: {
+       type: String,
     }
   },
   watch: {
@@ -29,6 +34,26 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    renwudengji: {
+      handler(val) {
+        // 1625035000825049090 日常
+        // 1624973130579636225 一般
+        if(this.userInfo.role_name === "运维公司" && val === "1625035000825049090") {
+          this.findObject(this.examineOption.column, '$assignee').display = false
+        }else {
+          this.findObject(this.examineOption.column, '$assignee').display = true
+
+        }
+        if(this.userInfo.role_name === "技术员" && val === "1624973130579636225") {
+          this.findObject(this.examineOption.column, '$assignee').display = false
+        }else {
+          this.findObject(this.examineOption.column, '$assignee').display = true
+
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   data() {
@@ -99,6 +124,9 @@ export default {
       },
     }
   },
+    computed: {
+      ...mapGetters(["userInfo"]),
+    },
   methods: {
     getComment() {
       return this.examineForm.comment

src/views/plugin/workflow/process/components/form.vue

@@ -52,6 +52,21 @@
               </el-option>
             </el-select>
           </template>
+          <!-- <template slot="renwudengji">
+            <el-select
+              v-model="form.renwudengji"
+              placeholder="请选择任务等级"
+              @change="gradeChange"
+            >
+              <el-option
+                v-for="item in taskLevelList"
+                :key="item.id"
+                :label="item.dictValue"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </template> -->
           <template slot="xitongmingchengshujuku">
             <el-select
               filterable
@@ -103,10 +118,15 @@
         </avue-form>
       </el-card>
 
-      <el-card shadow="never" style="margin-top: 20px" v-if="showExamForm">
+      <el-card
+        shadow="never"
+        :style="{ marginTop: '20px' }"
+        v-if="showExamForm && level"
+      >
         <wf-examine-form
           ref="examineForm"
           :process="process"
+          :renwudengji="form.renwudengji"
           @user-select="handleUserSelect"
         ></wf-examine-form>
       </el-card>
@@ -152,6 +172,7 @@ import {
   getCompany,
   getDepts,
   getTaskParent,
+  // getTaskLevel,
   getTaskTypeData,
   getTaskAndDataBase,
   getModuleAndDataTable,
@@ -160,7 +181,7 @@ import WfExamineForm from "./examForm.vue";
 import WfUserSelect from "./user-select";
 import exForm from "../../mixins/ex-form";
 import draft from "../../mixins/draft";
-
+import { mapGetters } from "vuex";
 export default {
   components: {
     WfUserSelect,
@@ -181,10 +202,23 @@ export default {
     },
   },
   computed: {
+    ...mapGetters(["userInfo"]),
     showExamForm() {
       const { hideComment, hideCopy, hideExamine } = this.process;
       return !hideComment || !hideCopy || !hideExamine;
     },
+    level() {
+      if (
+        (this.userInfo.role_name === "运维公司" &&
+          this.form.renwudengji === "1625035000825049090") ||
+        (this.userInfo.role_name === "技术员" &&
+          this.form.renwudengji === "1624973130579636225")
+      ) {
+        return false;
+      } else {
+        return true;
+      }
+    },
   },
   data() {
     return {
@@ -197,6 +231,7 @@ export default {
       deptList: [], //部门
       taskParentList: [], //任务父类
       taskAndDataBaseList: [], //数据库
+      // taskLevelList: [] // 任务等级
     };
   },
   mounted() {
@@ -209,6 +244,9 @@ export default {
         this.companyChange(id);
       }
     });
+    // getTaskLevel().then(res=> {
+    //   this.taskLevelList = res.data.data
+    // })
     getTaskParent().then((res) => {
       this.taskParentList = res.data.data;
       if (this.$route.query.parent) {
@@ -347,6 +385,10 @@ export default {
         this.waiting = false;
       });
     },
+    // 任务等级
+    gradeChange() {
+      console.log(this.examineForm);
+    },
   },
 };
 </script>

src/views/wel/index.vue

@@ -47,7 +47,12 @@
 </template>
 
 <script>
-import { getAboutMy, getFlowListMonth } from "@/api/wel/wel.js";
+import {
+  getAboutMy,
+  getFlowListMonth,
+  getFlowTakeTime,
+  getFlowListType,
+} from "@/api/wel/wel.js";
 export default {
   name: "wel",
   data() {
@@ -198,11 +203,18 @@ export default {
         }, 100);
       });
     },
-    pieOneChart() {
+    pieOneChart(data) {
       var myChart = this.$echarts.init(document.getElementById("pieItemOne"));
       //配置图表
       var option = {
-        color: ["#2EE27C", "#4CA3FB", "#FF9130"],
+        color: [
+          "#2689FF",
+          "#6F33FF",
+          "#2356F7",
+          "#00C374",
+          "#00CFDC",
+          "#FD4D66",
+        ],
         title: {
           text: "业务类型统计",
           textStyle: {
@@ -231,11 +243,7 @@ export default {
             name: "业务类型统计",
             type: "pie",
             radius: "55%",
-            data: [
-              { value: 140, name: "月完成" },
-              { value: 206, name: "新建表" },
-              { value: 75, name: "数据导出" },
-            ],
+            data,
             emphasis: {
               itemStyle: {
                 shadowBlur: 10,
@@ -339,7 +347,7 @@ export default {
         }, 100);
       });
     },
-    barChart() {
+    barChart(XData, YData) {
       var myChart = this.$echarts.init(document.getElementById("barChart"));
       var option = {
         title: {
@@ -365,6 +373,9 @@ export default {
             show: true,
             color: "#000",
             fontSize: 14,
+            // formatter: function (item) {
+            //   return item + "天";
+            // },
           },
           axisLine: {
             show: true,
@@ -379,7 +390,7 @@ export default {
               color: "#CFCFCF",
             },
           },
-          data: ["1天", "2天", "3天", "4天", "5天", "6天"],
+          data: XData,
         },
         yAxis: {
           type: "value",
@@ -410,12 +421,18 @@ export default {
         },
         series: [
           {
-            data: [120, 200, 150, 80, 70, 110, 130],
+            data: YData,
             type: "bar",
             barWidth: "32px",
             itemStyle: {
               color: "#4CA3FB",
             },
+            label: {
+              show:true,
+              position: 'top',
+              color: "#000",
+              fontSize: 14
+            }
           },
         ],
       };
@@ -440,6 +457,18 @@ export default {
         const { xData, monthAddNum, monthFinishNum } = res.data.data;
         this.lineChart(xData, monthAddNum, monthFinishNum);
       });
+      // 类型统计
+      getFlowListType().then((res) => {
+        this.pieOneChart(res.data.data);
+      });
+      // 任务耗时
+      getFlowTakeTime().then((res) => {
+        const { XData, YData } = res.data.data;
+        const data = XData.map(item => {
+          return item + "天"
+        })
+        this.barChart(data, YData);
+      });
     },
   },
   mounted() {