From 233e4fc4f35bd00a36ee34a7fbf5e47b41db26db Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 17 Nov 2025 09:54:44 +0800
Subject: [PATCH] feat：更新初始化地形
---
src/views/tickets/orderLog.vue | 708 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 438 insertions(+), 270 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 0e4c724..73793d1 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -1,90 +1,103 @@
-
<template>
<basic-container>
<el-tabs v-model="activeTab" @tab-click="handleTabChange">
<el-tab-pane v-for="tab in filteredTabs" :key="tab.name" :label="`${tab.label} (${tab.count})`" :name="tab.name">
<basic-main-content>
<!-- 查询条件筛选栏 -->
- <div class="filter-bar">
- <div class="search-bar-box">
- <div class="search-bar-box-item">
- <el-input v-model="filters.key_word" placeholder="输入工单编号/名称/内容/姓名" clearable
- @keyup.enter="handleSearch" />
- </div>
+ <div class="ztzf-form-search">
+ <el-form :model="filters" inline>
+ <el-row :gutter="24">
+ <el-col :span="4">
+ <el-form-item label="关键字:">
+ <el-input v-model="filters.key_word" placeholder="编号/名称/内容/姓名" clearable
+ @keyup.enter="handleSearch" />
+ </el-form-item>
-<!-- <div class="search-bar-box-item">-->
-<!-- <el-select placeholder="请选择所属单位" v-model="filters.create_dept" clearable>-->
-<!-- <el-option v-for="dept in departments" :key="dept.value" :label="dept.label" :value="dept.value" />-->
-<!-- </el-select>-->
-<!-- </div>-->
+ <!-- <div class="search-bar-box-item">-->
+ <!-- <el-select placeholder="请选择所属单位" v-model="filters.create_dept" clearable>-->
+ <!-- <el-option v-for="dept in departments" :key="dept.value" :label="dept.label" :value="dept.value" />-->
+ <!-- </el-select>-->
+ <!-- </div>-->
- <div class="search-bar-box-item">
- <el-date-picker @change="handleSearch" v-model="filters.dateRange" type="daterange" range-separator="至"
- start-placeholder="开始日期" end-placeholder="结束日期" :default-value="datePickerDefaultVal" />
- </div>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="选择日期:">
+ <el-date-picker @change="handleSearch" v-model="filters.dateRange" type="daterange"
+ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+ :default-value="datePickerDefaultVal" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="关联航线:">
+ <el-select @change="handleSearch" v-model="filters.file_id" placeholder="请选择关联航线" filterable
+ clearable>
+ <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
+ :value="item.wayline_id" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="关联算法:">
+ <el-select @change="handleSearch" v-model="filters.ai_types" placeholder="关联算法" clearable>
+ <el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
- <div class="search-bar-box-item">
- <el-select @change="handleSearch" v-model="filters.file_id" placeholder="请选择关联航线" filterable clearable>
- <el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
- </el-select>
- </div>
+ <!-- <div class="search-bar-box-item">
+ <el-select v-model="filters.type" placeholder="请选择工单类型" clearable>
+ <el-option v-for="item in types" :key="item.dictValue" :label="item.dictValue"
+ :value="item.dictKey" />
+ </el-select>
+ </div> -->
- <div class="search-bar-box-item">
- <el-select @change="handleSearch" v-model="filters.ai_types" placeholder="关联算法" clearable>
- <el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey" />
- </el-select>
- </div>
-
- <!-- <div class="search-bar-box-item">
- <el-select v-model="filters.type" placeholder="请选择工单类型" clearable>
- <el-option v-for="item in types" :key="item.dictValue" :label="item.dictValue"
- :value="item.dictKey" />
- </el-select>
- </div> -->
-
- <div class="search-bar-box-item">
- <el-select @change="handleSearch" v-model="filters.status" placeholder="请选择工单状态" clearable :disabled="activeTab !== 'all'">
- <el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </div>
- </div>
-
- <div class="search-bar-box">
- <div class="search-bar-box-item flex-2">
- <el-date-picker @change="handleSearch" v-model="filters.cycleDateRange" type="daterange" range-separator="至"
- start-placeholder="工单周期开始日期" end-placeholder="工单周期结束日期" :default-value="datePickerDefaultVal" />
- </div>
-
- <div class="search-bar-box-item">
- <el-select @change="handleSearch" v-model="filters.rep_fre_type" placeholder="请选择频次" clearable>
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- </div>
-
- <div class="search-bar-box-item">
- <el-time-picker @change="handleSearch" v-model="filters.deal_time" placeholder="请选择执行时间" prop="deal_time" value-format="HH:mm"
- :picker-options="{
- selectableRange: '00:00 - 23:59',
- }" />
- </div>
-
- <div class="search-bar-box-item"></div>
- <div class="search-bar-box-item"></div>
-
- <div class="search-bar-box-item search-btn">
- <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
- <el-button icon="el-icon-refresh" @click="handleReset">清空</el-button>
- </div>
- </div>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="工单状态:">
+ <el-select @change="handleSearch" v-model="filters.status" placeholder="请选择工单状态" clearable
+ :disabled="activeTab !== 'all'">
+ <el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24">
+ <el-col :span="8">
+ <el-form-item label="工单周期:">
+ <el-date-picker @change="handleSearch" v-model="filters.cycleDateRange" type="daterange"
+ range-separator="至" start-placeholder="工单周期开始日期" end-placeholder="工单周期结束日期"
+ :default-value="datePickerDefaultVal" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="选择频次:">
+ <el-select @change="handleSearch" v-model="filters.rep_fre_type" placeholder="请选择频次" clearable>
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-form-item label="执行时间:">
+ <el-time-picker @change="handleSearch" v-model="filters.deal_time" placeholder="请选择执行时间"
+ prop="deal_time" value-format="HH:mm" :picker-options="{
+ selectableRange: '00:00 - 23:59',
+ }" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="4">
+ <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索
+ </el-button>
+ <el-button icon="el-icon-refresh" @click="handleReset">清空</el-button>
+ </el-col>
+ </el-row>
+ </el-form>
</div>
<!-- 表格部分 -->
<avue-crud class="ztzf-public-general-avue-crud" :data="tableData" :option="option" v-model:page="page"
- ref="crud" :table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
- @on-load="onLoad" @search-change="searchChange" @size-change="sizeChange" v-if="activeTab === tab.name">
- <template #job_info_num="{row}">
+ ref="crud" :table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
+ @on-load="onLoad" @search-change="searchChange" @size-change="sizeChange" v-if="activeTab === tab.name">
+ <template #job_info_num="{ row }">
<el-tooltip-copy :content="row.job_info_num" :showCopyText="true" textAlign="left">
{{ row.job_info_num }}
</el-tooltip-copy>
@@ -98,14 +111,18 @@
<template #menu-left>
<el-button v-if="hasAddBtnPermission() && activeTab != 'WAIT_AUDIT'" type="primary" icon="el-icon-plus"
- @click="handleAdd">新建工单</el-button>
- <el-button type="success" plain icon="el-icon-download" @click="exportData">导出</el-button>
+ @click="handleAdd">新建工单
+ </el-button>
+ <el-button type="success" plain icon="el-icon-download" @click="exportData">导出
+ </el-button>
</template>
<template #menu="{ row }">
<div class="menu-custom-box">
<template v-if="row.status == 1">
- <el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view" @click="handleCheckDetail(row)">审核</el-button>
+ <el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view"
+ @click="handleCheckDetail(row)">审核
+ </el-button>
</template>
<!-- v-if="
(userInfo.user_id == row.create_user || hasRecallPaddingBtnPermission()) &&
@@ -114,24 +131,33 @@
<template v-if="row.status == 1">
<!--待审核状态-->
<el-button type="text" icon="el-icon-warning" v-if="hasRecallPaddingBtnPermission()"
- @click="orderLogRecall(row.id)">撤回</el-button>
+ @click="orderLogRecall(row.id)">撤回
+ </el-button>
<!-- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button> -->
</template>
<!--已驳回-->
<template v-if="row.status == 2">
- <el-button type="text" icon="el-icon-warning" @click="rejectDetail(row.id)">驳回原因</el-button>
- <el-button v-if="userInfo.user_id == row.create_user" type="text" icon="el-icon-view" @click="handleViewDetail(row)">编辑</el-button>
- <el-button v-else type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
+ <el-button type="text" icon="el-icon-warning" @click="rejectDetail(row.id)">驳回原因
+ </el-button>
+ <el-button v-if="userInfo.user_id == row.create_user" type="text" icon="el-icon-view"
+ @click="handleViewDetail(row)">编辑
+ </el-button>
+ <el-button v-else type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情
+ </el-button>
</template>
<!-- 已通过 -->
<template v-if="row.status == 3">
- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
+ <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情
+ </el-button>
</template>
<!--草稿-->
<template v-if="row.status == 0">
- <el-button type="text" icon="el-icon-edit" @click="handleViewDetail(row)">编辑</el-button>
- <el-button type="text" icon="el-icon-position" @click="userPublishPush(row.id)">发布</el-button>
- <el-button type="text" icon="el-icon-delete" @click="deleteOrderLog(row.id)">删除</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="handleViewDetail(row)">编辑
+ </el-button>
+ <el-button type="text" icon="el-icon-position" @click="userPublishPush(row.id)">发布
+ </el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteOrderLog(row.id)">删除
+ </el-button>
</template>
</div>
</template>
@@ -149,7 +175,8 @@
</el-tabs>
<!-- 新建工单对话框 -->
- <el-dialog v-model="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false" @close="resetForm">
+ <el-dialog class="ztzf-dialog-mange" v-model="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false"
+ @close="resetForm">
<el-form :model="form" :rules="rules" ref="testform" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
@@ -157,12 +184,17 @@
<el-input v-model="form.name" placeholder="请输入工单名称" maxlength="100" show-word-limit></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
<el-select v-model="form.file_id" placeholder="请选择航线" filterable @change="getFlyingNestBy">
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
+ :value="item.wayline_id" />
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
+ <el-input-number v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -171,7 +203,7 @@
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="!device_sns.length">
<el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
@@ -188,14 +220,14 @@
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
- show-word-limit></el-input>
+ show-word-limit></el-input>
</el-form-item>
</el-col>
<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="结束日期" :disabled-date="disabledDate" />
+ end-placeholder="结束日期" :disabled-date="disabledDate" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -207,7 +239,7 @@
</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="{
+ :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
</div>
@@ -221,38 +253,45 @@
</el-col>
</el-row>
- <el-row>
- <div class="add-box-btns">
- <el-button type="danger" @click="submitForm(1)">发起</el-button>
- <el-button type="primary" @click="submitForm(0)">存草稿</el-button>
- <el-button @click="dialogVisible = false">取消</el-button>
- </div>
- </el-row>
+ <!-- <el-row>-->
+ <!-- <div class="add-box-btns">-->
+ <!-- <el-button type="danger" @click="submitForm(1)">发起</el-button>-->
+ <!-- <el-button type="primary" @click="submitForm(0)">存草稿</el-button>-->
+ <!-- <el-button @click="dialogVisible = false">取消</el-button>-->
+ <!-- </div>-->
+ <!-- </el-row>-->
</el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="danger" @click="submitForm(1)" icon="el-icon-position">发起</el-button>
+ <el-button type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button>
+ <el-button @click="dialogVisible = false" icon="el-icon-circle-close">取消</el-button>
+ </div>
+ </template>
</el-dialog>
<!-- 工单详情对话框 -->
- <el-dialog align-center v-model="detailVisible" :title="detailTitle" width="70%" :close-on-click-modal="false"
- @close="resetForm">
+ <el-dialog class="ztzf-dialog-mange" align-center v-model="detailVisible" :title="detailTitle" width="70%"
+ :close-on-click-modal="false" @close="resetForm">
<div class="event-title-center">{{ form.name }}</div>
<el-form :model="form" :rules="rules" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
- <div class="steps-titles" v-if="filters.status !== '0'">
+ <div class="steps-titles" v-if="filters.status !== '0'">
<div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
- class="step-title">
+ class="step-title">
{{ record.status_str }}
</div>
</div>
<!-- Element Steps 组件 -->
- <el-steps :active="form.active" align-center class="custom-steps" v-if="filters.status !== '0'">
+ <el-steps :active="form.active" align-center class="custom-steps" v-if="filters.status !== '0'">
<el-step v-for="(record, index) in form.record_list" :key="index">
<template #description>
<span class="step-description" style="position: relative; display: inline-block">
{{ record.user_name }}
</span>
- <span class="step-timer ">
+ <span class="step-timer">
{{ record.interval_time_str }}
</span>
<div class="step-description">
@@ -269,12 +308,19 @@
<el-input v-model="form.name" placeholder="请输入工单名称" :disabled="detailTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
- <el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy" filterable :disabled="detailTitle === '工单详情'">
+ <el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy" filterable
+ :disabled="detailTitle === '工单详情'">
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
+ :value="item.wayline_id" />
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
+ <el-input-number :disabled="detailTitle === '工单详情'" v-model="form.rth_altitude" :min="50"
+ :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -283,13 +329,13 @@
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="detailTitle === '工单详情'">
<el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联算法" prop="ai_types">
- <el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple :disabled="detailTitle === '工单详情'">
+ <el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple :disabled="detailTitle === '工单详情'">
<el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
@@ -306,7 +352,7 @@
<el-col :span="6">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
- end-placeholder="结束日期" :disabled-date="disabledDate" :disabled="detailTitle === '工单详情'" />
+ end-placeholder="结束日期" :disabled-date="disabledDate" :disabled="detailTitle === '工单详情'" />
</el-form-item>
</el-col>
@@ -317,10 +363,10 @@
</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="{
+ <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
- }" :disabled="detailTitle === '工单详情'"/>
+ }" :disabled="detailTitle === '工单详情'" />
</el-col>
</el-row>
@@ -328,7 +374,7 @@
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
- show-word-limit :disabled="detailTitle === '工单详情'"></el-input>
+ show-word-limit :disabled="detailTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -338,34 +384,39 @@
<map-container v-if="detailVisible" ref="MapContainer"></map-container>
</el-col>
</el-row>
-
- <el-row>
- <div class="add-box-btns">
- <el-button type="danger"
- v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
- @click="submitForm(1)">发布</el-button>
- <el-button type="primary" v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)" @click="submitForm(0)">保存</el-button>
- <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
- @click="submitForm(0)">保存</el-button> -->
-
- <el-button type="primary" v-if="form.status == 1 && hasPaddingBtnPermission()"
- @click="orderLogPass(form.id)">通过</el-button>
- <el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)">驳回</el-button>
- </div>
- </el-row>
</el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="danger" v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
+ @click="submitForm(1)" icon="el-icon-position">发布
+ </el-button>
+ <el-button type="primary"
+ v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)" @click="submitForm(0)"
+ icon="el-icon-plus">保存
+ </el-button>
+ <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
+ @click="submitForm(0)">保存</el-button> -->
+
+ <el-button type="primary" v-if="form.status == 1 && hasPaddingBtnPermission()"
+ @click="orderLogPass(form.id)">通过
+ </el-button>
+ <el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
+ @click="orderLogReject(form.id)">驳回
+ </el-button>
+ </div>
+ </template>
</el-dialog>
<!-- 工单详情 -->
- <el-dialog align-center v-model="detailVisibleCopy" title="工单详情" width="70%" :close-on-click-modal="false" @close="resetForm">
+ <el-dialog class="ztzf-dialog-mange" align-center v-model="detailVisibleCopy" title="工单详情" width="70%"
+ :close-on-click-modal="false" @close="resetForm">
<div class="event-title-center">{{ form.name }}</div>
<el-form :model="form" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
<div class="steps-titles" v-if="filters.status !== '0'">
<div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
- class="step-title">
+ class="step-title">
{{ record.status_str }}
</div>
</div>
@@ -377,7 +428,7 @@
<span class="step-description" style="position: relative; display: inline-block">
{{ record.user_name }}
</span>
- <span class="step-timer ">
+ <span class="step-timer">
{{ record.interval_time_str }}
</span>
<div class="step-description">
@@ -394,12 +445,17 @@
<el-input v-model="form.name" placeholder="请输入工单名称" :disabled="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
<el-select v-model="form.file_id" placeholder="请选择航线" :disabled="true">
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
+ :value="item.wayline_id" />
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
+ <el-input-number :disabled="true" v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -409,7 +465,7 @@
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="true">
<el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
@@ -432,7 +488,7 @@
<el-col :span="6">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
- end-placeholder="结束日期" :disabled="true" />
+ end-placeholder="结束日期" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="3">
@@ -443,7 +499,7 @@
<el-col :span="3">
<el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"
- value-format="HH:mm" :picker-options="{
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
</el-col>
@@ -453,7 +509,7 @@
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="form.content" rows="2" placeholder="请输入工单内容" maxlength="255"
- show-word-limit :readonly="true" :disabled="true"></el-input>
+ show-word-limit :readonly="true" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -464,27 +520,30 @@
</el-col>
</el-row>
- <el-row>
- <div class="add-box-btns">
- <el-button type="danger"
- v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
- @click="submitForm(1)">发布</el-button>
- <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
- @click="submitForm(0)">保存</el-button> -->
-
- <el-button type="primary" v-if="form.status == 1 && hasPaddingBtnPermission()"
- @click="orderLogPass(form.id)">通过</el-button>
- <el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)">驳回</el-button>
- <el-button @click="detailVisibleCopy = false">取消</el-button>
- </div>
- </el-row>
</el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="danger" v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
+ @click="submitForm(1)" icon="el-icon-position">发布
+ </el-button>
+ <!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
+ @click="submitForm(0)">保存</el-button> -->
+
+ <el-button type="primary" v-if="form.status == 1 && hasPaddingBtnPermission()" @click="orderLogPass(form.id)"
+ icon="el-icon-check">通过
+ </el-button>
+ <el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
+ @click="orderLogReject(form.id)" icon="el-icon-close">驳回
+ </el-button>
+ <el-button @click="detailVisibleCopy = false" icon="el-icon-circle-close">取消</el-button>
+ </div>
+ </template>
</el-dialog>
</basic-container>
</template>
<script>
+import { pxToRem, pxToRemNum } from '@/utils/rem'
import { calculateDefaultRange } from '@/utils/util'
import {
getList,
@@ -497,10 +556,11 @@
jobStatusNum,
userPublish,
deleteOrderLog,
+ getWaylineMaxTerrainHeight
} from '@/api/tickets/orderLog'
import { getTicketInfo } from '@/api/tickets/ticket'
import { getDictionaryByCode } from '@/api/system/dictbiz'
-import { getWaylineFileListByArea } from '@/api/resource/wayline'
+import { getWaylineFileListByArea, newGetWorkspacesPage } from '@/api/resource/wayline'
import { export_json_to_excel } from '@/utils/exportExcel'
import { getFlyingNestBy } from '@/api/device/device'
import { mapGetters } from 'vuex'
@@ -508,13 +568,18 @@
import { downloadXls } from '@/utils/util'
import 'nprogress/nprogress.css'
import { analyzeKmzFile, removeTextKey, XMLToJSON } from '@/utils/cesium/kmz'
-import dayjs from 'dayjs';
-import 'dayjs/locale/zh-cn'; // 导入中文语言包
-import weekday from 'dayjs/plugin/weekday';
+import dayjs from 'dayjs'
+import 'dayjs/locale/zh-cn' // 导入中文语言包
+import weekday from 'dayjs/plugin/weekday'
import elTooltipCopy from '@/components/ElTooltipCopy.vue'
+import { CircleClose, Promotion, Select } from '@element-plus/icons-vue'
+import { useStore } from 'vuex'
+import _ from 'lodash'
+// const store = useStore()
+dayjs.extend(weekday)
+dayjs.locale('zh-cn')
-dayjs.extend(weekday);
-dayjs.locale('zh-cn');
+// const lastHeight = computed(() => store.state.common.lastHeight)
export default {
components: { elTooltipCopy },
@@ -522,13 +587,13 @@
data () {
return {
activeTab: 'all',
-
+ getlastHeight: 0,
tabs: [
{ label: '全部工单', name: 'all', value: null, count: 0 },
{ label: '待审核', name: 'WAIT_AUDIT', value: 1, count: 0 },
{ label: '已驳回', name: 'REJECTED', value: 2, count: 0 },
{ label: '已通过', name: 'PASS', value: 3, count: 0 },
- { label: '草稿', name: 'DRAFT', value: 0, count: 0 },
+ { label: '草稿', name: 'DRAFT', value: 0, count: 0 }
],
filters: {
key_word: '',
@@ -538,7 +603,7 @@
file_id: '',
ai_types: [],
status: '',
- dateRange: [],
+ dateRange: []
},
departments: [],
types: [],
@@ -552,7 +617,7 @@
{ label: '草稿', value: '0' },
{ label: '待审核', value: '1' },
{ label: '已驳回', value: '2' },
- { label: '已通过', value: '3' },
+ { label: '已通过', value: '3' }
],
//周期
cycles: ['每天', '周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日'],
@@ -564,7 +629,7 @@
indexLabel: '序号',
indexFixed: true,
- align: 'center',
+ align: 'left',
border: true,
stripe: false,
searchShow: true,
@@ -587,48 +652,82 @@
column: [
{
- label: '工单编号', prop: 'job_info_num', width: 150,
+ label: '工单编号',
+ prop: 'job_info_num',
+ width: 150
},
{
- label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true,
- showOverflowTooltip: true,
+ label: '工单名称',
+ prop: 'name',
+ width: 100,
+ ellipsis: true,
+ overHidden: true,
+ showOverflowTooltip: true
},
{
- label: '工单状态', prop: 'status', width: 88,
- showOverflowTooltip: true,
+ label: '工单状态',
+ prop: 'status',
+ width: 88,
+ showOverflowTooltip: true
},
{
- label: '所属单位', prop: 'dept_name', ellipsis: true,
- showOverflowTooltip: true,
+ label: '所属单位',
+ prop: 'dept_name',
+ ellipsis: true,
+ showOverflowTooltip: true
},
{
- label: '创建时间', prop: 'create_time', width: 144, ellipsis: true,
- showOverflowTooltip: true,
+ label: '创建时间',
+ prop: 'create_time',
+ width: 144,
+ ellipsis: true,
+ showOverflowTooltip: true
},
{
- label: '已执行次数', prop: 'job_num', width: 70, ellipsis: true,
- showOverflowTooltip: true,
+ label: '已执行次数',
+ prop: 'job_num',
+ width: 70,
+ ellipsis: true,
+ showOverflowTooltip: true
},
{
- label: '工单内容', prop: 'content', ellipsis: true, overHidden: true,
- showOverflowTooltip: true,
+ label: '工单内容',
+ prop: 'content',
+ ellipsis: true,
+ overHidden: true,
+ showOverflowTooltip: true
},
{
- label: '关联航线', prop: 'wayline_name', ellipsis: true, overHidden: true,
- showOverflowTooltip: true,
+ label: '关联航线',
+ prop: 'wayline_name',
+ ellipsis: true,
+ overHidden: true,
+ showOverflowTooltip: true
},
{
- label: '关联算法', prop: 'ai_type_str', width: 100, ellipsis: true, overHidden: true,
- showOverflowTooltip: true,
+ label: '关联算法',
+ prop: 'ai_type_str',
+ width: 100,
+ ellipsis: true,
+ overHidden: true,
+ showOverflowTooltip: true
},
{
- label: '关联机巢', prop: 'device_names', width: 100, ellipsis: true, overHidden: true,
- showOverflowTooltip: true,
+ label: '关联机巢',
+ prop: 'device_names',
+ width: 100,
+ ellipsis: true,
+ overHidden: true,
+ showOverflowTooltip: true
},
{
- label: '创建人', prop: 'creator_name', width: 96, ellipsis: true, overHidden: true,
- showOverflowTooltip: true,
+ label: '创建人',
+ prop: 'creator_name',
+ width: 96,
+ ellipsis: true,
+ overHidden: true,
+ showOverflowTooltip: true
},
// {
// label: '关联机巢', prop: 'device_names', width: 112, ellipsis: true, overHidden: true,
@@ -641,16 +740,16 @@
formatter: row => this.formatCycleTime(row),
html: true,
ellipsis: true,
- showOverflowTooltip: true,
+ showOverflowTooltip: true
// overHidden: true
- },
- ],
+ }
+ ]
},
page: {
pageSize: 10,
currentPage: 1,
- total: 0,
+ total: 0
},
dialogVisible: false,
detailVisible: false,
@@ -659,24 +758,24 @@
rules: {
name: [
{ required: true, message: '请输入工单名称', trigger: 'blur' },
- { max: 100, message: '工单名称不能超过100个字', trigger: 'blur' },
+ { max: 100, message: '工单名称不能超过100个字', trigger: 'blur' }
],
file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
content: [
{ required: true, message: '请输入工单内容', trigger: 'blur' },
- { max: 255, message: '工单内容不能超过255个字', trigger: 'blur' },
+ { max: 255, message: '工单内容不能超过255个字', trigger: 'blur' }
],
date_range: [{ required: true, message: '请选择时间不能为空', trigger: 'blur' }],
rep_fre_type: [{ required: true, message: '请选择周期', trigger: 'blur' }],
- deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }],
+ deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }]
},
loading: false,
globalCounts: {},
mapLoaded: false,
// 配置时间选择器默认配置
- datePickerDefaultVal: calculateDefaultRange(),
+ datePickerDefaultVal: calculateDefaultRange()
}
},
async created () {
@@ -690,26 +789,36 @@
const { dept_data, event_type, ai_type } = response2.data.data
this.departments = dept_data.map(item => ({
label: item.dept_name,
- value: item.id,
+ value: item.id
}))
},
mounted () {
this.fetchTableData()
const id = this.$route.query.id
- console.log('idddddd',id);
+ console.log('idddddd', id)
if (id) {
// 确保 id 存在
this.handleViewDetail({ id })
const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/orderLog')
- find && (find.query = {})
+ find && (find.query = {})
} else {
console.error('工单ID不存在！')
-
}
},
computed: {
+ CircleClose () {
+ return CircleClose
+ },
...mapGetters(['userInfo', 'permission']),
+ safeHeight () {
+ const safeHeight = this.$store.state.common.safeHeight
+ return Number(safeHeight) || 0 // 确保是数字类型
+ },
+ positionsArr () {
+ const positionsArr = this.$store.state.common.positionsArr
+ return positionsArr || [] // 确保是数字类型
+ },
filteredTabs () {
// rejection_and_draft 权限控制“已驳回”和“草稿”tab
// console.log(this.permission, '权限信息')
@@ -726,11 +835,11 @@
return { ...tab, isShow: true }
})
.filter(tab => tab.isShow)
- },
+ }
},
methods: {
- handleCellClick(row, column) {
+ handleCellClick (row, column) {
if (column.no === 1) {
navigator.clipboard.writeText(row.job_info_num).then(() => {
this.$message.success('复制工单编号成功')
@@ -858,7 +967,7 @@
rep_fre_type: this.filters.rep_fre_type || undefined,
deal_time: this.filters.deal_time || undefined,
current: this.page.currentPage,
- size: this.page.pageSize,
+ size: this.page.pageSize
}
return params
},
@@ -884,43 +993,65 @@
return this.$message.warning('任务时间不能小于当前时间')
}
}
+ let checkedList = this.device_sns.filter(item => this.form.device_sns.includes(item.device_sn));
+ const maxItem = checkedList.reduce((max, item) => {
+ return item.drone_height > max.drone_height ? item : max;
+ });
+ // 返航绝对高度
+ let backHeight = this.form.rth_altitude // + maxItem.drone_height
+ console.log(backHeight,'backHeight')
+ // 安全起飞高度
+ let positions = this.positionsArr
+ positions.unshift({latitude: maxItem.latitude, longitude: maxItem.longitude, height:maxItem.drone_height })
+ positions.push({latitude: maxItem.latitude, longitude: maxItem.longitude, height:maxItem.drone_height})
+ let resultHeight = 0
+ await getWaylineMaxTerrainHeight(positions).then(res => {
+ resultHeight = this.safeHeight > (res.data.data + 30) ? this.safeHeight : (res.data.data + 30)
+ })
+ let valueHeight = _.round(backHeight - resultHeight, 2)
+ console.log('打印比较值', valueHeight)
- const submitData = {
- ...this.form,
- status: status,
- ai_types: this.form.ai_types?.length ? this.form.ai_types : [],
- }
- // 判断该值this.form.date_range[0] 周几 和rep_fre_type 是不是相等
- // if (this.form.deal_time) {
- // const weekday = dayjs(this.form.date_range[0]).format('dddd');
- // console.log('444', weekday)
- // // form.rep_fre_type
- // const now = new Date()
- // const today = now.toDateString()
- // const selectedDate = new Date(this.form.date_range[0]).toDateString()
+ if (valueHeight < 0) {
+ this.$confirm(`当前返航高度存在安全隐患，建议调整为${resultHeight}米以上后进行发布`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(async () => {
+ const submitData = {
+ ...this.form,
+ status: status,
+ ai_types: this.form.ai_types?.length ? this.form.ai_types : []
+ }
+ await saveUpdateOrderLog(submitData)
+ let id = this.form.id
+ if (id) {
+ this.$message.success('工单发布成功')
+ } else {
+ this.$message.success('工单创建成功')
+ }
+ this.dialogVisible = false
+ this.detailVisible = false;
+ (this.device_sns = []), (this.wayLineList = []), this.fetchTableData()
+ }).catch(() => {
- // if (today === selectedDate) {
- // const [hours, minutes] = this.form.deal_time.split(':')
- // const selectedTime = new Date()
- // selectedTime.setHours(parseInt(hours), parseInt(minutes))
-
- // if (selectedTime < now) {
- // return this.$message.warning('任务时间不能小于当前时间')
-
- // }
- // }
- // }
-
- await saveUpdateOrderLog(submitData)
- let id = this.form.id
- if (id) {
- this.$message.success('工单发布成功')
+ })
} else {
- this.$message.success('工单创建成功')
+ const submitData = {
+ ...this.form,
+ status: status,
+ ai_types: this.form.ai_types?.length ? this.form.ai_types : []
+ }
+ await saveUpdateOrderLog(submitData)
+ let id = this.form.id
+ if (id) {
+ this.$message.success('工单发布成功')
+ } else {
+ this.$message.success('工单创建成功')
+ }
+ this.dialogVisible = false
+ this.detailVisible = false;
+ (this.device_sns = []), (this.wayLineList = []), this.fetchTableData()
}
- this.dialogVisible = false
- this.detailVisible = false;
- (this.device_sns = []), (this.wayLineList = []), this.fetchTableData()
}
})
},
@@ -931,10 +1062,10 @@
this.$confirm(data.remark, '驳回原因', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning',
+ type: 'warning'
}).then(() => {
this.form = {
- ...response.data.data,
+ ...response.data.data
}
// this.detailVisible = true
this.handleViewDetail(data)
@@ -953,7 +1084,7 @@
0: '草稿',
1: '待审核',
2: '已驳回',
- 3: '已通过',
+ 3: '已通过'
}
return statusTextMap[status] || '未知状态'
},
@@ -964,7 +1095,7 @@
2: 'info',
3: 'primary',
4: 'success',
- 5: 'danger',
+ 5: 'danger'
}
return statusMap[status] || 'info'
},
@@ -996,7 +1127,7 @@
department: '',
type: '',
dateRange: [],
- status: '',
+ status: ''
}
this.page.currentPage = 1
this.fetchTableData()
@@ -1012,7 +1143,7 @@
DRAFT: 0,
WAIT_AUDIT: 0,
REJECTED: 0,
- PASS: 0,
+ PASS: 0
}
var reponse = await jobStatusNum()
// console.log('统计' + reponse.data.data)
@@ -1026,7 +1157,15 @@
handleAdd () {
this.form = {}
+ this.form.rth_altitude = 120
this.dialogVisible = true
+
+ this.$nextTick(() => {
+ if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
+ this.$refs.MapContainer.initAddEntity('initPosition')
+ }
+ })
+
//航线列表
this.asyncgetWaylineFileListByArea()
},
@@ -1040,7 +1179,7 @@
location: '',
address: '',
content: '',
- photos: [],
+ photos: []
}
if (this.$refs.testform) {
this.$refs.testform.resetFields()
@@ -1057,14 +1196,16 @@
const response = await orderLogDetails(row.id)
const data = response.data.data
this.form = {
- ...data,
+ ...data
}
// 更新机巢列表
- this.device_sns = data.device_list
+ this.device_sns = data.device_map_infos;// data.device_list;
this.permission &&
- (this.permission.order_log_review || this.permission.order_log_recall) &&
- (data.status == 1 || data.status == 3 || (data.status == 2 && this.userInfo.user_id !== this.form.create_user))
+ (this.permission.order_log_review || this.permission.order_log_recall) &&
+ (data.status == 1 ||
+ data.status == 3 ||
+ (data.status == 2 && this.userInfo.user_id !== this.form.create_user))
? (this.detailTitle = '工单详情')
: (this.detailTitle = '编辑工单')
@@ -1075,7 +1216,7 @@
// 检查是否已经存在于 this.wayLineList 中
const isDuplicate = this.wayLineList.some(
- (item) => item.wayline_id === newWayline.wayline_id
+ item => item.wayline_id === newWayline.wayline_id
)
if (!isDuplicate) {
@@ -1084,15 +1225,14 @@
}
this.initMapLine(data.device_map_infos)
- const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/orderLog')
- find && (find.query = {})
-
+ const find = this.$store.state.tags.bsTagList.find(i => i.path === '/tickets/orderLog')
+ find && (find.query = {})
},
async handleCheckDetail (row) {
const response = await orderLogDetails(row.id)
const data = response.data.data
this.form = {
- ...data,
+ ...data
}
// 更新航线列表，追加 wayline_file_region_vo 数据
// 更新航线列表，追加 wayline_file_region_vo 数据
@@ -1101,7 +1241,7 @@
// 检查是否已经存在于 this.wayLineList 中
const isDuplicate = this.wayLineList.some(
- (item) => item.wayline_id === newWayline.wayline_id
+ item => item.wayline_id === newWayline.wayline_id
)
if (!isDuplicate) {
@@ -1118,7 +1258,7 @@
this.$confirm('是否智飞工单数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning',
+ type: 'warning'
}).then(() => {
NProgress.start()
let params = this.getQueryParam()
@@ -1155,7 +1295,7 @@
this.$confirm('确定发布吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning',
+ type: 'warning'
}).then(() => {
let response = userPublish(id)
this.$message.success('发布成功')
@@ -1168,7 +1308,7 @@
this.$confirm('确定删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning',
+ type: 'warning'
}).then(() => {
let response = deleteOrderLog(id)
this.$message.success('删除')
@@ -1180,13 +1320,21 @@
},
//获取航线列表
async asyncgetWaylineFileListByArea (name) {
- var wayLineListResponse = await getWaylineFileListByArea(this.userInfo.detail.areaCode)
- this.wayLineList = wayLineListResponse.data.data
+ const formData = {
+ name: '',
+ waylineType: undefined,
+ current: 1,
+ size: 99999999,
+ descs: 'update_time'
+ }
+ var wayLineListResponse = await newGetWorkspacesPage(formData)
+ this.wayLineList = wayLineListResponse.data.data.records
this.initMapLine()
},
- initMapLine (infos = {}, cb = () => { }) {
+ initMapLine (infos = {}, cb = () => {
+ }) {
let currentLine = this.wayLineList.find(item => item.wayline_id == this.form.file_id)
if (!currentLine) return
@@ -1194,7 +1342,8 @@
this.$nextTick(() => {
if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
this.$refs.MapContainer.initAddEntity('polyline', {
- url: `${import.meta.env.VITE_APP_AIRLINE_URL + currentLine.object_key}?_t=${new Date().getTime()}`,
+ url: `${import.meta.env.VITE_APP_AIRLINE_URL + currentLine.object_key
+ }?_t=${new Date().getTime()}`,
type: currentLine.wayline_type,
cb,
infos
@@ -1207,16 +1356,15 @@
async getFlyingNestBy (waylineId) {
const that = this
- // 先清空
+ // 先清空
that.form.device_sns = []
that.device_sns = []
- this.initMapLine({}, async (polygon) => {
+ this.initMapLine({}, async polygon => {
const currentLine = that.wayLineList.find(item => item.wayline_id === waylineId)
-
//按照航线来
const params = {
- type: [2, 4, 5].includes(currentLine.wayline_type) ? 2 : 0,
+ type: ['2', '4', '5'].includes(currentLine.wayline_type) ? 2 : 0,
wayline_id: waylineId,
polygon
}
@@ -1231,7 +1379,7 @@
this.$confirm('确定撤回则到草稿箱。', '是否撤回？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning',
+ type: 'warning'
}).then(async () => {
let reposne = await orderLogRecall(id)
this.handleSearch()
@@ -1261,7 +1409,7 @@
async orderLogReject (id) {
this.$prompt('', '驳回原因', {
confirmButtonText: '确定',
- cancelButtonText: '取消',
+ cancelButtonText: '取消'
}).then(async ({ value }) => {
let response = await orderLogReject(id, value)
let data = response.data.data
@@ -1273,21 +1421,32 @@
this.page.currentPage = 1
this.onLoad(this.page, this.query)
})
- },
+ }
},
-
watch: {
+ // lastHeight(newVal, oldVal) {
+ // console.log('lastHeight', newVal, oldVal);
+ // this.getlastHeight = newVal;
+ // },
tableData: {
handler () {
// this.updateTabCounts()
},
- deep: true,
- },
- },
+ deep: true
+ }
+ }
}
</script>
<style lang="scss" scoped>
+//:deep(.el-input-number) {
+// width: 200px;
+//}
+
+//:deep(.el-form-item__label) {
+// width: 100px !important;
+//}
+
::v-deep(.el-tabs) {
height: 100%;
display: flex;
@@ -1475,7 +1634,6 @@
flex: 1;
margin-left: 0;
margin-right: 10px;
-
}
}
}
@@ -1486,6 +1644,16 @@
justify-content: center;
}
+.safe-height {
+ :deep(.el-form-item__label) {
+ width: 120px !important;
+ }
+
+ :deep(.el-input-number) {
+ width: 180px !important;
+ }
+}
+
.flex {
display: flex;
}
--
Gitblit v1.9.3