1015

ruoyi-ui/src/views/service/fabu/fabu.vue

@@ -565,6 +565,8 @@ function clearAdd(){
   tableDataCan.value = [
   ]
   dataReturn.value = ''
+  auditRemark.value = ''
+  publish.value = '1'
 }
 function extractModelNodesDFSIterative(root) {
   const result = [];

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

@@ -102,8 +102,8 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="cateCode" label="服务分类" width="140" show-overflow-tooltip>
-          </el-table-column>
+          <!-- <el-table-column prop="cateCode" label="服务分类" width="140" show-overflow-tooltip>
+          </el-table-column> -->
           <el-table-column prop="address" label="操作" width="150">
               <template #default="scope">
                   <div style="display: flex;justify-content: space-between;width: 100%;">
@@ -225,10 +225,10 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="服务分类:" prop="cateCode" style="">
+                <!-- <el-form-item label="服务分类:" prop="cateCode" style="">
                   <el-cascader v-model="formAdd.cateCode" :options="cascaderOptions" :props="props1" clearable
                                style="width: 100%;"></el-cascader>
-                </el-form-item>
+                </el-form-item> -->
               </el-col>
               <!-- <el-col :span="8">
                   <el-form-item label="请求方式:" prop="name" style="">
@@ -570,10 +570,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="服务分类:" prop="cateCode" style="">
+              <!-- <el-form-item label="服务分类:" prop="cateCode" style="">
                 <el-cascader :disabled="isEdit" v-model="formJi.cateCode" :options="cascaderOptions" clearable
                              style="width: 100%;"></el-cascader>
-              </el-form-item>
+              </el-form-item> -->
             </el-col>
             <!-- <el-col :span="8">
                 <el-form-item label="请求方式:" prop="name" style="">
@@ -1010,7 +1010,7 @@ const formJi = ref({
 const rulesJi = reactive({
   name: [{required: true, message: '必填', trigger: 'blur'}],
   url: [{required: true, message: '必填', trigger: 'blur'}],
-  cateCode: [{required: true, message: '必填', trigger: 'blur'}],
+  // cateCode: [{required: true, message: '必填', trigger: 'blur'}],
 });
 const byWhich = ref('tree');
 const formRefJi = ref();
@@ -1029,7 +1029,7 @@ const rulesAdd = reactive({
   mdid: [{required: true, message: '必填', trigger: 'blur'}],
   name: [{required: true, message: '必填', trigger: 'blur'}],
   url: [{required: true, message: '必填', trigger: 'blur'}],
-  cateCode: [{required: true, message: '必填', trigger: 'blur'}],
+  // cateCode: [{required: true, message: '必填', trigger: 'blur'}],
 });
 const formRefAdd = ref();
 const treeRef = ref(null);

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

@@ -565,6 +565,8 @@ function clearAdd(){
   tableDataCan.value = [
   ]
   dataReturn.value = ''
+  auditRemark.value = ''
+  publish.value = '1'
 }
 function extractModelNodesDFSIterative(root) {
   const result = [];

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

@@ -96,8 +96,8 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="cateCode" label="服务分类" width="140" show-overflow-tooltip>
-          </el-table-column>
+          <!-- <el-table-column prop="cateCode" label="服务分类" width="140" show-overflow-tooltip>
+          </el-table-column> -->
           <el-table-column prop="address" label="操作" width="100">
               <template #default="scope">
                   <!-- <div style="display: flex;justify-content: space-between;width: 100%;">

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

@@ -582,6 +582,8 @@ function clearAdd(){
   tableDataCan.value = [
   ]
   dataReturn.value = ''
+  auditRemark.value = ''
+  audit.value = '4'
 }
 function extractModelNodesDFSIterative(root) {
   const result = [];

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

@@ -107,10 +107,10 @@
           <el-table-column prop="audit" label="测试状态" width="100">
             <template #default="scope">
               <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.testRunNum>0">
-                已测试
+                测试成功
               </div>
               <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
-                未测试
+                测试失败
               </div>
             </template>
           </el-table-column>
@@ -265,6 +265,14 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="errorMessage" label="错误信息" show-overflow-tooltip>
+                  <template #default="scope">
+                    <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.errorMessage!==null">
+                      {{scope.row.errorMessage}}
+                    </div>
+                    <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.senState==null">
+                      /
+                    </div>
+                  </template>
                 </el-table-column>
             </el-table>
           <template #footer>

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

@@ -582,6 +582,8 @@ function clearAdd(){
   tableDataCan.value = [
   ]
   dataReturn.value = ''
+  auditRemark.value = ''
+  audit.value = '4'
 }
 function extractModelNodesDFSIterative(root) {
   const result = [];

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

@@ -257,14 +257,22 @@
                 <el-table-column prop="audit" label="测试状态" width="100">
                   <template #default="scope">
                     <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.senState=='0'">
-                      已测试
+                      测试成功
                     </div>
                     <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.senState=='1'">
-                      未测试
+                      测试失败
                     </div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="errorMessage" label="错误信息" show-overflow-tooltip>
+                  <template #default="scope">
+                    <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.errorMessage!==null">
+                      {{scope.row.errorMessage}}
+                    </div>
+                    <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.senState==null">
+                      /
+                    </div>
+                  </template>
                 </el-table-column>
             </el-table>
           <template #footer>