Browse Source

增加群控管理界面

xuzuoyun 5 years ago
parent
commit
94142c0a28

File diff suppressed because it is too large
+ 0 - 18117
package-lock.json


+ 168 - 0
src/views/modules/appium/AppiumDeviceList.vue

@@ -0,0 +1,168 @@
+<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="IP">
+              <a-input placeholder="请输入IP" v-model="queryParam.ip"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="端口号">
+              <a-input placeholder="请输入端口号" v-model="queryParam.port"></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.status"></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-button type="primary" icon="download" @click="handleExportXls('手机设备表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <appiumDevice-modal ref="modalForm" @ok="modalFormOk"></appiumDevice-modal>
+  </a-card>
+</template>
+
+<script>
+  import AppiumDeviceModal from './modules/AppiumDeviceModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "AppiumDeviceList",
+    mixins:[JeecgListMixin],
+    components: {
+      AppiumDeviceModal
+    },
+    data () {
+      return {
+        description: '手机设备表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'IP',
+            align:"center",
+            dataIndex: 'ip'
+           },
+		   {
+            title: '端口号',
+            align:"center",
+            dataIndex: 'port'
+           },
+		   {
+            title: '状态',
+            align:"center",
+            dataIndex: 'status'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/appium/appiumDevice/list",
+          delete: "/appium/appiumDevice/delete",
+          deleteBatch: "/appium/appiumDevice/deleteBatch",
+          exportXlsUrl: "appium/appiumDevice/exportXls",
+          importExcelUrl: "appium/appiumDevice/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 238 - 0
src/views/modules/appium/AppiumTaskItemList.vue

@@ -0,0 +1,238 @@
+<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.parentId"></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.seq"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="查找类型">
+              <a-input placeholder="请输入查找类型" v-model="queryParam.findType"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="查找关键字">
+              <a-input placeholder="请输入查找关键字" v-model="queryParam.findKey"></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-button type="primary" icon="download" @click="handleExportXls('群控任务节点表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <appiumTaskItem-modal ref="modalForm" @ok="modalFormOk"></appiumTaskItem-modal>
+  </a-card>
+</template>
+
+<script>
+  import AppiumTaskItemModal from './modules/AppiumTaskItemModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "AppiumTaskItemList",
+    mixins:[JeecgListMixin],
+    components: {
+      AppiumTaskItemModal
+    },
+    data () {
+      return {
+        description: '群控任务节点表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: '任务ID',
+            align:"center",
+            dataIndex: 'taskId'
+           },
+		   {
+            title: '父ID',
+            align:"center",
+            dataIndex: 'parentId'
+           },
+		   {
+            title: '顺序',
+            align:"center",
+            dataIndex: 'seq'
+           },
+		   {
+            title: '查找类型',
+            align:"center",
+            dataIndex: 'findType'
+           },
+		   {
+            title: '查找关键字',
+            align:"center",
+            dataIndex: 'findKey'
+           },
+		   {
+            title: '点击类型',
+            align:"center",
+            dataIndex: 'clickType'
+           },
+		   {
+            title: '偏移量X',
+            align:"center",
+            dataIndex: 'offsiteX'
+           },
+		   {
+            title: '偏移量Y',
+            align:"center",
+            dataIndex: 'offsiteY'
+           },
+		   {
+            title: '循环间隔',
+            align:"center",
+            dataIndex: 'loopRate'
+           },
+		   {
+            title: '是否必经执行',
+            align:"center",
+            dataIndex: 'isMust'
+           },
+		   {
+            title: '文本查找类型',
+            align:"center",
+            dataIndex: 'textEqualType'
+           },
+		   {
+            title: '文本查找关键字',
+            align:"center",
+            dataIndex: 'textEqualKey'
+           },
+		   {
+            title: '滑动类型',
+            align:"center",
+            dataIndex: 'swapType'
+           },
+		   {
+            title: '延迟时长',
+            align:"center",
+            dataIndex: 'waitTime'
+           },
+		   {
+            title: '是否执行完关闭',
+            align:"center",
+            dataIndex: 'isClose'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/appium/appiumTaskItem/list",
+          delete: "/appium/appiumTaskItem/delete",
+          deleteBatch: "/appium/appiumTaskItem/deleteBatch",
+          exportXlsUrl: "appium/appiumTaskItem/exportXls",
+          importExcelUrl: "appium/appiumTaskItem/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 168 - 0
src/views/modules/appium/AppiumTaskList.vue

@@ -0,0 +1,168 @@
+<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="任务名称">
+              <a-input placeholder="请输入任务名称" v-model="queryParam.taskName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="APP包名">
+              <a-input placeholder="请输入APP包名" v-model="queryParam.appPackage"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="APP界面名">
+              <a-input placeholder="请输入APP界面名" v-model="queryParam.appActivity"></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-button type="primary" icon="download" @click="handleExportXls('群控任务表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <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"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <appiumTask-modal ref="modalForm" @ok="modalFormOk"></appiumTask-modal>
+  </a-card>
+</template>
+
+<script>
+  import AppiumTaskModal from './modules/AppiumTaskModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "AppiumTaskList",
+    mixins:[JeecgListMixin],
+    components: {
+      AppiumTaskModal
+    },
+    data () {
+      return {
+        description: '群控任务表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: '任务名称',
+            align:"center",
+            dataIndex: 'taskName'
+           },
+		   {
+            title: 'APP包名',
+            align:"center",
+            dataIndex: 'appPackage'
+           },
+		   {
+            title: 'APP界面名',
+            align:"center",
+            dataIndex: 'appActivity'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/appium/appiumTask/list",
+          delete: "/appium/appiumTask/delete",
+          deleteBatch: "/appium/appiumTask/deleteBatch",
+          exportXlsUrl: "appium/appiumTask/exportXls",
+          importExcelUrl: "appium/appiumTask/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

+ 139 - 0
src/views/modules/appium/modules/AppiumDeviceModal.vue

@@ -0,0 +1,139 @@
+<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="IP">
+          <a-input placeholder="请输入IP" v-decorator="['ip', validatorRules.ip ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="端口号">
+          <a-input placeholder="请输入端口号" v-decorator="['port', validatorRules.port ]" />
+        </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: "AppiumDeviceModal",
+    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:{
+        ip:{rules: [{ required: true, message: '请输入IP!' }]},
+        port:{rules: [{ required: true, message: '请输入端口号!' }]},
+        status:{rules: [{ required: true, message: '请输入状态!' }]},
+        },
+        url: {
+          add: "/appium/appiumDevice/add",
+          edit: "/appium/appiumDevice/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,'ip','port','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>

+ 146 - 0
src/views/modules/appium/modules/AppiumDeviceModal__Style#Drawer.vue

@@ -0,0 +1,146 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="IP">
+          <a-input placeholder="请输入IP" v-decorator="['ip', validatorRules.ip ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="端口号">
+          <a-input placeholder="请输入端口号" v-decorator="['port', validatorRules.port ]" />
+        </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-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "AppiumDeviceModal",
+    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:{
+        ip:{rules: [{ required: true, message: '请输入IP!' }]},
+        port:{rules: [{ required: true, message: '请输入端口号!' }]},
+        status:{rules: [{ required: true, message: '请输入状态!' }]},
+        },
+        url: {
+          add: "/appium/appiumDevice/add",
+          edit: "/appium/appiumDevice/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,'ip','port','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>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>

+ 223 - 0
src/views/modules/appium/modules/AppiumTaskItemModal.vue

@@ -0,0 +1,223 @@
+<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="['parentId', validatorRules.parentId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="顺序">
+          <a-input-number v-decorator="[ 'seq', validatorRules.seq ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="查找类型">
+          <a-input placeholder="请输入查找类型" v-decorator="['findType', validatorRules.findType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="查找关键字">
+          <a-input placeholder="请输入查找关键字" v-decorator="['findKey', validatorRules.findKey ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="点击类型">
+          <a-input placeholder="请输入点击类型" v-decorator="['clickType', validatorRules.clickType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="偏移量X">
+          <a-input-number v-decorator="[ 'offsiteX', validatorRules.offsiteX ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="偏移量Y">
+          <a-input-number v-decorator="[ 'offsiteY', validatorRules.offsiteY ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="循环间隔">
+          <a-input placeholder="请输入循环间隔" v-decorator="['loopRate', validatorRules.loopRate ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="是否必经执行">
+          <a-input placeholder="请输入是否必经执行" v-decorator="['isMust', validatorRules.isMust ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="文本查找类型">
+          <a-input placeholder="请输入文本查找类型" v-decorator="['textEqualType', validatorRules.textEqualType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="文本查找关键字">
+          <a-input placeholder="请输入文本查找关键字" v-decorator="['textEqualKey', validatorRules.textEqualKey ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="滑动类型">
+          <a-input placeholder="请输入滑动类型" v-decorator="['swapType', validatorRules.swapType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="延迟时长">
+          <a-input placeholder="请输入延迟时长" v-decorator="['waitTime', validatorRules.waitTime ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="是否执行完关闭">
+          <a-input placeholder="请输入是否执行完关闭" v-decorator="['isClose', validatorRules.isClose ]" />
+        </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: "AppiumTaskItemModal",
+    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!' }]},
+        parentId:{rules: [{ required: true, message: '请输入父ID!' }]},
+        seq:{rules: [{ required: true, message: '请输入顺序!' }]},
+        findType:{rules: [{ required: true, message: '请输入查找类型!' }]},
+        findKey:{rules: [{ required: true, message: '请输入查找关键字!' }]},
+        clickType:{rules: [{ required: true, message: '请输入点击类型!' }]},
+        offsiteX:{rules: [{ required: true, message: '请输入偏移量X!' }]},
+        offsiteY:{rules: [{ required: true, message: '请输入偏移量Y!' }]},
+        loopRate:{rules: [{ required: true, message: '请输入循环间隔!' }]},
+        isMust:{rules: [{ required: true, message: '请输入是否必经执行!' }]},
+        textEqualType:{rules: [{ required: true, message: '请输入文本查找类型!' }]},
+        textEqualKey:{rules: [{ required: true, message: '请输入文本查找关键字!' }]},
+        swapType:{rules: [{ required: true, message: '请输入滑动类型!' }]},
+        waitTime:{rules: [{ required: true, message: '请输入延迟时长!' }]},
+        isClose:{rules: [{ required: true, message: '请输入是否执行完关闭!' }]},
+        },
+        url: {
+          add: "/appium/appiumTaskItem/add",
+          edit: "/appium/appiumTaskItem/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','parentId','seq','findType','findKey','clickType','offsiteX','offsiteY','loopRate','isMust','textEqualType','textEqualKey','swapType','waitTime','isClose'))
+		  //时间格式化
+        });
+
+      },
+      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>

+ 230 - 0
src/views/modules/appium/modules/AppiumTaskItemModal__Style#Drawer.vue

@@ -0,0 +1,230 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <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="['parentId', validatorRules.parentId ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="顺序">
+          <a-input-number v-decorator="[ 'seq', validatorRules.seq ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="查找类型">
+          <a-input placeholder="请输入查找类型" v-decorator="['findType', validatorRules.findType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="查找关键字">
+          <a-input placeholder="请输入查找关键字" v-decorator="['findKey', validatorRules.findKey ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="点击类型">
+          <a-input placeholder="请输入点击类型" v-decorator="['clickType', validatorRules.clickType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="偏移量X">
+          <a-input-number v-decorator="[ 'offsiteX', validatorRules.offsiteX ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="偏移量Y">
+          <a-input-number v-decorator="[ 'offsiteY', validatorRules.offsiteY ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="循环间隔">
+          <a-input placeholder="请输入循环间隔" v-decorator="['loopRate', validatorRules.loopRate ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="是否必经执行">
+          <a-input placeholder="请输入是否必经执行" v-decorator="['isMust', validatorRules.isMust ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="文本查找类型">
+          <a-input placeholder="请输入文本查找类型" v-decorator="['textEqualType', validatorRules.textEqualType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="文本查找关键字">
+          <a-input placeholder="请输入文本查找关键字" v-decorator="['textEqualKey', validatorRules.textEqualKey ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="滑动类型">
+          <a-input placeholder="请输入滑动类型" v-decorator="['swapType', validatorRules.swapType ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="延迟时长">
+          <a-input placeholder="请输入延迟时长" v-decorator="['waitTime', validatorRules.waitTime ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="是否执行完关闭">
+          <a-input placeholder="请输入是否执行完关闭" v-decorator="['isClose', validatorRules.isClose ]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+    <a-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "AppiumTaskItemModal",
+    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!' }]},
+        parentId:{rules: [{ required: true, message: '请输入父ID!' }]},
+        seq:{rules: [{ required: true, message: '请输入顺序!' }]},
+        findType:{rules: [{ required: true, message: '请输入查找类型!' }]},
+        findKey:{rules: [{ required: true, message: '请输入查找关键字!' }]},
+        clickType:{rules: [{ required: true, message: '请输入点击类型!' }]},
+        offsiteX:{rules: [{ required: true, message: '请输入偏移量X!' }]},
+        offsiteY:{rules: [{ required: true, message: '请输入偏移量Y!' }]},
+        loopRate:{rules: [{ required: true, message: '请输入循环间隔!' }]},
+        isMust:{rules: [{ required: true, message: '请输入是否必经执行!' }]},
+        textEqualType:{rules: [{ required: true, message: '请输入文本查找类型!' }]},
+        textEqualKey:{rules: [{ required: true, message: '请输入文本查找关键字!' }]},
+        swapType:{rules: [{ required: true, message: '请输入滑动类型!' }]},
+        waitTime:{rules: [{ required: true, message: '请输入延迟时长!' }]},
+        isClose:{rules: [{ required: true, message: '请输入是否执行完关闭!' }]},
+        },
+        url: {
+          add: "/appium/appiumTaskItem/add",
+          edit: "/appium/appiumTaskItem/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','parentId','seq','findType','findKey','clickType','offsiteX','offsiteY','loopRate','isMust','textEqualType','textEqualKey','swapType','waitTime','isClose'))
+		  //时间格式化
+        });
+
+      },
+      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>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>

+ 139 - 0
src/views/modules/appium/modules/AppiumTaskModal.vue

@@ -0,0 +1,139 @@
+<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="任务名称">
+          <a-input placeholder="请输入任务名称" v-decorator="['taskName', validatorRules.taskName ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="APP包名">
+          <a-input placeholder="请输入APP包名" v-decorator="['appPackage', validatorRules.appPackage ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="APP界面名">
+          <a-input placeholder="请输入APP界面名" v-decorator="['appActivity', validatorRules.appActivity ]" />
+        </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: "AppiumTaskModal",
+    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:{
+        taskName:{rules: [{ required: true, message: '请输入任务名称!' }]},
+        appPackage:{rules: [{ required: true, message: '请输入APP包名!' }]},
+        appActivity:{rules: [{ required: true, message: '请输入APP界面名!' }]},
+        },
+        url: {
+          add: "/appium/appiumTask/add",
+          edit: "/appium/appiumTask/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,'taskName','appPackage','appActivity'))
+		  //时间格式化
+        });
+
+      },
+      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>

+ 146 - 0
src/views/modules/appium/modules/AppiumTaskModal__Style#Drawer.vue

@@ -0,0 +1,146 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <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="APP包名">
+          <a-input placeholder="请输入APP包名" v-decorator="['appPackage', validatorRules.appPackage ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="APP界面名">
+          <a-input placeholder="请输入APP界面名" v-decorator="['appActivity', validatorRules.appActivity ]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+    <a-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "AppiumTaskModal",
+    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:{
+        taskName:{rules: [{ required: true, message: '请输入任务名称!' }]},
+        appPackage:{rules: [{ required: true, message: '请输入APP包名!' }]},
+        appActivity:{rules: [{ required: true, message: '请输入APP界面名!' }]},
+        },
+        url: {
+          add: "/appium/appiumTask/add",
+          edit: "/appium/appiumTask/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,'taskName','appPackage','appActivity'))
+		  //时间格式化
+        });
+
+      },
+      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>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>