修改

public/staticConfig.js

@@ -2,8 +2,8 @@
 window.PLATFROM_CONFIG = {
   baseNewUrl: '', //登录前的http请求地址
   baseURLCA: '', // 登录后的http请求地址
-  appKeyString: 'test', //appSecret
-  appId: 'test', //appid
+  appKeyString: '1111', //appSecret
+  appId: 'test1', //appid
   baggageMessageURL: '/openApi/query',
   getBase64: 'http://10.211.67.163:8083/getBase64',
   editRule: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[`!@#$%^&*()_+{}":?><`,./';=-])[\da-zA-Z`!@#$%^&*()_+{}":?><`,./';=-]{8,}$/

src/components/publicPageForm/index.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="PublicPageForm">
     <el-form ref="ruleForm" :model="tableForm" :label-width="labelWidth">
       <el-row :gutter="20">
-        <el-col v-for="(item, index) in formItemArr" :key="index" :span="formType == 'horizontal' ? formSpan : 24">
+        <el-col v-for="(item, index) in formItemArr" :key=" index" :span="formType == 'horizontal' ? formSpan : 24">
           <el-form-item :rules="fromDataReq(item)" :prop="item.columncode" :label="item.columnname">
             <template v-if="item.dropdownlist ||item.dropdownlist == 0">
               <el-select class="input-shadow" size="small" filterable default-first-option style="width: 100%" v-model="tableForm[item.columncode]" @change="changeSelect(item.columncode, item)" placeholder="请选择" clearable @clear="tableForm[item.columncode] = ''">

src/utils/validate.js

@@ -392,4 +392,61 @@ export async function pathLogin () {
   resetRouter();
   router.push(`/login`);
   location.reload();
+}
+
+export function formatChange (data, event, key) {
+  const datas = []
+  const flag = Array.isArray(data)
+  if (flag) {
+    for (let i = 0; i < data.length; i++) {
+      let obj = {}
+      if (event == 1) {
+        obj.value = data[i]
+      } else {
+        obj.value = data[i]
+        obj.filter = {}
+        if (Array.isArray(key)) {
+          const keys = []
+          const vals = []
+          obj.filter = []
+          for (let j = 0; j < key.length; j++) {
+            const dep = key[i]
+            keys.push(Object.keys(dep))
+            vals.push(Object.values(dep))
+          }
+          obj.filter.push(nobj)
+          if (obj.value.hasOwnProperty(keys[i])) {
+            delete obj.value[keys[i]]
+          }
+        } else {
+          obj.filter[key] = data[i][key]
+          if (obj.value[key]) {
+            delete obj.value[key]
+          }
+        }
+      }
+      //  else {
+      //   obj = data[i]
+      //   obj.filter[key] = data[i][key]
+      // }
+      datas.push(obj)
+    }
+  } else {
+    let obj = {}
+    obj.filter = {}
+    if (event == 1) {
+      obj.value = data
+    } else {
+      obj.value = data
+      obj.filter[key] = obj.value[key]
+      if (obj.value[key]) {
+        delete obj.value[key]
+      }
+    }
+    // else {
+    //   obj = data
+    // }
+    datas.push(obj)
+  }
+  return datas
 }

src/views/dataAccessPage/index.vue

@@ -68,41 +68,27 @@
             <el-button type="primary" @click="handleSave" :disabled="flag" size="small">保存</el-button>
           </div>
           <div class="demo-form">
-            <PublicPageForm :form-item="jqList" :formData="dataObj" labelWidth="200px" form-type="horizontal" />
+            <PublicPageForm ref="rulesForm" :form-item="jqList" :formData="dataObj" labelWidth="200px" form-type="horizontal" />
           </div>
         </div>
         <div style="height: calc(100% - 280px);overflow: hidden;" class="newService-content-right-bottom">
-          <Table :dataId="dataId" :msgContent="msgContent" dataTitle="算法配置" />
+          <PublicPageTable :dataId="dataId" :msgContent="msgContent" dataTitle="算法配置" />
         </div>
       </div>
     </div>
-    <Dialog :flag="rmFlag">
-      <div class="airportInfoDialog">
-        <div class="title del-title">删除</div>
-        <div class="content del-content">
-          <span class="el-icon-error error r10"></span>您是否确认删除<span class="error l10">{{ dataObj.serviceName }}</span>
-          ？
-        </div>
-        <div class="foot right Delfoot">
-          <el-button size="medium" class="r24" @click="tableRemove" type="danger">删除</el-button>
-          <el-button size="medium" @click="rmFlag = false">取消</el-button>
-        </div>
-      </div>
-    </Dialog>
   </div>
 </template>
 
 <script>
-import Table from '@/views/tablePage/index.vue'
+import PublicPageTable from '@/views/tablePage'
+import PublicPageDialog from '@/components/PublicPageDialog'
 import PublicPageForm from '@/components/publicPageForm'
-import Dialog from "@/layout/components/Dialog/index.vue"
 import { Query, newData, modifyData, moveData, start, stop } from "@/api/webApi"
-import pf from '@/layout/mixin/publicFunc'
 import * as _ from 'lodash'
+
 export default {
   name: 'NewService',
-  mixins: [pf],
-  components: { Table, Dialog, PublicPageForm },
+  components: { PublicPageForm, PublicPageDialog, PublicPageTable },
   data () {
     return {
       title: '服务设置',
@@ -122,16 +108,6 @@ export default {
         tasktype: '',
         cronexpress: ''
       },
-      servicetype: [
-        {
-          label: '接收',
-          value: 1
-        },
-        {
-          label: '采集',
-          value: 4
-        }
-      ],
       activeIndex: null,
       pageIndex: 0,
       pageSize: 9999,
@@ -153,11 +129,6 @@ export default {
     dataList () {
       return this.arrs.filter(data => !this.search || data.servicename.toLowerCase().includes(this.search.toLowerCase()))
     },
-    checkStatus () {
-      return function (formInline) {
-        return (formInline.servicetype && formInline.tasktype) || (formInline.servicetype && formInline.tasktype == 0) ? false : true
-      }
-    }
   },
   created () {
     const { title, qid } = this.$route.meta
@@ -236,35 +207,14 @@ export default {
     },
     //服务列表-新增
     handleAdd () {
-      const datas = this.arrs.filter(item => item.serviceName == '新建服务')
-      if (datas && datas.length) {
-        return
-      }
       this.dataType = 'add'
-      this.flag = false
-      this.dataObj.serviceName = '新建服务'
-      this.arrs.push({ serviceName: '新建服务' })
-      this.activeIndex = this.arrs.length - 1
-      for (const key in this.formInline) {
-        if (Object.hasOwnProperty.call(this.formInline, key)) {
-          this.formInline[key] = null
-        }
-      }
-      this.msgContent = {
-        service_id: ''
-      }
     },
     //服务列表-点击
     handleClick (item, index) {
       this.dataType = 'edit'
       this.dataObj = _.cloneDeep(item)
-      this.formInline = _.cloneDeep(item)
       this.activeIndex = index
       this.flag = false
-      this.msgContent = {
-        serviceid: '15',
-        pagecode: 'algorithmlibraryManagementTable'
-      }
     },
     //服务列表-启用
     handleStart () {
@@ -298,6 +248,8 @@ export default {
     },
     //服务列表-保存
     handleSave () {
+      console.log(this.$refs['rulesForm'].tableForm)
+      return
       if (this.dataObj.serviceID && this.dataType == 'edit') {
         const obj = {}
         obj.Value = this.formInline

src/views/tablePage/index.vue

@@ -45,6 +45,7 @@ import AdvancedQuery from '@/components/AdvancedQuery'
 import AuthButton from '@/components/AuthButton'
 import { mapGetters } from 'vuex'
 import { Query, newData, modifyData, moveData } from "@/api/webApi"
+import { formatChange } from '@/utils/validate'
 
 export default {
   name: 'TablePage',
@@ -88,7 +89,7 @@ export default {
       tableOptions: {}, //表单数据下拉
       labelWidth: '120px', //表单文字距离
       fromDataReqCatch: [], //表单规则缓存
-      tableKey:null,//表格主键
+      tableKey: null,//表格主键
     }
   },
   computed: {
@@ -226,7 +227,7 @@ export default {
       this.tableType = "add";
       this.tableTitle = "新增";
       this.tableForm = {};
-      for(let key in this.pageQuery){
+      for (let key in this.pageQuery) {
         this.tableForm[key] = this.pageQuery[key]
       }
     },
@@ -258,7 +259,7 @@ export default {
     },
     //表格-删除-确认
     tableRemove () {
-      this.generalDataReception(3, this.tableObj,this.tableKey);
+      this.generalDataReception(3, this.tableObj, this.tableKey);
     },
     // 新增/编辑-取消
     submitClickClose (formName) {
@@ -268,70 +269,14 @@ export default {
     // 新增/编辑-确认
     submitClickHandler () {
       const flag = this.$refs["ruleForm"].submitClickHandler()
-      if (flag) this.tableType == "add" ? this.generalDataReception(1, this.tableForm) : this.generalDataReception(2, this.tableForm,this.tableKey)
-    },
-    formatChange (data, event, key) {
-      const datas = []
-      const flag = Array.isArray(data)
-      if (flag) {
-        for (let i = 0; i < data.length; i++) {
-          let obj = {}
-          if (event == 1) {
-            obj.value = data[i]
-          } else {
-            obj.value = data[i]
-            obj.filter = {}
-            if (Array.isArray(key)) {
-              const keys = []
-              const vals = []
-              obj.filter = []
-              for (let j = 0; j < key.length; j++) {
-                const dep = key[i]
-                keys.push(Object.keys(dep))
-                vals.push(Object.values(dep))
-              }
-              obj.filter.push(nobj)
-              if (obj.value.hasOwnProperty(keys[i])) {
-                delete obj.value[keys[i]]
-              }
-            } else {
-              obj.filter[key] = data[i][key]
-              if (obj.value[key]) {
-                delete obj.value[key]
-              }
-            }
-          }
-          //  else {
-          //   obj = data[i]
-          //   obj.filter[key] = data[i][key]
-          // }
-          datas.push(obj)
-        }
-      } else {
-        let obj = {}
-        obj.filter = {}
-        if (event == 1) {
-          obj.value = data
-        } else {
-          obj.value = data
-          obj.filter[key] = obj.value[key]
-          if (obj.value[key]) {
-            delete obj.value[key]
-          }
-        }
-        // else {
-        //   obj = data
-        // }
-        datas.push(obj)
-      }
-      return datas
+      if (flag) this.tableType == "add" ? this.generalDataReception(1, this.tableForm) : this.generalDataReception(2, this.tableForm, this.tableKey)
     },
     //表格-增/删/改
     async generalDataReception (event, data, key) {
       try {
         const params = {
           serviceid: this.pageServiceId,
-          datacontent: this.formatChange(data, event, key),
+          datacontent: formatChange(data, event, key),
           event: `${event}`,
         };
         const { code } =