From d81f8a8bcd2b1ec819c5a06227d27d6e97d55c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Wed, 8 Mar 2023 18:01:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F=202?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/journal/index.vue                   | 142 +++++++++---------
 .../workflow/process/components/form.vue      |  40 +++--
 src/views/wel/index.vue                       |   2 +-
 3 files changed, 86 insertions(+), 98 deletions(-)

diff --git a/src/views/journal/index.vue b/src/views/journal/index.vue
index c14b877..de137d0 100644
--- a/src/views/journal/index.vue
+++ b/src/views/journal/index.vue
@@ -2,67 +2,70 @@
   <div class="cus-container">
     <el-form :model="searchForm">
       <div class="search">
-        <div>
-          <el-select
-            v-model="searchForm.createBy"
-            placeholder="用户"
-            class="search-select"
+        <el-select
+          v-model="searchForm.createBy"
+          placeholder="用户"
+          class="search-select"
+        >
+          <el-option
+            v-for="item in userList"
+            :key="item.createBy"
+            :label="item.createBy"
+            :value="item.createBy"
           >
-            <el-option
-              v-for="item in userList"
-              :key="item.createBy"
-              :label="item.createBy"
-              :value="item.createBy"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model="searchForm.title"
-            placeholder="操作模块"
-            class="search-select"
+          </el-option>
+        </el-select>
+        <el-select
+          v-model="searchForm.title"
+          placeholder="操作模块"
+          class="search-select"
+        >
+          <el-option
+            v-for="item in moduleList"
+            :key="item"
+            :label="item"
+            :value="item"
           >
-            <el-option
-              v-for="item in moduleList"
-              :key="item"
-              :label="item"
-              :value="item"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model="searchForm.remoteIp"
-            placeholder="IP地址"
-            class="search-select"
+          </el-option>
+        </el-select>
+        <el-select
+          v-model="searchForm.remoteIp"
+          placeholder="IP地址"
+          class="search-select"
+        >
+          <el-option
+            v-for="item in ipList"
+            :key="item.remoteIp"
+            :label="item.remoteIp"
+            :value="item.remoteIp"
           >
-            <el-option
-              v-for="item in ipList"
-              :key="item.remoteIp"
-              :label="item.remoteIp"
-              :value="item.remoteIp"
-            >
-            </el-option>
-          </el-select>
-          <el-date-picker
-            style="width: 314px; margin-right: 20px"
-            v-model="searchForm.timeArr"
-            format="yyyy-MM-dd HH:mm"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            class="search-picker"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+          </el-option>
+        </el-select>
+        <el-date-picker
+          style="width: 314px; margin-bottom:15px;"
+          v-model="searchForm.timeArr"
+          format="yyyy-MM-dd HH:mm"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          class="search-picker"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+        <div style="margin-left: auto">
           <el-button class="search-btn" @click="searchHandle(1)"
             >查询</el-button
           >
-          <div class="search-reset" @click="searchHandle(2)">
-            <i class="el-icon-refresh-right" style="font-size: 20px"></i>
-          </div>
+          <el-button
+            class="search-btn"
+            @click="searchHandle(2)"
+            style="background: #ff9130"
+            >重置</el-button
+          >
         </div>
       </div>
     </el-form>
-    <div style="margin-top: 30px">
+    <div style="margin-top: 15px">
       <avue-crud
         id="avue-id"
         ref="crud"
@@ -141,12 +144,14 @@ export default {
         startTime,
         endTime,
       };
-      getList({ current:currentPage, size:pageSize, ...params }).then((res) => {
-        const { total, records } = res.data.data;
-        this.page.total = total;
-        this.tableData = records;
-        this.loading = false;
-      });
+      getList({ current: currentPage, size: pageSize, ...params }).then(
+        (res) => {
+          const { total, records } = res.data.data;
+          this.page.total = total;
+          this.tableData = records;
+          this.loading = false;
+        }
+      );
     },
     // 分页
     currentChange(currentPage) {
@@ -173,32 +178,19 @@ export default {
 <style lang="scss" scoped>
 .search {
   display: flex;
-  justify-content: space-between;
+  flex-wrap: wrap;
 }
 .search-select {
   width: 150px;
   margin-right: 20px;
-}
-.search-input {
-  width: 288px;
+  margin-bottom: 15px;
 }
 .search-btn {
-  width: 130px;
+  width: 100px;
   height: 46px !important;
   background: #2e92f6;
   color: #fff;
-  margin-left: 40px;
-  margin-right: 20px;
-}
-.search-reset {
-  display: inline-block;
-  width: 46px;
-  height: 44px !important;
-  background: #ff9130;
-  color: #fff;
-  text-align: center;
-  line-height: 46px;
-  cursor: pointer;
+  margin-left: 20px;
 }
 /deep/ .el-input__inner {
   height: 46px;
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index 04fb92a..84839fe 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -243,26 +243,7 @@ export default {
       visible: false,
     };
   },
-  created() {
-    // 运维公司
-    getCompany().then((res) => {
-      const data = res.data.data;
-      this.companyList = data;
-      if (data.length > 0) {
-        const id = data[0].id;
-        this.form.yunweigongsi = id;
-        this.companyChange(id);
-      }
-    });
-    getTaskParent().then((res) => {
-      this.taskParentList = res.data.data;
-      if (this.$route.query.parent) {
-        const id = this.$route.query.parent;
-        this.form.renwufulei = id;
-        this.taskParentChange(id);
-      }
-    });
-  },
+  created() {},
   methods: {
     // 运维公司-查部门
     companyChange(id) {
@@ -336,7 +317,7 @@ export default {
         this.form.uploadrecord.splice(index, 1);
       });
     },
-    getForm(processId, processDefKey) {
+     getForm(processId, processDefKey) {
       let param;
       let method;
       if (processId) {
@@ -346,7 +327,7 @@ export default {
         param = processDefKey;
         method = "getStartFormByProcessDefKey";
       }
-      this[method](param).then((res) => {
+      this[method](param).then(async(res) => {
         let { process, form, startForm } = res;
         this.form.processId = process.id;
         if (form) {
@@ -366,6 +347,21 @@ export default {
           option.column = columnArr;
           option.group = groupArr;
           this.option = option;
+          // 运维公司
+          const companyData = await getCompany()
+          this.companyList = companyData.data.data;
+          if (companyData.data.data.length > 0) {
+            const id = companyData.data.data[0].id;
+            this.form.yunweigongsi = id;
+            this.companyChange(id);
+          }
+          const taskParentData =  await getTaskParent()
+          this.taskParentList = taskParentData.data.data;
+          if (this.$route.query.parent) {
+            const id = this.$route.query.parent;
+            this.form.renwufulei = id;
+            this.taskParentChange(id);
+          }
           const time = this.findObject(
             this.option.column,
             "qiwangwanchengshijian"
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 87ede18..4898dfe 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -590,7 +590,7 @@ export default {
     margin: 0 30px;
   }
   &__item3 {
-    width: calc(100% - 900px);
+    flex: 1;
     background: #fff;
     padding: 22px 30px;
     box-sizing: border-box;