0803

ruoyi-ui/src/views/register/modelData/dataJi.vue

@@ -15,7 +15,7 @@
                 <svg-icon icon-class="model2" style="color: red;" v-if="data.nodeType=='TREE'"/>
                 <span style="font-size: 1rem;">{{ node.label }}</span>
               </div>
-              <div style="margin-right: 1%;position: absolute;left:80%;">
+              <div style="margin-right: 1%;position: absolute;left:90%;">
                 <el-dropdown trigger="hover" @click.stop v-if="currentNodeKey === data.id">
                     <!-- <el-icon class="el-icon--right" style="color: black;">
                       <plus />
@@ -218,12 +218,12 @@
       <el-form-item label="名称:" prop="itemName" style="">
         <el-input v-model="formTree.itemName" style="width: 75%;" placeholder=""  resize="none"/>
       </el-form-item>
-      <el-form-item label="排序:" prop="itemNo">
-        <el-input-number v-model="formZu.itemNo" :min="1" style="width: 50%;"/>
-      </el-form-item>
       <el-form-item label="说明:" prop="itemNotes">
         <el-input v-model="formTree.itemNotes" style="width: 75%;" placeholder=""  resize="none"/>
       </el-form-item>
+      <el-form-item label="排序:" prop="itemNo">
+        <el-input-number v-model="formZu.itemNo" :min="1" style="width: 50%;"/>
+      </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">

ruoyi-ui/src/views/service/info/editModel.vue

@@ -200,14 +200,14 @@
                                 <el-table-column prop="itemName" label="参数字段">
                                     <template #default="scope">
                                         <div style="width: 100%;">
-                                            <el-input  placeholder="请填写参数编码" type="primary" class="noBor" v-model="scope.row.paramCode" size="mini" text style="margin-left: 0%;border: transparent;"></el-input>
+                                            <el-input  placeholder="请填写参数编码" type="primary" class="noBor" v-model="scope.row.parCode" size="mini" text style="margin-left: 0%;border: transparent;"></el-input>
                                         </div>
                                     </template>
                                 </el-table-column>
                                 <el-table-column prop="itemName" label="参数名称">
                                     <template #default="scope">
                                         <div style="width: 100%;">
-                                            <el-input placeholder="请填写参数名称" type="primary" class="noBor" v-model="scope.row.itemName" size="mini" text style="margin-left: 0%;"></el-input>
+                                            <el-input placeholder="请填写参数名称" type="primary" class="noBor" v-model="scope.row.parName" size="mini" text style="margin-left: 0%;"></el-input>
                                         </div>
                                     </template>
                                 </el-table-column>
@@ -215,7 +215,7 @@
                                     <template #default="scope">
                                         <div style="width: 100%;">
                                             <el-select
-                                            v-model="scope.row.paramType"
+                                            v-model="scope.row.parType"
                                             class="noBorSel"
                                             placeholder=""
                                             style="width: 100%;margin-left: 0%;"
@@ -233,7 +233,7 @@
                                 <el-table-column prop="itemName" label="参数说明" >
                                     <template #default="scope">
                                         <div style="width: 100%;">
-                                            <el-input type="primary" class="noBor" v-model="scope.row.paramNote" size="mini" text style="margin-left: 0%;"></el-input>
+                                            <el-input type="primary" class="noBor" v-model="scope.row.parNote" size="mini" text style="margin-left: 0%;"></el-input>
                                         </div>
                                     </template>
                                 </el-table-column>
@@ -655,10 +655,10 @@ const parTree = ref({})
 const valueKet = ref(0)
 const tableDataCan = ref([
     {
-      itemName:'',
-      itemCode:'',
-      paramType:'',
-      paramNote:''
+      parName:'',
+      parCode:'',
+      parType:'',
+      parNote:''
     }
 ])
 const optionsMdid = ref([])

ruoyi-ui/src/views/service/info/index.vue

@@ -377,14 +377,14 @@
                                 <el-table-column prop="itemName" label="参数字段">
                                     <template #default="scope">
                                         <div style="width: 100%;">
-                                            <el-input placeholder="请填写参数编码" type="primary" class="noBor" v-model="scope.row.paramCode" size="mini" text style="margin-left: 0%;border: transparent;"></el-input>
+                                            <el-input placeholder="请填写参数编码" type="primary" class="noBor" v-model="scope.row.parCode" size="mini" text style="margin-left: 0%;border: transparent;"></el-input>
                                         </div>
                                     </template>
                                 </el-table-column>
                                 <el-table-column prop="itemName" label="参数名称">
                                     <template #default="scope">
                                         <div style="width: 100%;">
-                                            <el-input placeholder="请填写参数名称" type="primary" class="noBor" v-model="scope.row.paramName" size="mini" text style="margin-left: 0%;"></el-input>
+                                            <el-input placeholder="请填写参数名称" type="primary" class="noBor" v-model="scope.row.parName" size="mini" text style="margin-left: 0%;"></el-input>
                                         </div>
                                     </template>
                                 </el-table-column>
@@ -392,7 +392,7 @@
                                     <template #default="scope">
                                         <div style="width: 100%;">
                                             <el-select
-                                            v-model="scope.row.paramType"
+                                            v-model="scope.row.parType"
                                             class="noBorSel"
                                             placeholder=""
                                             style="width: 100%;margin-left: 0%;"
@@ -410,7 +410,7 @@
                                 <el-table-column prop="itemName" label="参数说明" >
                                     <template #default="scope">
                                         <div style="width: 100%;">
-                                            <el-input type="primary" class="noBor" v-model="scope.row.paramNote" size="mini" text style="margin-left: 0%;"></el-input>
+                                            <el-input type="primary" class="noBor" v-model="scope.row.parNote" size="mini" text style="margin-left: 0%;"></el-input>
                                         </div>
                                     </template>
                                 </el-table-column>
@@ -991,7 +991,7 @@ function delCan(index){
 }
 function addCanAdd(){
     var par = {
-        itemName:''
+        parName:''
     }
     tableDataCanAdd.value.push(par)
 }