1013

ruoyi-ui/src/api/service/info.js

@@ -153,4 +153,11 @@ export function delGuan(id) {
     method: 'delete',
     params: id
   })
+}
+export function publishModel(query) {
+  return request({
+    url: "/model/info/publish",
+    method: "get",
+    params: query,
+  });
 }

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

@@ -101,11 +101,11 @@
           </el-table-column>
           <el-table-column prop="audit" label="发布状态" width="100">
             <template #default="scope">
-              <div style="text-align: center;display: flex;" v-if="scope.row.publish=='1'">
-                <el-tag class="ml-2" type="success">已发布</el-tag>
+              <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.publish=='1'">
+                已发布
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.publish=='0'||scope.row.publish==null">
-                <el-tag class="ml-2" type="danger">未发布</el-tag>
+              <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.publish=='0'||scope.row.publish==null">
+                未发布
               </div>
             </template>
           </el-table-column>
@@ -193,7 +193,20 @@
               <el-input v-model="auditRemark" style="width: 100%;" type="textarea"/>
             </el-form-item>
           </el-form>
-          
+          <div style="display: flex;font-size: 13px;align-items: center;line-height: 1.5;margin-left: 1%;margin-top: 5%;">
+            <div style="">
+              当前审核人：
+            </div>
+            <div>
+              {{userName}}
+            </div>
+            <div style="margin-left: 5%;">
+              当前日期：
+            </div>
+            <div>
+              {{date}}
+            </div>
+          </div>
           <template #footer>
             <span class="dialog-footer">
                 <el-button size="mini" @click="dialogVisibleTest = false">取消</el-button>
@@ -205,7 +218,7 @@
         </el-dialog>
         <el-dialog @close="clearFromLev" title="" v-model="dialogVisibleLevel" width="50%" destroy-on-close :key="tableKey">
           <el-table 
-          style="margin-top: 1%;width: 98%;"
+          style="margin-top: 1%;width: 98%;min-height: 400px;"
           :data="tableDataLog" 
           :cell-style="{ textAlign: 'center',padding:'2px 0' }"
           :header-cell-style="{ textAlign: 'center'}"
@@ -219,11 +232,11 @@
               </el-table-column>
               <el-table-column prop="audit" label="发布状态" width="100">
                 <template #default="scope">
-                  <div style="text-align: center;display: flex;" v-if="scope.row.publish=='1'">
-                    <el-tag class="ml-2" type="success">已发布</el-tag>
+                  <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.publish=='1'">
+                    已发布
                   </div>
-                  <div style="text-align: center;display: flex;" v-if="scope.row.publish=='0'||scope.row.publish==null">
-                    <el-tag class="ml-2" type="danger">未发布</el-tag>
+                  <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.publish=='0'||scope.row.publish==null">
+                    未发布
                   </div>
                 </template>
               </el-table-column>
@@ -242,8 +255,9 @@ import {getCatalog} from "@/api/service/catalog";
 import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
 import { reactive } from 'vue'
 import { changeSerShenhe } from "@/api/register/regCom";
-import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,serFabu } from "@/api/service/info";
+import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,publishModel } from "@/api/service/info";
 import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
+import { getUserProfile } from "@/api/system/user";
 import JsonViewer from 'vue-json-viewer'
 import 'vue-json-viewer/style.css' 
 import  JsonEditorVue from 'json-editor-vue3'
@@ -260,7 +274,9 @@ const detail = ref({
   rqtype:'',
   rptype:''
 })
-const publish = ref()
+const userName = ref('')
+const date = ref('')
+const publish = ref('1')
 const auditRemark = ref()
 const show1Lev = ref(true)
 const inputNode =ref('')
@@ -467,7 +483,7 @@ function showLog(row){
 }
 function saveShenhe(){
   parShenhe.value.publish = publish.value
-  publish(parShenhe).then(res=>{
+  publishModel(parShenhe).then(res=>{
     if(res.code===200){
       proxy.$modal.msgSuccess("已发布！");
       var par1  = {
@@ -774,6 +790,9 @@ function renameTreeProperties(tree) {
   return newTree;
 }
 function fetchData() {
+  getUserProfile().then(response => {
+    userName.value = response.data.userName
+  });
   getCatalog().then((r) => {
     parOptions.value = r.data
     cascaderOptions.value = renameTreeProperties(buildTree(r.data))
@@ -820,9 +839,20 @@ function addCanAdd(){
 function delCanAdd(index){
   tableDataCanAdd.value.splice(index, 1)
 }
+function getDate(){
+  const today = new Date();
+  const year = today.getFullYear();
+  // 月份加1并补零
+  const month = String(today.getMonth() + 1).padStart(2, '0');
+  // 日期补零
+  const day = String(today.getDate()).padStart(2, '0');
+  
+  date.value = `${year}-${month}-${day}`;
+}
 onMounted(() => {
   fetchData()
   getTreeLeft()
+  getDate()
 });
 
 </script>

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

@@ -101,11 +101,11 @@
           </el-table-column>
           <el-table-column prop="audit" label="发布状态" width="100">
             <template #default="scope">
-              <div style="text-align: center;display: flex;" v-if="scope.row.publish=='1'">
-                <el-tag class="ml-2" type="success">已发布</el-tag>
+              <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.publish=='1'">
+                已发布
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.publish=='0'||scope.row.publish==null">
-                <el-tag class="ml-2" type="danger">未发布</el-tag>
+              <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.publish=='0'||scope.row.publish==null">
+                未发布
               </div>
             </template>
           </el-table-column>
@@ -193,7 +193,20 @@
               <el-input v-model="auditRemark" style="width: 100%;" type="textarea"/>
             </el-form-item>
           </el-form>
-          
+          <div style="display: flex;font-size: 13px;align-items: center;line-height: 1.5;margin-left: 1%;margin-top: 5%;">
+            <div style="">
+              当前审核人：
+            </div>
+            <div>
+              {{userName}}
+            </div>
+            <div style="margin-left: 5%;">
+              当前日期：
+            </div>
+            <div>
+              {{date}}
+            </div>
+          </div>
           <template #footer>
             <span class="dialog-footer">
                 <el-button size="mini" @click="dialogVisibleTest = false">取消</el-button>
@@ -205,7 +218,7 @@
         </el-dialog>
         <el-dialog @close="clearFromLev" title="" v-model="dialogVisibleLevel" width="50%" destroy-on-close :key="tableKey">
           <el-table 
-          style="margin-top: 1%;width: 98%;"
+          style="margin-top: 1%;width: 98%;min-height: 400px;"
           :data="tableDataLog" 
           :cell-style="{ textAlign: 'center',padding:'2px 0' }"
           :header-cell-style="{ textAlign: 'center'}"
@@ -219,11 +232,11 @@
               </el-table-column>
               <el-table-column prop="audit" label="发布状态" width="100">
                 <template #default="scope">
-                  <div style="text-align: center;display: flex;" v-if="scope.row.publish=='1'">
-                    <el-tag class="ml-2" type="success">已发布</el-tag>
+                  <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.publish=='1'">
+                    已发布
                   </div>
-                  <div style="text-align: center;display: flex;" v-if="scope.row.publish=='0'||scope.row.publish==null">
-                    <el-tag class="ml-2" type="danger">未发布</el-tag>
+                  <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.publish=='0'||scope.row.publish==null">
+                    未发布
                   </div>
                 </template>
               </el-table-column>
@@ -242,8 +255,9 @@ import {getCatalog} from "@/api/service/catalog";
 import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
 import { reactive } from 'vue'
 import { changeSerShenhe } from "@/api/register/regCom";
-import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,serFabu } from "@/api/service/info";
+import { modelTreeSelect,getSerDe,addService,shenheLog,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,publishModel } from "@/api/service/info";
 import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
+import { getUserProfile } from "@/api/system/user";
 import JsonViewer from 'vue-json-viewer'
 import 'vue-json-viewer/style.css' 
 import  JsonEditorVue from 'json-editor-vue3'
@@ -260,7 +274,9 @@ const detail = ref({
   rqtype:'',
   rptype:''
 })
-const publish = ref()
+const userName = ref('')
+const date = ref('')
+const publish = ref('1')
 const auditRemark = ref()
 const show1Lev = ref(true)
 const inputNode =ref('')
@@ -467,7 +483,7 @@ function showLog(row){
 }
 function saveShenhe(){
   parShenhe.value.publish = publish.value
-  publish(parShenhe).then(res=>{
+  publishModel(parShenhe).then(res=>{
     if(res.code===200){
       proxy.$modal.msgSuccess("已发布！");
       var par1  = {
@@ -774,6 +790,9 @@ function renameTreeProperties(tree) {
   return newTree;
 }
 function fetchData() {
+  getUserProfile().then(response => {
+    userName.value = response.data.userName
+  });
   getCatalog().then((r) => {
     parOptions.value = r.data
     cascaderOptions.value = renameTreeProperties(buildTree(r.data))
@@ -820,9 +839,20 @@ function addCanAdd(){
 function delCanAdd(index){
   tableDataCanAdd.value.splice(index, 1)
 }
+function getDate(){
+  const today = new Date();
+  const year = today.getFullYear();
+  // 月份加1并补零
+  const month = String(today.getMonth() + 1).padStart(2, '0');
+  // 日期补零
+  const day = String(today.getDate()).padStart(2, '0');
+  
+  date.value = `${year}-${month}-${day}`;
+}
 onMounted(() => {
   fetchData()
   getTreeLeft()
+  getDate()
 });
 
 </script>

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

@@ -101,14 +101,14 @@
           </el-table-column>
           <el-table-column prop="audit" label="审核状态" width="100">
             <template #default="scope">
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='4'">
-                <el-tag class="ml-2" type="success">已审核</el-tag>
+              <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.audit=='4'">
+                已审核
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'||scope.row.audit==null">
-                <el-tag class="ml-2" type="danger">未审核</el-tag>
+              <div style="text-align: center;display: flex;color:#E6A23C" v-if="scope.row.audit=='3'||scope.row.audit==null">
+                未审核
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='0'">
-                <el-tag class="ml-2" type="warning">驳回</el-tag>
+              <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.audit=='0'">
+                驳回
               </div>
             </template>
           </el-table-column>
@@ -203,6 +203,12 @@
             <div>
               {{userName}}
             </div>
+            <div style="margin-left: 5%;">
+              当前日期：
+            </div>
+            <div>
+              {{date}}
+            </div>
           </div>
           <template #footer>
             <span class="dialog-footer">
@@ -215,7 +221,7 @@
         </el-dialog>
         <el-dialog @close="clearFromLev" draggable  :title="titleShen" v-model="dialogVisibleLevel" width="50%" destroy-on-close :key="tableKey">
           <el-table 
-          style="margin-top: 1%;width: 98%;"
+          style="margin-top: 1%;width: 98%;min-height: 400px;"
           :data="tableDataLog" 
           :cell-style="{ textAlign: 'center',padding:'2px 0' }"
           :header-cell-style="{ textAlign: 'center'}"
@@ -274,7 +280,7 @@ const detail = ref({
   rqtype:'',
   rptype:''
 })
-const audit = ref()
+const audit = ref('4')
 const titleShen = ref()
 const auditRemark = ref(null)
 const show1Lev = ref(true)
@@ -282,6 +288,7 @@ const inputNode =ref('')
 const isEdit = ref(true)
 const userName = ref()
 const dataReturn = ref('')
+const date = ref('')
 const optionsCan = ref([
   {
     label:"string",
@@ -847,9 +854,20 @@ function addCanAdd(){
 function delCanAdd(index){
   tableDataCanAdd.value.splice(index, 1)
 }
+function getDate(){
+  const today = new Date();
+  const year = today.getFullYear();
+  // 月份加1并补零
+  const month = String(today.getMonth() + 1).padStart(2, '0');
+  // 日期补零
+  const day = String(today.getDate()).padStart(2, '0');
+  
+  date.value = `${year}-${month}-${day}`;
+}
 onMounted(() => {
   fetchData()
   getTreeLeft()
+  getDate()
 });
 
 </script>

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

@@ -106,11 +106,11 @@
           </el-table-column>
           <el-table-column prop="audit" label="测试状态" width="100">
             <template #default="scope">
-              <div style="text-align: center;display: flex;" v-if="scope.row.testRunNum>0">
-                <el-tag class="ml-2" type="success">已测试</el-tag>
+              <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.testRunNum>0">
+                已测试
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
-                <el-tag class="ml-2" type="danger">未测试</el-tag>
+              <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
+                未测试
               </div>
             </template>
           </el-table-column>
@@ -200,7 +200,8 @@
             <div style="margin-left: 1%;">
               {{ detailJson.url }}
             </div>
-            <svg-icon @click="test" icon-class="startTest" style="margin-left: 1%;width: 50px;height: 25px;cursor: pointer;"/>
+            <!-- <svg-icon @click="test" icon-class="startTest" style="margin-left: 1%;width: 50px;height: 25px;cursor: pointer;"/> -->
+            <el-button @click="test" size="mini" type="primary" style="margin-left: 1%;cursor: pointer;" plain>点击测试</el-button>
           </div>
           <div style="margin-top:2%;font-size: 18px;">
             请求参数
@@ -255,11 +256,11 @@
                 </el-table-column>
                 <el-table-column prop="audit" label="测试状态" width="100">
                   <template #default="scope">
-                    <div style="text-align: center;display: flex;" v-if="scope.row.testRunNum>0">
-                      <el-tag class="ml-2" type="success">已测试</el-tag>
+                    <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.testRunNum>0">
+                      已测试
                     </div>
-                    <div style="text-align: center;display: flex;" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
-                      <el-tag class="ml-2" type="danger">未测试</el-tag>
+                    <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
+                      未测试
                     </div>
                   </template>
                 </el-table-column>

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

@@ -101,14 +101,14 @@
           </el-table-column>
           <el-table-column prop="audit" label="审核状态" width="100">
             <template #default="scope">
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='4'">
-                <el-tag class="ml-2" type="success">已审核</el-tag>
+              <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.audit=='4'">
+                已审核
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'||scope.row.audit==null">
-                <el-tag class="ml-2" type="danger">未审核</el-tag>
+              <div style="text-align: center;display: flex;color:#E6A23C" v-if="scope.row.audit=='3'||scope.row.audit==null">
+                未审核
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='0'">
-                <el-tag class="ml-2" type="warning">驳回</el-tag>
+              <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.audit=='0'">
+                驳回
               </div>
             </template>
           </el-table-column>
@@ -203,6 +203,12 @@
             <div>
               {{userName}}
             </div>
+            <div style="margin-left: 5%;">
+              当前日期：
+            </div>
+            <div>
+              {{date}}
+            </div>
           </div>
           <template #footer>
             <span class="dialog-footer">
@@ -215,7 +221,7 @@
         </el-dialog>
         <el-dialog @close="clearFromLev" draggable  :title="titleShen" v-model="dialogVisibleLevel" width="50%" destroy-on-close :key="tableKey">
           <el-table 
-          style="margin-top: 1%;width: 98%;"
+          style="margin-top: 1%;width: 98%;min-height: 400px;"
           :data="tableDataLog" 
           :cell-style="{ textAlign: 'center',padding:'2px 0' }"
           :header-cell-style="{ textAlign: 'center'}"
@@ -227,14 +233,14 @@
               </el-table-column>
               <el-table-column prop="audit" label="审核状态" width="100">
                 <template #default="scope">
-                  <div style="text-align: center;display: flex;" v-if="scope.row.audit=='4'">
-                    <el-tag class="ml-2" type="success">已审核</el-tag>
+                  <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.audit=='4'">
+                    已审核
                   </div>
-                  <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'||scope.row.audit==null">
-                    <el-tag class="ml-2" type="danger">未审核</el-tag>
+                  <div style="text-align: center;display: flex;color:#E6A23C" v-if="scope.row.audit=='3'||scope.row.audit==null">
+                    未审核
                   </div>
-                  <div style="text-align: center;display: flex;" v-if="scope.row.audit=='0'">
-                    <el-tag class="ml-2" type="warning">驳回</el-tag>
+                  <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.audit=='0'">
+                    驳回
                   </div>
                 </template>
               </el-table-column>
@@ -274,7 +280,7 @@ const detail = ref({
   rqtype:'',
   rptype:''
 })
-const audit = ref()
+const audit = ref('4')
 const titleShen = ref()
 const auditRemark = ref(null)
 const show1Lev = ref(true)
@@ -282,6 +288,7 @@ const inputNode =ref('')
 const isEdit = ref(true)
 const userName = ref()
 const dataReturn = ref('')
+const date = ref('')
 const optionsCan = ref([
   {
     label:"string",
@@ -743,7 +750,7 @@ async function handleNodeClick(node,data,event){
       value:'2',
       label:'XML'
     },
-    { 
+    {
       value:'3',
       label:'HTML'
     }
@@ -847,9 +854,20 @@ function addCanAdd(){
 function delCanAdd(index){
   tableDataCanAdd.value.splice(index, 1)
 }
+function getDate(){
+  const today = new Date();
+  const year = today.getFullYear();
+  // 月份加1并补零
+  const month = String(today.getMonth() + 1).padStart(2, '0');
+  // 日期补零
+  const day = String(today.getDate()).padStart(2, '0');
+  
+  date.value = `${year}-${month}-${day}`;
+}
 onMounted(() => {
   fetchData()
   getTreeLeft()
+  getDate()
 });
 
 </script>

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

@@ -106,11 +106,11 @@
           </el-table-column>
           <el-table-column prop="audit" label="测试状态" width="140">
             <template #default="scope">
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='3'">
-                <el-tag class="ml-2" type="success">已测试</el-tag>
+              <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.testRunNum>0">
+                已测试
               </div>
-              <div style="text-align: center;display: flex;" v-if="scope.row.audit=='2'||scope.row.audit==null">
-                <el-tag class="ml-2" type="danger">未测试</el-tag>
+              <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
+                未测试
               </div>
             </template>
           </el-table-column>
@@ -200,7 +200,8 @@
             <div style="margin-left: 1%;">
               {{ detailJson.url }}
             </div>
-            <svg-icon @click="test" icon-class="startTest" style="margin-left: 1%;width: 50px;height: 25px;cursor: pointer;"/>
+            <!-- <svg-icon @click="test" icon-class="startTest" style="margin-left: 1%;width: 50px;height: 25px;cursor: pointer;"/> -->
+             <el-button @click="test" size="mini" type="primary" style="margin-left: 1%;cursor: pointer;" plain>点击测试</el-button>
           </div>
           <div style="margin-top:2%;font-size: 18px;">
             请求参数
@@ -255,11 +256,11 @@
                 </el-table-column>
                 <el-table-column prop="audit" label="测试状态" width="100">
                   <template #default="scope">
-                    <div style="text-align: center;display: flex;" v-if="scope.row.testRunNum>0">
-                      <el-tag class="ml-2" type="success">已测试</el-tag>
+                    <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.testRunNum>0">
+                      已测试
                     </div>
-                    <div style="text-align: center;display: flex;" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
-                      <el-tag class="ml-2" type="danger">未测试</el-tag>
+                    <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.testRunNum==0||scope.row.testRunNum==null">
+                      未测试
                     </div>
                   </template>
                 </el-table-column>

ruoyi-ui/src/views/standardization/modeling/index.vue

@@ -1179,9 +1179,9 @@ const toImage = async () => {
   status.value = '生成图片中...';
   try {
     const canvas = await html2canvas(flowContainer.value, {
-      backgroundColor: '#fff', // 白底背景
-      scale: 2, // 提高导出清晰度
-      useCORS: true, // 支持跨域图片
+      backgroundColor: '#fff',
+      scale: 2,
+      useCORS: true,
     });
     
     // 生成下载链接