Prechádzať zdrojové kódy

修改群控管理界面

xuzuoyun 5 rokov pred
rodič
commit
14bad25d16

+ 7 - 2
src/views/modules/appium/AppiumTaskItemList.vue

@@ -51,7 +51,7 @@
     <!-- 操作按钮区域 -->
     <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-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>
@@ -119,7 +119,7 @@
     },
     data () {
       return {
-        description: '群控任务节点表管理页面',
+        description: '任务内容表管理页面',
         // 表头
         columns: [
           {
@@ -178,6 +178,11 @@
             dataIndex: 'loopRate'
            },
 		   {
+            title: '循环类型',
+            align:"center",
+            dataIndex: 'loopType'
+           },
+		   {
             title: '是否必经执行',
             align:"center",
             dataIndex: 'isMust'

+ 2 - 2
src/views/modules/appium/AppiumTaskList.vue

@@ -41,7 +41,7 @@
     <!-- 操作按钮区域 -->
     <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-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>
@@ -109,7 +109,7 @@
     },
     data () {
       return {
-        description: '群控任务表管理页面',
+        description: '任务表管理页面',
         // 表头
         columns: [
           {

+ 18 - 23
src/views/modules/appium/modules/AppiumTaskItemModal.vue

@@ -21,7 +21,7 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="父ID">
-          <a-input placeholder="请输入父ID" v-decorator="['parentId', validatorRules.parentId ]" />
+          <a-input placeholder="请输入父ID" v-decorator="['parentId', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
@@ -39,31 +39,37 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="查找关键字">
-          <a-input placeholder="请输入查找关键字" v-decorator="['findKey', validatorRules.findKey ]" />
+          <a-input placeholder="请输入查找关键字" v-decorator="['findKey', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="点击类型">
-          <a-input placeholder="请输入点击类型" v-decorator="['clickType', validatorRules.clickType ]" />
+          <a-input placeholder="请输入点击类型" v-decorator="['clickType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="偏移量X">
-          <a-input-number v-decorator="[ 'offsiteX', validatorRules.offsiteX ]" />
+          <a-input-number v-decorator="[ 'offsiteX', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="偏移量Y">
-          <a-input-number v-decorator="[ 'offsiteY', validatorRules.offsiteY ]" />
+          <a-input-number v-decorator="[ 'offsiteY', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="循环间隔">
-          <a-input placeholder="请输入循环间隔" v-decorator="['loopRate', validatorRules.loopRate ]" />
+          <a-input placeholder="请输入循环间隔" v-decorator="['loopRate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="循环类型">
+          <a-input placeholder="请输入循环类型" v-decorator="['loopType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
@@ -75,31 +81,31 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="文本查找类型">
-          <a-input placeholder="请输入文本查找类型" v-decorator="['textEqualType', validatorRules.textEqualType ]" />
+          <a-input placeholder="请输入文本查找类型" v-decorator="['textEqualType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="文本查找关键字">
-          <a-input placeholder="请输入文本查找关键字" v-decorator="['textEqualKey', validatorRules.textEqualKey ]" />
+          <a-input placeholder="请输入文本查找关键字" v-decorator="['textEqualKey', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="滑动类型">
-          <a-input placeholder="请输入滑动类型" v-decorator="['swapType', validatorRules.swapType ]" />
+          <a-input placeholder="请输入滑动类型" v-decorator="['swapType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="延迟时长">
-          <a-input placeholder="请输入延迟时长" v-decorator="['waitTime', validatorRules.waitTime ]" />
+          <a-input placeholder="请输入延迟时长" v-decorator="['waitTime', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="是否执行完关闭">
-          <a-input placeholder="请输入是否执行完关闭" v-decorator="['isClose', validatorRules.isClose ]" />
+          <a-input placeholder="请输入是否执行完关闭" v-decorator="['isClose', {}]" />
         </a-form-item>
 		
       </a-form>
@@ -132,20 +138,9 @@
         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",
@@ -164,7 +159,7 @@
         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'))
+          this.form.setFieldsValue(pick(this.model,'taskId','parentId','seq','findType','findKey','clickType','offsiteX','offsiteY','loopRate','loopType','isMust','textEqualType','textEqualKey','swapType','waitTime','isClose'))
 		  //时间格式化
         });
 

+ 18 - 23
src/views/modules/appium/modules/AppiumTaskItemModal__Style#Drawer.vue

@@ -21,7 +21,7 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="父ID">
-          <a-input placeholder="请输入父ID" v-decorator="['parentId', validatorRules.parentId ]" />
+          <a-input placeholder="请输入父ID" v-decorator="['parentId', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
@@ -39,31 +39,37 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="查找关键字">
-          <a-input placeholder="请输入查找关键字" v-decorator="['findKey', validatorRules.findKey ]" />
+          <a-input placeholder="请输入查找关键字" v-decorator="['findKey', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="点击类型">
-          <a-input placeholder="请输入点击类型" v-decorator="['clickType', validatorRules.clickType ]" />
+          <a-input placeholder="请输入点击类型" v-decorator="['clickType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="偏移量X">
-          <a-input-number v-decorator="[ 'offsiteX', validatorRules.offsiteX ]" />
+          <a-input-number v-decorator="[ 'offsiteX', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="偏移量Y">
-          <a-input-number v-decorator="[ 'offsiteY', validatorRules.offsiteY ]" />
+          <a-input-number v-decorator="[ 'offsiteY', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="循环间隔">
-          <a-input placeholder="请输入循环间隔" v-decorator="['loopRate', validatorRules.loopRate ]" />
+          <a-input placeholder="请输入循环间隔" v-decorator="['loopRate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="循环类型">
+          <a-input placeholder="请输入循环类型" v-decorator="['loopType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
@@ -75,31 +81,31 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="文本查找类型">
-          <a-input placeholder="请输入文本查找类型" v-decorator="['textEqualType', validatorRules.textEqualType ]" />
+          <a-input placeholder="请输入文本查找类型" v-decorator="['textEqualType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="文本查找关键字">
-          <a-input placeholder="请输入文本查找关键字" v-decorator="['textEqualKey', validatorRules.textEqualKey ]" />
+          <a-input placeholder="请输入文本查找关键字" v-decorator="['textEqualKey', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="滑动类型">
-          <a-input placeholder="请输入滑动类型" v-decorator="['swapType', validatorRules.swapType ]" />
+          <a-input placeholder="请输入滑动类型" v-decorator="['swapType', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="延迟时长">
-          <a-input placeholder="请输入延迟时长" v-decorator="['waitTime', validatorRules.waitTime ]" />
+          <a-input placeholder="请输入延迟时长" v-decorator="['waitTime', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="是否执行完关闭">
-          <a-input placeholder="请输入是否执行完关闭" v-decorator="['isClose', validatorRules.isClose ]" />
+          <a-input placeholder="请输入是否执行完关闭" v-decorator="['isClose', {}]" />
         </a-form-item>
 		
       </a-form>
@@ -134,20 +140,9 @@
         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",
@@ -166,7 +161,7 @@
         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'))
+          this.form.setFieldsValue(pick(this.model,'taskId','parentId','seq','findType','findKey','clickType','offsiteX','offsiteY','loopRate','loopType','isMust','textEqualType','textEqualKey','swapType','waitTime','isClose'))
 		  //时间格式化
         });
 

+ 2 - 2
vue.config.js

@@ -66,8 +66,8 @@ module.exports = {
       '/jeecg-boot': {
         // target: 'http://39.97.120.42:8080', //请求本地 需要jeecg-boot后台项目  生产环境
         // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
-        target: 'http://192.168.2.130:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
-        // target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
+        // target: 'http://192.168.2.130:8080', //请求本地 需要jeecg-boot后台项目  蒙蒙
+        target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
         ws: false,
         changeOrigin: true
       },