Skip to content

F
fk-spider-web
Commit d7495360 by 周田
Options

Merge branch 'main' into 'yzh' 

# Conflicts:
#   src/views/os-dataDisplay/index.vue
#   src/views/os-log/index.vue
#   src/views/os-spiderManager/index.vue
#   src/views/os-system/index.vue
#   src/views/os-taskInformation/index.vue
#   src/views/os-taskRecord/index.vue
parents b323f506 2d356fa8
Showing with 206 additions and 195 deletions
src/views/os-dataDisplay/index.vue
<template> <template>
<div> <div>
<div class="backStyle" v-if="route.query.jump === 'yes'" @click="goToStatus" /> <div class="text-left p-4">
<div class="text-left p-4 "> <div class="custom-style">
<div class="custom-style"> <el-segmented v-model="mode" :options="sizeOptions" style="margin-bottom: 1rem" size="large" />
<el-segmented v-model="mode" :options="sizeOptions" style="margin-bottom: 1rem" size="default" /> </div>
</div> </div>
</div> <!-- 综合数据页面组件 -->
<!-- 综合数据页面组件 --> <allDataTab v-if="mode === '综合数据'">
<allDataTab v-if="mode === '综合数据'"> </allDataTab>
</allDataTab> <!-- DSN数据页面组件 -->
<!-- DSN数据页面组件 --> <dsnDataTab v-if="mode === 'DSN数据'">
<dsnDataTab v-if="mode === 'DSN数据'"> </dsnDataTab>
</dsnDataTab> <!-- ITU数据页面组件 -->
<!-- ITU数据页面组件 --> <ituDataTab v-if="mode === 'ITU数据'">
<ituDataTab v-if="mode === 'ITU数据'"> </ituDataTab>
</ituDataTab> <!-- ST数据页面组件 -->
<!-- ST数据页面组件 --> <stDataTab v-if="mode === 'ST数据'">
<stDataTab v-if="mode === 'ST数据'"> </stDataTab>
</stDataTab> </div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
......
src/views/os-log/index.vue
<template> <template>
<div> <div>
<div class="backStyle" @click="bactToRecord()"> <div class="backStyle" @click="bactToRecord()">
</div> </div>
<div class="m-t-4" /> <div class="m-t-4">
<div>
<el-input v-model="textarea" style="width: 93%" :rows="33" type="textarea" placeholder=" " /> </div>
</div> <div>
</div> <el-input v-model="textarea" style="width: 93%" :rows="33" type="textarea" placeholder=" " />
</div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
......
src/views/os-spiderManager/index.vue
<template> <template>
<div> <div>
<div class="mt-20" /> <div class="mt-20">
<div> </div>
<el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }" <div>
:cell-style="{ textAlign: 'center' }" :row-style="{ height: '60px' }"> <el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }"
<el-table-column type="selection" width="40" height="40" /> :cell-style="{ textAlign: 'center' }" :row-style="{ height: '60px' }">
<el-table-column property="number" label="序号" /> <el-table-column type="selection" width="40" height="40" />
<el-table-column property="spiderName" label="爬虫名称" show-overflow-tooltip /> <el-table-column property="name" label="序号" />
<el-table-column label="查看任务"> <el-table-column property="address" label="爬虫名称" show-overflow-tooltip />
<template #default="scope"> <el-table-column label="查看任务">
<el-button type="primary" plain @click="handleDetails(scope.row)"> <template #default="scope">
任务 <el-button type="primary" plain @click="handleDetails(scope.row)">
</el-button> 任务
</template> </el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</div> </el-table>
<div class="pagination w-full flex flex-row-reverse pr-4 m-t-4"> </div>
<Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize" <div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
@pagination="getData" /> <Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
</div> @pagination="getData" />
</div> </div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
......
src/views/os-system/index.vue
<template> <template>
<div> <div>
<div class="text-left p-8"> <div class="text-left p-8">
<el-form inline> <el-form inline>
<el-form-item> <el-form-item>
<el-button type="primary" plain @click="openAddUserDialog">创建用户</el-button> <el-button type="primary" plain @click="openAddUserDialog">创建用户</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="danger" plain @click="handleDelete">批量删除</el-button> <el-button type="danger" plain @click="handleConfirm">批量删除</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }" <el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }" :row-style="{ height: '58px' }"> :cell-style="{ textAlign: 'center' }" :row-style="{ height: '58px' }">
<el-table-column type="selection" width="40" /> <el-table-column type="selection" width="40" />
<el-table-column property="number" label="序号" width="55" type="index" /> <el-table-column property="name" label="序号" width="55" />
<el-table-column property="username" label="用户账号" show-overflow-tooltip /> <el-table-column property="name" label="用户名" show-overflow-tooltip />
<el-table-column property="nickname" label="用户名称" show-overflow-tooltip /> <el-table-column property="name" label="用户名称" show-overflow-tooltip />
<!-- <el-table-column property="userRemark" label="备注" show-overflow-tooltip /> --> <el-table-column property="name" label="备注" show-overflow-tooltip />
<!-- <el-table-column property="userPassword" label="用户密码" show-overflow-tooltip /> --> <el-table-column property="name" label="用户密码" show-overflow-tooltip />
<el-table-column property="create_time" label="创建时间" width="280" show-overflow-tooltip /> <el-table-column property="name" label="创建时间" width="280" show-overflow-tooltip />
<el-table-column label="操作" width="220"> <el-table-column label="操作" width="220">
<template #default="scope"> <template #default="scope">
<el-button type="primary" plain @click="handleEdit(scope.row)"> <el-button type="primary" plain @click="handleDetails(scope.row)">
编辑 编辑
</el-button> </el-button>
<el-button type="danger" plain @click="handleDelete(scope.row)"> <el-button type="danger" plain @click="handleConfirm(scope.row)">
删除 删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination w-full flex flex-row-reverse pr-4 m-t-4"> <div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
<Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize" <Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
@pagination="getData" /> @pagination="getData" />
</div> </div>
<!-- 删除弹窗组件 --> <!-- 删除弹窗组件 -->
<deleteDialog v-model:dialogVisible="showDeleteDialog" @mode="deleteMode" /> <deleteDialog v-model:dialogVisible="showDeleteDialog" @confirm="handleDeleteConfirm" @mode="deleteMode" />
<!-- 创建用户弹窗组件 --> <!-- 创建用户弹窗组件 -->
<addUserDialog v-model:dialogVisible="dialogVisible" :mode="mode" :nick-name="nickName" :user-name="userName" :id="userId" <addUserDialog v-model:dialogVisible="dialogVisible" :mode="mode" :user-count="userCount" :user-name="userName"
:user-role="userRole" :user-status="userStatus" :user-password="userPassword" @get-user-list="getUserListData" /> :user-remark="userRemark" :user-password="userPassword " @confirm="handleConfirm" />
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
......
src/views/os-taskInformation/index.vue
<template> <template>
<div> <div>
<div class="backStyle" v-if="route.query.jump === 'yes'" @click="goToTaskInformation" /> <div class="m-t-7">
<div class="m-t-5" /> </div>
<div class="text-left p-4 toolbarStyle"> <div class="text-left p-6 toolbarStyle">
<div class="formStyle"> <div class="formStyle">
<el-form inline> <el-form inline>
<el-form-item> <el-form-item>
<el-text class="mx-1">所属爬虫:</el-text> <el-text class="mx-1">所属爬虫:</el-text>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div> <div>
<el-select v-model="taskValue" placeholder="请选择" style="width: 220px"> <el-select v-model="taskValue" placeholder="请选择" style="width: 220px">
<el-option v-for="item in taskOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in taskOptions" :key="item.value" :label="item.label"
</el-select> :value="item.value" />
</div> </el-select>
</el-form-item> </div>
<el-form-item> </el-form-item>
<el-text class="mx-1">任务名称:</el-text> <el-form-item>
</el-form-item> <el-text class="mx-1">任务名称:</el-text>
<el-form-item> </el-form-item>
<el-input v-model="taskValue" placeholder="请输入" style="width: 220px" /> <el-form-item>
</el-form-item> <el-input v-model="taskValue" placeholder="请输入" style="width: 220px" />
<el-form-item> </el-form-item>
<el-space> <el-form-item>
<el-button type="primary">查询</el-button> <el-space>
</el-space> <el-button type="primary">查询</el-button>
</el-form-item> </el-space>
<el-form-item> </el-form-item>
<el-space> <el-form-item>
<el-button type="primary" @click="openTaskDialog">新建任务</el-button> <el-space>
</el-space> <el-button type="primary" @click="openTaskDialog">新建任务</el-button>
</el-form-item> </el-space>
</el-form> </el-form-item>
</div> </el-form>
</div>
</div> </div>
<div class="cardStyle"> <div class="cardStyle">
<taskCard successTask="100" failTask="10" unusualTask="1" /> <taskCard successTask="100" failTask="10" unusualTask="1" />
......
src/views/os-taskRecord/index.vue
<template> <template>
<div> <div>
<div class="backStyle" v-if="route.query.jump === 'yes'" @click="goToStatus" /> <div class="m-t-7">
<div class="m-t-7" /> </div>
<div class="text-left p-6 toolbarStyle"> <div class="text-left p-6 toolbarStyle">
<div class="formStyle"> <div class="formStyle">
<el-form inline> <el-form inline>
<el-form-item> <el-form-item>
<el-text class="mx-1">任务名称:</el-text> <el-text class="mx-1">任务名称:</el-text>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div> <div>
<el-select v-model="taskValue" placeholder="请选择" style="width: 220px"> <el-select v-model="taskValue" placeholder="请选择" style="width: 220px">
<el-option v-for="item in taskOptions" :key="item.value" :label="item.label" <el-option v-for="item in taskOptions" :key="item.value" :label="item.label"
:value="item.value" /> :value="item.value" />
</el-select> </el-select>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-text class="mx-1">时间:</el-text> <el-text class="mx-1">时间:</el-text>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker v-model="timeValue" type="datetimerange" start-placeholder="Start date" <el-date-picker v-model="timeValue" type="datetimerange" start-placeholder="Start date"
end-placeholder="End date" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd" end-placeholder="End date" format="YYYY-MM-DD HH:mm:ss" date-format="YYYY/MM/DD ddd"
time-format="A hh:mm:ss" /> time-format="A hh:mm:ss" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-text class="mx-1">调度状态:</el-text> <el-text class="mx-1">调度状态:</el-text>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div> <div>
<el-select v-model="taskValue" placeholder="请选择" style="width: 220px"> <el-select v-model="taskValue" placeholder="请选择" style="width: 220px">
<el-option v-for="item in taskOptions" :key="item.value" :label="item.label" <el-option v-for="item in taskOptions" :key="item.value" :label="item.label"
:value="item.value" /> :value="item.value" />
</el-select> </el-select>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-space> <el-space>
<el-button type="primary">查询</el-button> <el-button type="primary">查询</el-button>
</el-space> </el-space>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
<div class="m-t-10" /> <div class="m-t-10">
<div>
<el-table :data="tableData" style="width: 100%" border :header-cell-style="{ textAlign: 'center' }" </div>
:cell-style="{ textAlign: 'center' }"> <div>
<el-table-column type="selection" width="40" /> <el-table :data="tableData" style="width: 100%" border :header-cell-style="{textAlign: 'center'}" :cell-style="{ textAlign: 'center' }">
<el-table-column property="number" label="序号" width="55" /> <el-table-column type="selection" width="40" />
<el-table-column property="taskName" label="任务名称" show-overflow-tooltip /> <el-table-column property="name" label="序号" width="55" />
<el-table-column property="scheduleMode" label="调度模式" show-overflow-tooltip /> <el-table-column property="address" label="任务名称" show-overflow-tooltip />
<el-table-column property="scheduleStatus" label="调度状态" show-overflow-tooltip /> <el-table-column property="address" label="调度模式" show-overflow-tooltip />
<el-table-column property="errorMessage" label="错误消息" show-overflow-tooltip /> <el-table-column property="status" label="调度状态" show-overflow-tooltip />
<el-table-column property="runningStatus" label="运行状态" show-overflow-tooltip /> <el-table-column property="address" label="错误消息" show-overflow-tooltip />
<el-table-column property="duration" label="持续时间" show-overflow-tooltip /> <el-table-column property="address" label="运行状态" show-overflow-tooltip />
<el-table-column property="scheduleTime" label="调度时间" width="200" show-overflow-tooltip /> <el-table-column property="address" label="持续时间" show-overflow-tooltip />
<el-table-column label="运行日志" width="120"> <el-table-column property="address" label="调度时间" width="200" show-overflow-tooltip />
<template #default="scope"> <el-table-column label="运行日志" width="120">
<el-button size="small" plain type="primary" @click="handleDetails(scope.row)"> <template #default="scope">
日志 <el-button size="small" plain type="primary" @click="handleDetails(scope.row)">
</el-button> 日志
</template> </el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</div> </el-table>
<div class="pagination w-full flex flex-row-reverse pr-4 m-t-4"> </div>
<Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
@pagination="getData" /> <div class="pagination w-full flex flex-row-reverse pr-4 m-t-4">
</div> <Pagination :total="pageObj.total" v-model:page="pageObj.pageNo" v-model:limit="pageObj.pageSize"
</div> @pagination="getData" />
</div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment