bug修改

src/views/dataAccessPage/components/accessPageForm.vue

@@ -9,16 +9,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="tableForm.algorithmtype == 0" :span="24">
-          <el-form-item prop="preconditions" label="执行条件">
-            <el-input size="small" type="textarea" v-model="tableForm.preconditions"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item prop="algorithmname" label="算法名称">
-            <el-input size="small" v-model="tableForm.algorithmname" placeholder="请输入" />
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-form-item prop="algorithmtype" label="算法类型">
             <el-select size="small" v-model="tableForm.algorithmtype" @change="changeSelect('algorithmtype',tableForm.algorithmtype)" placeholder="请选择">
@@ -26,6 +16,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item prop="algorithmname" label="算法名称">
+            <el-input size="small" v-model="tableForm.algorithmname" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
         <el-col v-if="formatData(tableForm.algorithmtype) == 'java' || formatData(tableForm.algorithmtype) == 'db' || formatData(tableForm.algorithmtype) == 'kafka'" :span="24">
           <el-form-item prop="algorithmsourcelibraryid" label="算法模版">
             <el-select size="small" v-model="tableForm.algorithmsourcelibraryid" placeholder="请选择">
@@ -34,7 +29,7 @@
           </el-form-item>
         </el-col>
         <el-col v-if="formatData(tableForm.algorithmtype) == 'java' || formatData(tableForm.algorithmtype) == 'db' || formatData(tableForm.algorithmtype) == 'kafka'" :span="24">
-          <el-form-item prop="datasourceid" label="数据源编号">
+          <el-form-item prop="datasourceid" label="数据源">
             <el-select size="small" v-model="tableForm.datasourceid" placeholder="请选择">
               <el-option v-for="(item,index) in selectSource" :key="index" :label="item.datasourcedescribe" :value="item.datasourceid"></el-option>
             </el-select>
@@ -50,14 +45,19 @@
             <el-input size="small" v-model="tableForm.executionorder"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item prop="algorithmdescription" label="算法说明">
+            <el-input size="small" v-model="tableForm.algorithmdescription"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item prop="computingexpression" label="计算表达式">
             <el-input size="small" type="textarea" v-model="tableForm.computingexpression"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item prop="algorithmdescription" label="算法说明">
-            <el-input size="small" v-model="tableForm.algorithmdescription"></el-input>
+        <el-col v-if="tableForm.algorithmtype == 0" :span="24">
+          <el-form-item prop="preconditions" label="执行条件">
+            <el-input size="small" type="textarea" v-model="tableForm.preconditions"></el-input>
           </el-form-item>
         </el-col>
       </el-row>

src/views/dataAccessPage/components/accessPageTable.vue

@@ -228,7 +228,14 @@ export default {
       const { openmode, pageroute } = this.pageAuthBtnDel
       if (!openmode) return
       if (openmode != 2) this.autoBtnClick(openmode, pageroute)
-      this.$confirm('确认要删除这条信息吗?', '提示', {
+      let name = ''
+      const nrow = _.cloneDeep(row)
+      for (const key in nrow) {
+        if (key.includes('name')) {
+          name = nrow[key]
+        }
+      }
+      this.$confirm(`确认要删除 ${name} 这条信息吗?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/dataAccessPage/components/accessPageTree.vue

@@ -112,22 +112,34 @@ export default {
     },
 
     append () {
-      this.flag = true;
-      this.tableType = "add";
-      this.tableTitle = "新增-服务";
-      this.tableForm = {};
+      if (this.$refs['ruleForm']) {
+        this.$nextTick(() => {
+          this.$refs['ruleForm'].restForm()
+        })
+      }
+      this.flag = true
+      this.tableType = "add"
+      this.tableTitle = "新增-服务"
+      this.tableForm = {}
       // this.formItem = tableColumnArrs.filter(item => item.isdisplay == 1)
     },
 
     edit (data) {
-      this.flag = true;
-      this.tableType = "edit";
-      this.tableTitle = "编辑";
-      this.tableForm = _.cloneDeep(data);
+      this.flag = true
+      this.tableType = "edit"
+      this.tableTitle = "编辑-服务"
+      this.tableForm = _.cloneDeep(data)
     },
 
     remove (node, data) {
-      this.$confirm('确认要删除这条信息吗?', '提示', {
+      let name = ''
+      const nrow = _.cloneDeep(data)
+      for (const key in nrow) {
+        if (key.includes('name')) {
+          name = nrow[key]
+        }
+      }
+      this.$confirm(`确认要删除 ${name} 这条信息吗?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/tablePage/index.vue

@@ -274,6 +274,11 @@ export default {
           this.$message.error(message || '操作失败')
         }
       } else {
+        if (this.$refs['ruleForm']) {
+          this.$nextTick(() => {
+            this.$refs['ruleForm'].restForm()
+          })
+        }
         this.flag = true;
         this.tableType = "add"
         this.tableTitle = "新增"
@@ -359,7 +364,14 @@ export default {
       const { openmode, pageroute } = this.pageAuthBtnDel
       if (!openmode) return
       if (openmode != 2) this.autoBtnClick(openmode, pageroute)
-      this.$confirm('确认要删除这条信息吗?', '提示', {
+      let name = ''
+      const nrow = _.cloneDeep(row)
+      for (const key in nrow) {
+        if (key.includes('name')) {
+          name = nrow[key] || ''
+        }
+      }
+      this.$confirm(`确认要删除 ${name} 这条信息吗?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'