From f38cce238016a976ba65707db40d030c1a546484 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 06 May 2025 17:10:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/router/page/index.js | 14 +++++--
src/config/website.js | 6 ++-
src/views/tickets/orderLog.vue | 40 +++++++++++++------
src/router/views/index.js | 18 +++++++++
src/views/algorithmRepository/algorithmRepository.vue | 6 +-
src/assets/images/ht-sfbg.png | 0
6 files changed, 62 insertions(+), 22 deletions(-)
diff --git a/src/assets/images/ht-sfbg.png b/src/assets/images/ht-sfbg.png
index 39fa6fa..c60dfd0 100644
--- a/src/assets/images/ht-sfbg.png
+++ b/src/assets/images/ht-sfbg.png
Binary files differ
diff --git a/src/config/website.js b/src/config/website.js
index a0934aa..9bba3e6 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -32,8 +32,10 @@
menu: true,
},
fistPage: {
- name: '首页',
- path: '/wel/index',
+ name: '事件工单',
+ // path: '/wel/index',
+ path: '/tickets/ticket',
+
},
//配置菜单的属性
menu: {
diff --git a/src/router/page/index.js b/src/router/page/index.js
index 3a148f7..2006514 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -64,9 +64,15 @@
isAuth: false,
},
},
+ // {
+ // path: '/',
+ // name: '主页',
+ // // redirect: '/wel',
+ // redirect:'/tickets/ticket',
+ // },
{
- path: '/',
- name: '主页',
- redirect: '/wel',
- },
+ path: '/',
+ name: '主页',
+ redirect: '/tickets/ticket',
+ },
];
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 7b7c589..a8977c6 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -27,6 +27,24 @@
},
],
},
+ // 事件工单
+ {
+ path: '/tickets',
+ component: () =>
+ Store.getters.isMacOs ? import('@/mac/index.vue') : import('@/page/index/index.vue'),
+ redirect: '/tickets/ticket',
+ children: [
+ {
+ path: 'ticket',
+ name: '事件工单',
+ meta: {
+ i18n: 'dashboard',
+ },
+ component: () => import(/* webpackChunkName: "views" */ '@/views/tickets/ticket.vue'),
+ },
+ ],
+ },
+
{
path: '/test',
component: Layout,
diff --git a/src/views/algorithmRepository/algorithmRepository.vue b/src/views/algorithmRepository/algorithmRepository.vue
index 928ee07..ccda450 100644
--- a/src/views/algorithmRepository/algorithmRepository.vue
+++ b/src/views/algorithmRepository/algorithmRepository.vue
@@ -6,10 +6,10 @@
<img class="imgicon" :src="`${baseUrl}/后台-算法仓库/${item.dictValue}.png`" alt="" />
<div>{{ item.dictValue }}</div>
<div
- :class="item.dictValue === '病虫害识别' ? 'stopStatus' : 'normalStatus'"
+ :class="item.dictValue === '病虫害' ? 'stopStatus' : 'normalStatus'"
@click="jumpDatail(item)"
>
- {{ item.dictValue === '病虫害识别' ? '停用状态' : '正常状态' }}
+ {{ item.dictValue === '病虫害' ? '停用状态' : '正常状态' }}
</div>
</div>
</div>
@@ -114,7 +114,7 @@
});
};
const jumpDatail = val => {
- if (val.dictValue === '病虫害识别') {
+ if (val.dictValue === '病虫害') {
showDetail.value = false;
} else {
showDetail.value = true;
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 415355d..5e34cef 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -158,23 +158,26 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" class="date-picker" />
</el-form-item>
</el-col>
- <el-col :span="3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- </el-col>
-
- <el-col :span="3">
- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" value-format="HH:mm"
- :picker-options="{
- selectableRange: '00:00 - 23:59',
- }" />
+ <el-col :span="4">
+ <div class="flex">
+ <div class="flex-1">
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+ </div>
+ <div class="flex-1">
+ <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" value-format="HH:mm"
+ :picker-options="{
+ selectableRange: '00:00 - 23:59',
+ }" />
+ </div>
+ </div>
</el-col>
</el-row>
@@ -1297,5 +1300,16 @@
display: flex;
justify-content: center;
}
+
+.flex {
+ display: flex;
+}
+
+.flex-1 {
+ flex: 1;
+
+ &> ::v-deep(div) {
+ width: 100% !important;
+ }
+}
</style>
-`
--
Gitblit v1.9.3