面包屑更新

src/layout/components/Navbar.vue

@@ -6,17 +6,19 @@
       class="hamburger-container"
       @toggleClick="toggleSideBar"
     />
-
     <div class="right-menu" flex>
+
       <div flex>
-        <router-link :to="item.path" class="indexRouter" :style="{
+        <tags-view  />
-				color: activePage == index ? '#1478f6' : ''}" v-for="(item,index) in lagerScreenMenuData" :key="index">
+<!--        -->
-        <div @click="handlerClick(item,index)" flex>
+<!--        <router-link :to="item.path" class="indexRouter" :style="{-->
-            <i :class="item.meta.icon"></i>
+<!--				color: activePage == index ? '#1478f6' : ''}" v-for="(item,index) in lagerScreenMenuData" :key="index">-->
-            <p>{{item.meta.title}}</p>
+<!--        <div @click="handlerClick(item,index)" flex>-->
-        </div>
+<!--            <i :class="item.meta.icon"></i>-->
-        </router-link>
+<!--            <p>{{item.meta.title}}</p>-->
-        <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
+<!--        </div>-->
+<!--        </router-link>-->
+<!--        <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />-->
       </div>
       <el-dropdown class="avatar-container right-menu-item hover-effect" style="display:flex;">
         <!-- trigger="click" -->
@@ -64,6 +66,7 @@ import { getInfo, setInfo, getCompanyId, setCompanyId } from "@/utils/auth";
 import { downloadFromMinio } from "@/api/apis/auth";
 import { PersonDetail } from "@/api/apis/personnelSettings";
 import { authApi } from "@/api/apis/auth";
+import tagsView from '@/layout/components/TagsView/index.vue'
 export default {
   components: {
     Breadcrumb,
@@ -74,6 +77,7 @@ export default {
     Search,
     RuoYiGit,
     RuoYiDoc,
+    tagsView
   },
   computed: {
     ...mapGetters(["sidebar", "avatar", "device"]),

src/layout/components/TagsView/index.vue

@@ -268,22 +268,22 @@ export default {
 	// border-bottom: 1px solid #d8dce5;
 	// box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
 	position: fixed;
-	top: 55px;
+	top: 22px;
 	// margin-top: 60px;
 	z-index: 1000;
 
 	.tags-view-wrapper {
+    display: flex;
+
 		.tags-view-item {
 			display: inline-block;
 			position: relative;
 			cursor: pointer;
-			height: 26px;
-			line-height: 26px;
 			border: 1px solid #d8dce5;
 			color: #495060;
 			background: #fff;
-			padding: 0 8px;
+			padding: 5px 8px;
-			font-size: 12px;
+			font-size: 18px;
 			margin-left: 5px;
 			margin: 4px;
 

src/layout/index.vue

@@ -2,6 +2,7 @@
   <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
     <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
+<!--        <tags-view v-if="needTagsView" />-->
         <navbar />
         <sidebar ref="sidebar" class="sidebar-container" v-if="true" :style="{
             width: sidebar.opened
@@ -10,7 +11,7 @@
               ? childrenWidth
               : '128px',
           }" @openChildren="openChildren" @changeWidth="changeWidth" />
-        <!-- <tags-view v-if="needTagsView" /> -->
+
       </div>
       <app-main />
       <right-panel>

src/views/newIntegrationTask/foregroundTask/configData.js

@@ -106,10 +106,25 @@ const formRowShow = [
     }]
   },
 ]
+const operationTableColumn= [
+  {
+    label: '本次推送的执行时间',
+    prop: 'create_time',
+  },
+  {
+    label: '本次推送的入参',
+    prop: 'inParameter',
+  },
+  {
+    label: '推送人名称',
+    prop: 'create_user_id',
+  },
+]
 export default {
   tableColumnData,
   formRow,
   basicsRules,
   formRowShow,
-  tableVersionColumn
+  tableVersionColumn,
+  operationTableColumn
 }

src/views/newIntegrationTask/foregroundTask/rightDialog.vue

@@ -61,8 +61,9 @@
                 :disabled="!submitShow"
               ></el-input>
             </template>
-            <template v-else>
+<!--            日期选择器-->
-              <template v-if="!submitShow">{{row.startDate}}-{{row.endDate}}</template>
+            <template v-else-if="row.argType==2">
+              <template v-if="!submitShow">{{row.startDate}}/{{row.endDate}}</template>
               <template v-else>
                 <el-date-picker
                   v-model="row.startDate"
@@ -81,7 +82,46 @@
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
               </template>
-
+            </template>
+            <!--              年月-->
+            <template v-else-if="row.argType==3">
+              <template v-if="!submitShow">{{row.argValue}}</template>
+              <template v-else>
+                <el-date-picker
+                  v-model="row.argValue"
+                  type="month"
+                  placeholder="年月"
+                  :disabled="!submitShow"
+                  format="yyyy 年 MM 月"
+                  value-format="yyyy-MM">
+                </el-date-picker>
+              </template>
+            </template>
+            <!--              年月日-->
+            <template v-else-if="row.argType==4">
+              <template v-if="!submitShow">{{row.argValue}}</template>
+              <template v-else>
+                <el-date-picker
+                  v-model="row.argValue"
+                  type="date"
+                  placeholder="年月日"
+                  :disabled="!submitShow"
+                  format="yyyy 年 MM 月 DD 日"
+                  value-format="yyyy-MM-DD">
+                </el-date-picker>
+              </template>
+            </template>
+            <!--              年月日时间-->
+            <template v-else-if="row.argType==5">
+              <template v-if="!submitShow">{{row.argValue}}</template>
+              <template v-else>
+                <el-date-picker
+                  v-model="row.argValue"
+                  type="datetime"
+                  placeholder="年月日时间"
+                  :disabled="!submitShow">
+                </el-date-picker>
+              </template>
             </template>
           </div>
         </template>
@@ -106,6 +146,18 @@
           </div>
         </template>
       </base-table>
+      <template v-if="dialogTitle!=='新增'">
+        <div class="small_title">操作记录</div>
+        <base-table
+          :border="true"
+          :showIndex="true"
+          :tableColumn="tableColumn"
+          :tableData="tableData"
+          :funWidth="80"
+        >
+        </base-table>
+      </template>
+
     </base-right-dialog>
   </div>
 </template>
@@ -141,6 +193,8 @@ export default {
       isEdit: false,
       select_dist:{},
       plugNameOptions:[],
+      tableColumn:configData.operationTableColumn,//操作记录
+      tableData:[],
     };
   },
   mounted() {
@@ -265,6 +319,7 @@ export default {
               this.$set(item,'endDate',item.argValue.split("/")[1])
             }
           })
+          this.tableData=res.attribute.sysIntegratedForegroundTaskParameterEntities
           // let result = [];
           // this.tableVersionData = Object.assign([], result);
         });
@@ -384,6 +439,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.small_title{
+  margin: 10px 0;
+  font-size: 16px;
+}
 .dialogList {
   padding: 16px 0;
   border-top: 1px solid #dcdfe6;