Hua 3 months ago
parent
commit
543b75f3f8

+ 3 - 3
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -115,17 +115,17 @@ function hasTitle(title) {
 <style scoped>
 /* 修改子菜单标题文字 */
 .subMenu :deep(.el-sub-menu__title) {
-  font-size: 16px !important;
+  font-size: 15px !important;
 }
 
 /* 修改菜单项文字(含嵌套子菜单) */
 .subMenu :deep(.el-menu-item),
 .subMenu :deep(.el-sub-menu__title) {
-  font-size: 16px !important;
+  font-size: 15px !important;
 }
 
 /* 修改标题文本(针对用户代码中的 .menu-title) */
 .subMenu :deep(.menu-title) {
-  font-size: 16px !important;
+  font-size: 15px !important;
 }
 </style>

+ 10 - 3
ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -16,7 +16,7 @@
           <el-menu
               :default-active="activeMenu"
               class="custom-menu"
-              style="margin-top: 1%;"
+              style="margin-top: 1%;font-size: 14px"
               :collapse="isCollapse"
               :background-color="sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
               :text-color="sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
@@ -26,7 +26,7 @@
               mode="horizontal"
           >
             <sidebar-item
-                style="margin-top: -0.7%;"
+                style="margin-top: -0.7%;font-size: 14px"
                 v-for="(route, index) in sidebarRouters"
                 :key="route.path + index"
                 :item="route"
@@ -176,9 +176,16 @@ function handleCommand(command) {
 </style>
 <style scoped>
 /* 深度穿透修改 */
+:deep(.el-sub-menu__title .el-tooltip__trigger .el-tooltip__trigger){
+  font-size: 14px !important;
+}
+:deep(.menu-title){
+  font-size: 14px !important;
+  
+}
 :deep(.custom-menu .el-menu-item),
 :deep(.custom-menu .el-submenu__title) {
-  font-size: 16px !important;
+  font-size: 14px !important;
 }
 </style>
 

+ 1156 - 0
ruoyi-ui/src/views/dpp/calculateDev/index.vue

@@ -0,0 +1,1156 @@
+<template>
+    <!-- 测试devkind = 'SYS' -->
+  <div style="width: 100%;;display: flex;">
+    <div style="width: 15%;;background-color: #F2F6FC;max-height: 85vh;overflow: auto;">
+      <div style="display: flex;padding-top: 1%;padding-top: 5%;">
+        <el-input
+          v-model="inputNode"
+          style="width:90%;margin-left: 5%;background-color: #ebeef5;"
+          class="w-50 m-2"
+          :prefix-icon="Search" 
+        />
+        <!-- <el-button style="margin-left: 2%;width: 10%;background-color: #F7F7F7" :icon="Filter"/> -->
+        <!-- <el-button type="primary" @click="showAdd" style="margin-left: 5%;width: 10%;" :icon="Plus"/> -->
+      </div>
+      <!-- <Plus style="width: 1em; height: 1em; margin-left:90%;cursor: pointer;color: #337ecc;" @click="showAddTree"/> -->
+      <el-tree :expand-on-click-node="false" ref="treeRef" :filter-node-method="filterNode" :current-node-key="currentNodeKey" class="treeLeft" :data="data" @node-click="handleNodeClick" node-key="id" style="margin-left: 5%;margin-top: 5%;width: 90%;background-color: transparent;" default-expand-all :key="valueKet">
+          <template #default="{ node, data }">
+            <span  style="justify-content: space-between;display: flex;width: 100%;align-items: center;">
+              <div class="custom-tree-node">
+                   <svg-icon icon-class="model2" style="color: #eebe77;" v-if="data.nodeType=='MODEL'"/>
+                  <svg-icon icon-class="model" dstyle="color: #13E03B;" v-if="data.nodeType=='SERVICE'"/>
+                  <svg-icon svg-icon icon-class="cate" style="color: red;" v-if="data.nodeType=='TREE'"/>
+                <span>{{ node.label }}</span>
+              </div>
+              <!-- <div style="margin-right: 1%;position: absolute;margin-left: 75%;">
+                <el-dropdown trigger="hover" @click.stop v-if="currentNodeKey === data.id&&data.nodeType!=='SERVICE'">
+                    <el-icon class="el-icon--right" style="color: black;">
+                      <plus />
+                    </el-icon>
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item style="display: flex;" @click="add1Level">
+                        <el-icon class="el-icon--right" style="color: black;">
+                          <CirclePlus />
+                        </el-icon>
+                        <div>
+                          添加同级
+                        </div>
+                      </el-dropdown-item>
+                      <el-dropdown-item style="display: flex;"  @click="addNextLevel">
+                        <el-icon class="el-icon--right" style="color: black;">
+                          <Connection />
+                        </el-icon>
+                        <div>
+                          新建下级
+                        </div>
+                      </el-dropdown-item>
+                      <divider/>
+                      <el-dropdown-item style="display: flex;"  @click="delAll" divided>
+                        <el-icon class="el-icon--right" style="color: black;">
+                          <CircleClose />
+                        </el-icon>
+                        <div>
+                          删除节点
+                        </div>
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </div> -->
+            </span>
+          </template>
+        </el-tree>
+    </div>
+    <el-tabs
+      v-model="activeName"
+      type="card"
+      class="demo-tabs"
+      style="margin-left: 1%;width: 84%;"
+      @tab-click="handleClick"
+    >
+      <el-tab-pane label="任务详情" name="first">
+        <el-button  @click="addTask" style="margin-top: 0%;margin-right: 1%;float:right;" type="primary" size="mini" plain>新增</el-button>
+        <div style="width: 100%;margin-left: 0%;padding-top: 0%;" class="tab-container">
+        <div>
+          <el-table 
+            :data="tableData" 
+            style="width: 98%;margin-left: 1%;margin-top: 0.5%;"
+            :cell-style="{ padding:'5px' }"
+            :header-cell-style="{height: heightAll*0.01+'px',}"
+            :row-style="{ fontSize: '16px',textAlign:'center'}"
+            border >
+            <el-table-column type="index" label="序号" width="80">
+              <template #default="{ $index }">
+                <div style="text-align: center;">
+                  {{ $index + 1 }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="任务名称"  width="200">
+              <template #default="scope">
+                <div style="color: #409EFF;cursor: pointer;" @click="showDe(scope.row)">
+                  {{scope.row.name}}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="type" label="建模方案"  width="200">
+            </el-table-column>
+            <el-table-column prop="url" label="责任人" width="200"  show-overflow-tooltip/>
+            <el-table-column prop="rqtype" label="联系方式" />
+            <el-table-column prop="address" label="操作" width="150">
+                <template #default="scope">
+                    <div style="display: flex;">
+                      <el-button @click="testSer(scope.row)" type="primary" text size="mini" style="margin-left: 0%;">测试</el-button>
+                      <el-button @click="showLog(scope.row)" type="primary" text size="mini" style="margin-left: 0%;">日志</el-button>
+                    </div>
+                </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <el-dialog @close="clearAdd" v-model="dialogVisible" title="" width="60%" destroy-on-close :key="tableKey">
+          <div style="display: flex;align-items: center;">
+            <div v-if="detailJson.rqtype==='GET'">
+              <el-tag class="ml-2" type="warning">GET</el-tag>
+            </div>
+            <div v-if="detailJson.rqtype==='POST'">
+              <el-tag class="ml-2" type="warning">POST</el-tag>
+            </div>
+            <div style="margin-left: 1%;">
+              {{ detailJson.name }}:
+            </div>
+            <div style="margin-left: 1%;">
+              {{ detailJson.url }}
+            </div>
+          </div>
+          <el-descriptions style="margin-top: 1%;" :column="3" border>
+            <el-descriptions-item label="接口类型">{{ detailJson.type }}</el-descriptions-item>
+            <el-descriptions-item label="请求方式">{{ detailJson.rqtype }}</el-descriptions-item>
+            <el-descriptions-item label="响应类型">{{ detailJson.rptype }}</el-descriptions-item>
+            <el-descriptions-item label="服务分类">{{ detailJson.cateCode }}</el-descriptions-item>
+          </el-descriptions>
+          <div style="margin-top:4%;font-size: 18px;">
+            请求参数
+          </div>
+           <el-table 
+            style="margin-top: 1%;width: 98%;"
+            :data="tableDataCan" 
+            :cell-style="{ textAlign: 'center',padding:'2px 0' }"
+            :header-cell-style="{ textAlign: 'center'}"
+            :row-style="{ height: heightAll*0.01+'px',fontSize: '16px',textAlign:'center'  }"
+            border >
+                <el-table-column prop="paramCode" label="参数字段">
+                </el-table-column>
+                <el-table-column prop="paramName" label="参数名称">
+                </el-table-column>
+                <el-table-column prop="paramType" label="参数类型" width="200">
+                </el-table-column>
+                <el-table-column prop="paramValue" label="参数示例">
+                  
+                </el-table-column>
+                <el-table-column prop="paramNote" label="参数说明" show-overflow-tooltip>
+                </el-table-column>
+            </el-table>
+            <div style="margin-top:4%;font-size: 18px;">
+              返回参数
+            </div>
+            <el-input readonly  placeholder="" :rows="8" type="textarea" v-model="dataJsonXiang" size="mini" text style="margin-top: 1%;width: 98%;" ></el-input>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button type="primary" @click="dialogVisible = false" size="mini">
+                确定
+              </el-button>
+            </span>
+          </template>
+        </el-dialog>
+        <el-dialog @close="clearAdd" v-model="dialogVisibleTest" draggable :title="titleTest" width="60%" destroy-on-close :key="tableKey">
+          <el-form  size="mini"  style="margin-top: 0%;width: 98%;"  :model="formJi" label-position="right" ref="formRefJi" label-width="120px" :rules="rulesJi">
+            <el-row :gutter="24">
+                    <el-col :span="8">
+                    <el-form-item label="任务名称:" prop="jobName" style="">
+                        <div style="display: flex;width: 100%;justify-content: space-between;">
+                            <el-input  v-model="formJi.jobName" style="width: 100%;"/>
+                        </div>
+                    </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                    <el-form-item label="组名称:" prop="groupName" style="">
+                        <div style="display: flex;width: 100%;justify-content: space-between;">
+                            <el-input :disabled="!isAddTa" v-model="formJi.groupName" style="width: 100%;"/>
+                        </div>
+                    </el-form-item>
+                    </el-col>
+                    
+            </el-row>
+            <el-row :gutter="48">
+                <el-col :span="15">
+                </el-col>
+            </el-row>
+            <el-row :gutter="48">
+                <el-col :span="8">
+                    <el-form-item label="负责人:" prop="" style="">
+                        <div style="display: flex;width: 100%;justify-content: space-between;">
+                            <el-input  v-model="formJi.ownerName" style="width: 100%;"/>
+                        </div>
+                    </el-form-item>
+                    </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系方式" prop="" style="">
+                      <div style="display: flex;width: 100%;justify-content: space-between;">
+                          <el-input  v-model="formJi.ownerName" style="width: 100%;"/>
+                      </div>
+                  </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="48">
+                <el-col :span="8">
+                    <el-form-item label="任务类型:" prop="taskType">
+                        <el-select
+                        v-model="formJi.taskType"
+                        class=""
+                        placeholder=""
+                        style="width: 100%;margin-left: 0%;"
+                        >
+                            <el-option
+                            v-for="item in optionsTaskType"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <div style="margin-top: 0%;">
+                <el-row :gutter="48">
+                    <el-col :span="8">
+                        <el-form-item label="路由策略:" prop="routeKey">
+                            <el-select
+                            v-model="formJi.routeKey"
+                            class=""
+                            placeholder=""
+                            style="width: 100%;margin-left: 0%;"
+                            >
+                              <el-option label="Hash" :value="1" />
+                              <el-option label="随机" :value="2" />
+                              <el-option label="LRU" :value="3" />
+                              <el-option label="轮询" :value="4" />
+                              <el-option label="匹配第一个" :value="5" />
+                              <el-option label="匹配最后一个" :value="6" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="阻塞策略:" prop="blockStrategy">
+                            <el-select
+                            v-model="formJi.blockStrategy"
+                            class=""
+                            placeholder=""
+                            style="width: 100%;margin-left: 0%;"
+                            >
+                              <el-option label="丢弃" :value="1" />
+                              <el-option label="覆盖" :value="2" />
+                              <el-option label="并行" :value="3" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="48">
+                    <el-col :span="8">
+                        <el-form-item label="触发类型:" prop="triggerType">
+                            <el-select
+                            v-model="formJi.triggerType"
+                            class=""
+                            placeholder=""
+                            style="width: 100%;margin-left: 0%;"
+                            >
+                              <el-option label="固定时间" :value="2" />
+                              <el-option label="CRON 表达式" :value="3" />
+                              <el-option label="工作流" :value="99" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="间隔时长:" prop="triggerInterval">
+                            <el-input-number
+                                v-model="formJi.triggerInterval"
+                                style="width: 100%;"
+                                class="mx-4"
+                                :min="1"
+                                :max="10"
+                                controls-position="right"
+                                @CHANGE="handleChange"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="48">
+                    <el-col :span="8">
+                        <el-form-item label="超时时间(秒):" prop="executorTimeout">
+                            <el-input-number
+                                v-model="formJi.executorTimeout"
+                                style="width: 100%;"
+                                class="mx-4"
+                                :min="1"
+                                :max="10"
+                                controls-position="right"
+                                @change="handleChange"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="最大重试次数:" prop="maxRetryTimes">
+                            <el-input-number
+                                v-model="formJi.maxRetryTimes"
+                                style="width: 100%;"
+                                class="mx-4"
+                                :min="1"
+                                :max="10"
+                                controls-position="right"
+                                @change="handleChange"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="48">
+                    <el-col :span="8">
+                        <el-form-item label="重试间隔:" prop="retryInterval">
+                            <el-input-number
+                                v-model="formJi.retryInterval"
+                                style="width: 100%;"
+                                class="mx-4"
+                                :min="1"
+                                :max="10"
+                                controls-position="right"
+                                @change="handleChange"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item label="描述:" >
+                    <el-input v-model="formJi.description" style="width: 75%;" placeholder="" type="textarea" :row="2" resize="none"/>
+                </el-form-item>
+            </div>
+        </el-form>
+        </el-dialog>
+        <el-dialog @close="clearFromLev" :title="titleTest" v-model="dialogVisibleLevel" width="50%" destroy-on-close :key="tableKey">
+          <el-table 
+            style="margin-top: 1%;width: 98%;"
+            :data="tableDataLog" 
+            :cell-style="{ textAlign: 'center',padding:'2px 0' }"
+            :header-cell-style="{ textAlign: 'center'}"
+            :row-style="{ height: heightAll*0.01+'px',fontSize: '16px',textAlign:'center'  }"
+            border >
+                <el-table-column prop="createBy" label="测试发起人">
+                </el-table-column>
+                <el-table-column prop="runTm" label="测试时间">
+                </el-table-column>
+                <el-table-column prop="execTm" label="测试耗时" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="returnData" label="测试返回结果" show-overflow-tooltip>
+                </el-table-column>
+                <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==1">
+                      已测试
+                    </div>
+                    <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.senState==0">
+                      测试失败
+                    </div>
+                    <div style="text-align: center;display: flex;color:#E6A23C" v-if="scope.row.senState==null">
+                      未测试
+                    </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:#F56C6C" v-if="scope.row.errorMessage!==null">
+                      {{scope.row.errorMessage}}
+                    </div>
+                    <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.errorMessage==null">
+                      /
+                    </div>
+                  </template>
+                </el-table-column>
+            </el-table>
+          <template #footer>
+              <span class="dialog-footer">
+                <el-button type="primary" @click="dialogVisibleLevel = false" size="mini">
+                  确定
+                </el-button>
+            </span>
+          </template>
+        </el-dialog>
+        <el-dialog  v-model="dialogVisibleDe" title="" width="50%" @close="" destroy-on-close class="custom-dialog-bg">
+          <el-form size="mini" :key="tableKey" style="margin-top:1%;width: 100%;" :model="formJi" label-position="right"
+                 ref="formRefJi" label-width="120px" :rules="rulesJi">
+            <el-row :gutter="48">
+              <el-col :span="10">
+                <el-form-item label="服务名称:" prop="name" style="">
+                  {{formJi.name}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="接口类型:" prop="" style="">
+                  <div style="display: flex;width: 100%;justify-content: space-between;">
+                    {{formJi.type}}
+                  </div>
+
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="48">
+              <el-col :span="20">
+                <el-form-item label="接口地址:" prop="url" style="">
+                  {{formJi.url}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="请求方式:" prop="" style="">
+                  {{formJi.rqtype}}
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="48">
+              <el-col :span="10">
+                <el-form-item label="响应类型:" prop="" style="display: flex; align-items: center;">
+                  {{formJi.rptype}}
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item label="服务分类:" prop="cateCode" style="">
+                  {{formJi.cateCode}}
+                  <!-- <el-cascader :disabled="isEdit" v-model="formJi.cateCode" :options="cascaderOptions" clearable
+                              style="width: 100%;"></el-cascader> -->
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="48">
+              <el-col :span="13">
+                <el-form-item label="服务说明:">
+                  {{formJi.intro}}
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-dialog>
+    </div>
+      </el-tab-pane>
+      <el-tab-pane label="执行结果" name="second">
+        <el-table 
+          :data="tableData" 
+          style="width: 98%;margin-left: 1%;margin-top: 0.5%;"
+          :cell-style="{ padding:'5px' }"
+          :header-cell-style="{height: heightAll*0.01+'px',}"
+          :row-style="{ fontSize: '16px',textAlign:'center'}"
+          border >
+          <el-table-column type="index" label="序号" width="80">
+            <template #default="{ $index }">
+              <div style="text-align: center;">
+                {{ $index + 1 }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="执行次数"  width="200">
+            <template #default="scope">
+              <div style="color: #409EFF;cursor: pointer;" @click="showDe(scope.row)">
+                {{scope.row.name}}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="type" label="执行结果"  width="200">
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    
+  </div>
+</template>
+<script   setup>
+import {getCatalog} from "@/api/service/catalog";
+import { Plus,Search,Filter,Promotion,Check  } from '@element-plus/icons-vue'
+import { reactive } from 'vue'
+import {getModellist} from '@/api/standardization/modeling'
+import { modelTreeSelect,getSerDe,addService,addServiceParam,delService,addTree,deTree,getServiceInfo,testService,testLog } from "@/api/service/info";
+import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
+import JsonViewer from 'vue-json-viewer'
+import 'vue-json-viewer/style.css' 
+import  JsonEditorVue from 'json-editor-vue3'
+import { cloneDeep } from 'lodash'
+import { useClipboard } from "@vueuse/core";
+
+const titleTest = ref('')
+const { proxy } = getCurrentInstance();
+const JsonAdd= ref(JSON.stringify({ data: "初始值1" }))
+const exampleAdd = ref('')
+const dialogVisibleLevel = ref(false)
+const dialogVisibleDe = ref(false)
+const detail = ref({
+  name:'',
+  rqtype:'',
+  rptype:''
+})
+const tableDataLog = ref([])
+const show1Lev = ref(true)
+const inputNode =ref('')
+const isEdit = ref(true)
+const dataReturn = ref('')
+
+const optionsCan = ref([
+  {
+    label:"string",
+    value:'string'
+  },
+  {
+    label:"int",
+    value:'int'
+  },
+  {
+    label:"boolean",
+    value:'boolean'
+  },
+  {
+    label:"array",
+    value:'array'
+  },
+  {
+    label:"object",
+    value:'object'
+  },
+  {
+    label:"number",
+    value:'number'
+  },
+  {
+    label:"null",
+    value:'null'
+  },
+  {
+    label:"any",
+    value:'any'
+  },
+  
+])
+const currentNodeKey = ref('')
+const options =  ref([
+    {label:'开发中',
+    value:'1'
+    },
+    {label:'运行中',
+    value:'2'
+    },
+])
+const dataJsonXiang = ref([])
+const parTree = ref({})
+const valueKet = ref(0)
+const tableDataCan = ref([
+    {
+      itemName:'',
+      itemCode:'',
+      paramType:'',
+      paramNote:''
+    }
+])
+const dialogVisibleTest = ref(false)
+const optionsMdid = ref([])
+const optionsRqtype = ref([
+    {label:'GET',
+    value:'GET'
+    },
+    {label:'POST',
+    value:'POST'
+    },
+])
+const optionsType=  ref([
+    {label:'RESTful',
+    value:'RESTful'
+    },
+    {label:'WebService',
+    value:'WebService'
+    },
+    {label:'HTTP',
+    value:'HTTP'
+    },
+    {label:'WebSocket',
+    value:'WebSocket'
+    },
+])
+const data =  ref([])
+const select =  ref('1')
+const activeName =  ref('first')
+const title =  ref('')
+const titleTree =  ref('')
+const currentPage =  ref(1)
+const total =  ref(1)
+const tableData = ref([])
+const tableheight = window.innerHeight*0.7
+const heightAll = window.innerHeight
+const dialogVisible = ref(false)
+const dialogVisibleTree = ref(false)
+const isAdd = ref(false)
+const isAddTa = ref(false)
+const treeId = ref('');
+const valueSta = ref('1');
+const parMdid = ref('')
+const example = ref('');
+const tableDataCanAdd = ref([
+  {
+      itemName:'',
+      itemCode:'',
+      paramType:'',
+      paramNote:''
+    }
+])
+const formZu = ref({
+  itemName:'',
+  itemTp:'',
+  itemEn:'',
+  itemTp:'',
+  itemDataTp:'',
+  itemDefaultVal:'',
+  itemUnit:'',
+  itemNotes:'',
+});
+const parId= ref('')
+const formJi = ref({
+  name:'',
+  cateCode:'',
+  type:'',
+  url:'',
+  rqtype:'',
+  rptype:'',
+  intro:'',
+});
+const rulesJi = reactive({
+  name: [{ required: true, message: '必填', trigger: 'blur' }],
+  url: [{ required: true, message: '必填', trigger: 'blur' }],
+  cateCode: [{ required: true, message: '必填', trigger: 'blur' }],
+});
+const formRefJi = ref();
+const formAdd = ref({
+  name:'',
+  cateCode:'',
+  type:'',
+  url:'',
+  rqtype:'',
+  rptype:'',
+  intro:'',
+  mdid:''
+});
+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' }],
+});
+const formRefAdd = ref();
+const treeRef = ref(null);
+const formTree = ref({
+  itemName:'',
+  catePid:'',
+  itemNo:'',
+  itemNotes:''
+});
+const rulesTree = reactive({
+  itemNo: [{ required: true, message: '必填', trigger: 'blur' }],
+  catePid: [{ required: true, message: '必填', trigger: 'blur' }],
+  itemName: [{ required: true, message: '必填', trigger: 'blur' }],
+});
+const formRefTree = ref();
+const formLev = ref({
+  itemName:'',
+  itemNo:'',
+  itemNotes:'',
+});
+const rulesLev = reactive({
+  itemNotes: [{ required: true, message: '必填', trigger: 'blur' }],
+  itemNo: [{ required: true, message: '必填', trigger: 'blur' }],
+  itemName: [{ required: true, message: '必填', trigger: 'blur' }],
+});
+const formRefLev = ref();
+const cascaderOptions = ref([])
+const props1 = ref({
+  checkStrictly: true,
+})
+const detailJson = ref('')
+const parOptions = ref([])
+watch(inputNode, (val) => {
+  treeRef.value?.filter(val); // 调用树的过滤方法
+});
+const filterNode = (value, data) => {
+  if (!value) return true; // 空搜索时显示所有节点
+  return data.label.includes(value); // 检查节点标签是否包含关键字
+};
+
+const copied = ref(false);
+function showLog(row){
+  dialogVisibleLevel.value = true
+  var par = {
+    serId:row.srvId
+  }
+  testLog(par).then(res=>{
+    tableDataLog.value = res.rows
+  })
+}
+function test(){
+  var par = detailJson.value
+  par.params = tableDataCan.value
+  testService(par).then(res=>{
+    console.log(res)
+    dataReturn.value = res.msg
+    var par1  = {
+      data:{id:parMdid.value}
+    }
+    handleNodeClick(null,par1,null)
+  })
+}
+function addTask(row){
+  dialogVisibleTest.value = true
+  getSerDe(row.srvId).then(res=>{
+    if(res.code===200){
+      detailJson.value = res.data.ptService
+      console.log(detailJson.value)
+      tableDataCan.value = res.data.list
+    }
+  })
+}
+function showDe(row){
+  getSerDe(row.srvId).then(res=>{
+    if(res.code===200){
+      dialogVisibleDe.value = true
+      parOptions.value.forEach(item=>{
+        if(res.data.ptService.cateCode === item.cateCode){
+          res.data.ptService.cateCode = item.cateName
+        }
+      })
+      if(res.data.ptService.rptype === '1'){
+        res.data.ptService.rptype = 'JSON'
+      }
+      if(res.data.ptService.rptype === '2'){
+        res.data.ptService.rptype = 'XML'
+      }
+      if(res.data.ptService.rptype === '3'){
+        res.data.ptService.rptype = 'HTML'
+      }
+      formJi.value = res.data.ptService
+    }
+  })
+}
+function filterModelNodes(nodes) {
+  if (!Array.isArray(nodes)) return [];
+  
+  const result = [];
+  for (const node of nodes) {
+    // 递归处理子节点(如果有)
+    const filteredChildren = node.children ? filterModelNodes(node.children) : [];
+    
+    if (node.nodeType === 'MODEL') {
+      // 保留当前节点,并更新其子节点
+      node.value = node.id
+      result.push({
+        ...node,
+        children: filteredChildren
+      });
+    } else {
+      // 删除当前节点,将其子节点提升到当前层级
+      result.push(...filteredChildren);
+    }
+  }
+  return result;
+}
+function clearAdd(){
+  tableDataCan.value = [
+  ]
+  dataReturn.value = ''
+}
+function extractModelNodesDFSIterative(root) {
+  const result = [];
+  const stack = root;
+  
+  while (stack.length > 0) {
+    const node = stack.pop();
+    if (node.nodeType === 'MODEL') {
+      result.push(node);
+    }
+    
+    // 子节点逆序入栈(保证从左到右遍历)
+    if (node.children) {
+      for (let i = node.children.length - 1; i >= 0; i--) {
+        stack.push(node.children[i]);
+      }
+    }
+  }
+  return result;
+}
+function delAll(){
+  proxy.$modal.confirm('是否确认删除?').then(function () {
+    return deTree(parTree.value.id);
+  }).then(() => {
+    getTreeLeft();
+    proxy.$modal.msgSuccess("删除成功");
+    dialogVisibleLevel.value = false
+  }).catch(() => {});
+}
+function clearFromLev(){
+  tableDataLog.value = []
+}
+function addNextLevel(){
+  dialogVisibleLevel.value = true
+  show1Lev.value = false
+}
+function saveAddNextLevel(){
+   formRefLev.value.validate((valid) => {
+    if(valid){
+      var par = formLev.value
+      par.treeType = 'MODEL'
+      par.treePid = parTree.value.id
+      addTree(par).then(res=>{
+        if(res.code===200){
+          proxy.$modal.msgSuccess("新增成功");
+          getTreeLeft()
+          dialogVisibleLevel.value = false
+        }
+      })
+    }
+  });
+}
+function add1Level(){
+  dialogVisibleLevel.value = true
+  show1Lev.value = true
+}
+function saveAdd1Level(){
+  formRefLev.value.validate((valid) => {
+    if(valid){
+      var par = formLev.value
+      par.treeType = 'MODEL'
+      par.treePid = parTree.value.pid
+      addTree(par).then(res=>{
+        if(res.code===200){
+          proxy.$modal.msgSuccess("新增成功");
+          getTreeLeft()
+          dialogVisibleLevel.value = false
+        }
+      })
+    }
+  });
+}
+async function delSer(){
+  proxy.$modal.confirm('是否确认删除?').then(function () {
+    return delService(parId.value.id);
+  }).then(() => {
+    getTreeLeft();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+async function addSer(){
+  console.log(JsonAdd.value)
+  var valid
+  await formRefAdd.value.validate((valid1) => {
+    valid = valid1
+  });
+  console.log(valid) 
+  if(valid){
+    var par = formAdd.value
+    par.example = exampleAdd.value
+    par.rpcontent = JsonAdd.value
+    par.cateCode = par.cateCode[0]
+    console.log(par)
+
+    await addService(par).then(res=>{
+      if(res.code===200){
+        var parCan = tableDataCanAdd.value
+        parCan.srvId = res.data.srvId
+        addServiceParam(parCan).then(res1=>{
+          if(res1.code===200){
+            proxy.$modal.msgSuccess("新增成功");
+            getTreeLeft()
+          }
+        })
+      }
+    })
+    
+    
+  }
+
+}
+function showAdd(){
+  dialogVisible.value = true
+}
+async function handleNodeClick(node,data,event){
+  // parTree.value = data.data
+  // currentNodeKey.value = data.data.id
+ 
+  // isEdit.value = false
+  // parId.value = data.data
+  // await getSerDe(data.data.id).then(res=>{
+  //   if(res.data.ptService){
+  //     detail.value = res.data.ptService
+  //     tableDataCan.value = res.data.list
+  //     dataReturn.value = res.data.returnList
+  //     console.log(tableDataCan.value)
+  //     dataJsonXiang.value = res.data.ptService.rpcontent
+  //     formJi.value = res.data.ptService
+  //     example.value = res.data.ptService.example
+  //   }
+    
+  // })
+  console.log(data)
+  titleTest.value = data.data.label
+  parMdid.value = data.data.id
+  var par = {
+    mdid:data.data.id
+  }
+  console.log(data.data.id)
+  await getServiceInfo(par).then(res=>{
+    if(res.data){
+      tableData.value = res.data.serviceList
+      
+    }
+  })
+  parOptions.value.forEach(option => {
+    option.label = option.cateName;
+    option.value = option.cateCode;
+  });
+  console.log(parOptions.value)
+  for(var i = 0; i < parOptions.value.length; i++){
+    for(var i1 = 0; i1 < tableData.value.length; i1++){
+      console.log(i1);
+      if(parOptions.value[i].value === tableData.value[i1].cateCode){
+         tableData.value[i1].cateCode = parOptions.value[i].label
+      }
+    }
+  }
+  var par = [
+    {
+      value:'1',
+      label:'JSON'
+    },
+    {
+      value:'2',
+      label:'XML'
+    },
+    {
+      value:'3',
+      label:'HTML'
+    }
+  ]
+  for(var i = 0; i < par.length; i++){
+    for(var i1 = 0; i1 < tableData.value.length; i1++){
+      if(par[i].value === tableData.value[i1].rptype){
+         tableData.value[i1].rptype = par[i].label
+      }
+    }
+  }
+}
+async function getTreeLeft(){
+  var par = {
+    params:{
+      level:'2',
+      devkind:'SYS'
+    }
+  }
+  await modelTreeSelect(par).then(res=>{
+    par = res.data
+    data.value = res.data
+    
+  })
+  optionsMdid.value = filterModelNodes(par)
+  console.log(optionsMdid.value)
+}
+function renameTreeProperties(tree) {
+  // 深拷贝避免修改原始数据(可选,根据需求)
+  const newTree = cloneDeep(tree); // 使用 lodash
+  // 或:const newTree = JSON.parse(JSON.stringify(tree)); // 原生方法(不兼容函数等)
+
+  // 递归处理函数
+  const processNode = (node) => {
+    // 重命名属性
+    if ('cateName' in node) {
+      node.label = node.cateName;
+      delete node.cateName;
+    }
+    if ('cateCode' in node) {
+      node.value = node.cateCode;
+      delete node.cateCode;
+    }
+
+    // 递归处理子节点
+    if (node.children && node.children.length > 0) {
+      node.children.forEach(child => processNode(child));
+    }
+  };
+
+  // 遍历根节点
+  newTree.forEach(rootNode => processNode(rootNode));
+  return newTree;
+}
+function fetchData() {
+  getCatalog().then((r) => {
+    parOptions.value = r.data
+    cascaderOptions.value = renameTreeProperties(buildTree(r.data))
+    console.log(parOptions.value)
+  });
+}
+function buildTree(flatData, rootValue = '0') {
+      const nodeMap = new Map();
+      const tree = [];
+      flatData.forEach(item => {
+        nodeMap.set(item.cateCode, { ...item, children: [] });
+      });
+      for (const [code, node] of nodeMap) {
+        const parentCode = node.catePcode;
+        if (parentCode === rootValue || !parentCode) {
+          tree.push(node);
+          continue;
+        }
+        const parent = nodeMap.get(parentCode);
+        if (parent) {
+          parent.children.push(node);
+        } else {
+          console.warn(`Orphan node detected: ${code}. Parent ${parentCode} not found`);
+        }
+      }
+
+      return tree;
+    }
+function addPa(){
+    var par = {
+        itemName:''
+    }
+    tableDataCan.value.push(par)
+}
+function delCan(index){
+  tableDataCan.value.splice(index, 1)
+}
+function addCanAdd(){
+    var par = {
+        parName:''
+    }
+    tableDataCanAdd.value.push(par)
+}
+function delCanAdd(index){
+  tableDataCanAdd.value.splice(index, 1)
+}
+function getList() {
+  getModellist().then(res => {
+    data.value = res.rows
+    data.value.forEach(item=>{
+      item.label = item.appTitle
+      item.value = item.appId
+    })
+  })
+}
+onMounted(() => {
+  fetchData()
+  getList()
+});
+
+</script>
+<style scoped>
+
+. :deep(.el-select__wrapper){
+  box-shadow: none !important; /* 去除阴影边框 */
+  border: 1px solid transparent !important; /* 设置透明边框 */
+  background-color: transparent !important; /* 可选:透明背景 */
+}
+.noBor :deep(.el-input__wrapper) {
+  box-shadow: none !important; /* 去除阴影边框 */
+  border: 1px solid transparent !important; /* 设置透明边框 */
+  background-color: transparent !important; /* 可选:透明背景 */
+}
+/* 节点垂直间距 */
+:deep(.el-tree-node) {
+  margin-bottom:5px !important; /* 增大节点间距 */
+}
+.el-popover.custom-popover {
+  min-width: 50px;
+  padding: 8px; /* 可选:调整内边距 */
+}
+</style>
+<style>
+.dot {
+  width: 20px;          /* 控制圆点直径 */
+  height: 20px;
+  background-color: #333; /* 实心颜色 */
+  border-radius: 50%;    /* 关键属性 */
+  display: inline-block; /* 确保与其他元素并排 */
+}
+/* 全局透明样式(不使用 scoped) */
+.transparent-select .el-select__wrapper {
+  background-color: transparent !important;
+  border-color: transparent !important;
+  box-shadow: none !important;
+}
+
+.transparent-select .el-select__selection {
+  background-color: transparent;
+}
+
+/* 处理悬停和聚焦状态 */
+.transparent-select .el-select__wrapper:hover,
+.transparent-select .el-select__wrapper.is-focused {
+  border-color: transparent !important;
+  box-shadow: none !important;
+}
+
+/* 下拉箭头图标 */
+.transparent-select .el-select__caret {
+  color: rgba(0, 0, 0, 0.5); /* 半透明图标 */
+}
+</style>
+<style scoped>
+:deep(.treeLeft) .el-tree-node__content {
+  display: flex !important;
+  height: 28px;                  /* 按设计稿调整高度 */
+  align-items: center;
+  padding-top: 0 !important;
+}
+:deep(.treeLeft) .el-tree-node__content:hover {
+  background-color: #e9e9eb;
+}
+:deep(.treeLeft) .el-tree-node__content:active {
+    background-color: rgka(69,157,255,0.1) !important;
+  }
+
+  /* 选中态(Active) */
+:deep(.treeLeft) .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #c6e2ff !important;
+  }
+
+.tab-container {
+  height: 100vh; /* 关键:父容器明确高度 */
+  display: flex;
+  flex-direction: column;
+}
+.drag-handle {
+  cursor: move;
+}
+
+.ghost {
+  opacity: 0.5;
+  background: #c8ebfb;
+}
+
+/* 防止文字选中 */
+:deep(.el-table__row) {
+  user-select: none;
+  -webkit-user-select: none;
+}
+</style>
+<style scoped lang="scss">
+
+.custom-tree-node {
+  display: flex;       /* 启用 Flex 布局 */
+  align-items: center; /* 垂直居中 */
+  gap: 8px;            /* 图标与文字间距 */
+  justify-content: space-between;
+}
+.el-table .el-table__row td {
+  height: 60px !important; /* 行高 */
+}
+.custom-tree-node {
+  display: flex;       /* 启用 Flex 布局 */
+  align-items: center; /* 垂直居中 */
+  gap: 8px;            /* 图标与文字间距 */
+}
+</style>

+ 1 - 1
ruoyi-ui/src/views/dpp/task/developTask/index.vue

@@ -170,7 +170,7 @@
                 }}</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="240">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="350">
               <template #default="scope">
                 <el-button link type="primary" icon="Edit" :disabled="scope.row.status == 1"
                   @click="routeTo('/dpp/task/developTask/edit', scope.row)"

+ 1 - 1
ruoyi-ui/src/views/dpp/task/integratioTask/index.vue

@@ -157,7 +157,7 @@
                 <dict-tag :options="dpp_etl_task_instance" :value="scope.row.lastExecuteStatus" />
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="260">
               <template #default="scope">
                 <el-button link type="primary" icon="Edit" :disabled="scope.row.status == 1"
                   @click="routeTo('/dpp/task/integratioTask/edit', scope.row)">配置任务</el-button>

+ 17 - 8
ruoyi-ui/src/views/evaluate/index.vue

@@ -30,7 +30,10 @@
         <div style="margin-left: 1%;width: 98%;display: flex;height: 32vh;">
           <div style="width: 100%;height: 100%;">
             <el-card shadow="always" class="box-card" style="width:100%;height: 100%;">
-              <div style="display: flex;align-items: center;font-weight: bold;line-height: 1;">
+              <div style="font-weight: bold;">
+                模型每日服务调度次数统计
+              </div>
+              <div style="display: flex;align-items: center;line-height: 1;margin-top: 1%;">
                 <div style="">今日模型服务调度次数</div>
                 <div style="color: #79bbff;margin-left: 1%;"> {{daySum}} </div>
                 <div style="margin-left: 1%;"> 次 </div>
@@ -47,7 +50,7 @@
                 @change="getDay"
                 class="m-2"
                 placeholder="上海市城区洪涝仿真模型"
-                style="width: 10%;margin-left: 1%;"
+                style="width: 15%;margin-left: 1%;"
                 >
                     <el-option
                     v-for="item in optionsModel"
@@ -57,7 +60,7 @@
                     />
                 </el-select>
               </div>
-              <div id="top1" style="width: 98%;margin-left: 1%;margin-top: 1%;height:23vh">
+              <div id="top1" style="width: 98%;margin-left: 1%;margin-top: -1%;height:23vh">
 
               </div>
             </el-card>
@@ -65,7 +68,10 @@
         </div>
         <div style="margin-left: 1%;width: 98%;display: flex;margin-top: 1%;height: 38vh;">
           <el-card shadow="always" class="box-card" style="width:50%;height: 100%;">
-            <div style="width: 100%;display: flex;">
+            <div style="margin-left: 1%;font-weight: bold;">
+              模型每月服务调度次数统计
+            </div>
+            <div style="width: 100%;display: flex;margin-top: 2%;">
               <el-date-picker
                   v-model="valueMon"
                   type="year"
@@ -79,7 +85,7 @@
                 @change="getMon"
                 class="m-2"
                 placeholder=""
-                style="width: 20%;margin-left: 1%;"
+                style="width: 25%;margin-left: 1%;"
                 >
                     <el-option
                     v-for="item in optionsModel"
@@ -89,12 +95,15 @@
                     />
                 </el-select>
             </div>
-            <div id="bt1"  style="width: 100%;margin-left: 0%;margin-top: 1%;height: 30vh;">
+            <div id="bt1"  style="width: 100%;margin-left: 0%;margin-top: -1%;height: 30vh;">
 
             </div>
           </el-card>
           <el-card shadow="always" class="box-card" style="width:50%;height: 100%;margin-left: 1%;">
-            <div style="width: 100%;display: flex;">
+            <div style="margin-left: 1%;font-weight: bold;">
+              模型调用次数年度排名
+            </div>
+            <div style="width: 100%;display: flex;margin-top: 2%;">
               <el-date-picker
                   v-model="valuePai"
                   type="year"
@@ -117,7 +126,7 @@
                     />
                 </el-select> -->
             </div>
-            <div id="bt2"  style="width: 100%;margin-left: 1%;margin-top: 1%;height: 28vh;">
+            <div id="bt2"  style="width: 100%;margin-left: 1%;margin-top: -1%;height: 28vh;">
 
             </div>
           </el-card>