浏览代码

合并提交

xuzuoyun 5 年之前
父节点
当前提交
ab30795750

+ 23 - 0
src/mixins/ipagination.js

@@ -0,0 +1,23 @@
+export const JeecgListMixin = {
+    data() {
+      return {
+        /* 分页参数 */
+        ipagination: {
+          current: 1,
+          pageSize: 10,
+        //   pageSizeOptions: ['10', '20', '30'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+        //   showSizeChanger: true,
+          total: 0,
+          onChange: current => {
+            // 切换分页时的回调,
+            // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
+            this.ipagination.current = current
+          }
+        },
+      }
+    }
+}

+ 175 - 0
src/views/modules/appium/AppiumTaskLogList.vue

@@ -0,0 +1,175 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="任务ID">
+              <a-input placeholder="请输入任务ID" v-model="queryParam.taskId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="设备ID">
+              <a-input placeholder="请输入设备ID" v-model="queryParam.deviceId"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="任务名称">
+              <a-input placeholder="请输入任务名称" v-model="queryParam.taskName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="设备IP">
+              <a-input placeholder="请输入设备IP" v-model="queryParam.deviceIp"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="设备端口">
+              <a-input placeholder="请输入设备端口" v-model="queryParam.devicePort"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange">
+        <span slot="status" slot-scope="status">{{status|showStatus}}</span>
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <appiumTaskLog-modal ref="modalForm" @ok="modalFormOk"></appiumTaskLog-modal>
+  </a-card>
+</template>
+
+<script>
+  import AppiumTaskLogModal from './modules/AppiumTaskLogModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "AppiumTaskLogList",
+    mixins:[JeecgListMixin],
+    components: {
+      AppiumTaskLogModal
+    },
+    data () {
+      return {
+        description: '任务日志数据管理页面',
+        // 表头
+        columns: [
+		   {
+            title: '设备ID',
+            align:"center",
+            dataIndex: 'deviceId',
+           },
+		   {
+            title: '任务名称',
+            align:"center",
+            dataIndex: 'taskName'
+           },
+		   {
+            title: '设备IP',
+            align:"center",
+            dataIndex: 'deviceIp'
+           },
+		   {
+            title: '设备端口',
+            align:"center",
+            dataIndex: 'devicePort'
+           },
+		   {
+            title:"任务状态",
+            align:"center",
+            dataIndex:"status",
+            scopedSlots: { customRender: 'status'}
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/appium/appiumTaskLog/list",
+          delete: "/appium/appiumTaskLog/delete",
+          deleteBatch: "/appium/appiumTaskLog/deleteBatch"
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    filters: {
+      showStatus: function(value) {
+        var status = {
+          '-4': '一键新机失败',
+          '-3': '服务器内部异常',
+          '-2': '绑定体验失败',
+          '-1': '登录快手账号失败',
+          '1': '任务执行中',
+          '2': '任务执行结束',
+        }
+        return status[value]
+      }
+    },
+    methods: {
+
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 160 - 0
src/views/modules/appium/modules/AppiumTaskLogModal.vue

@@ -0,0 +1,160 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="任务ID">
+          <a-input placeholder="请输入任务ID" v-decorator="['taskId', validatorRules.taskId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="设备ID">
+          <a-input placeholder="请输入设备ID" v-decorator="['deviceId', validatorRules.deviceId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="任务名称">
+          <a-input placeholder="请输入任务名称" v-decorator="['taskName', validatorRules.taskName ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="设备IP">
+          <a-input placeholder="请输入设备IP" v-decorator="['deviceIp', validatorRules.deviceIp ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="设备端口">
+          <a-input placeholder="请输入设备端口" v-decorator="['devicePort', validatorRules.devicePort ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="状态">
+          <a-input placeholder="请输入状态" v-decorator="['status', validatorRules.status ]" />
+        </a-form-item>
+
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "AppiumTaskLogModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        taskId:{rules: [{ required: true, message: '请输入任务ID!' }]},
+        deviceId:{rules: [{ required: true, message: '请输入设备ID!' }]},
+        taskName:{rules: [{ required: true, message: '请输入任务名称!' }]},
+        deviceIp:{rules: [{ required: true, message: '请输入设备IP!' }]},
+        devicePort:{rules: [{ required: true, message: '请输入设备端口!' }]},
+        status:{rules: [{ required: true, message: '请输入状态!' }]},
+        },
+        url: {
+          add: "/appium/appiumTaskLog/add",
+          edit: "/appium/appiumTaskLog/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'taskId','deviceId','taskName','deviceIp','devicePort','status'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+</style>