111

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

@@ -294,4 +294,11 @@ export function estimateFirmly(data) {
     method: 'post',
     data:data
   });
+}
+export function getYinqing(query) {
+  return request({
+    url: "/system/dict/data/type/flow_dispatch_job",
+    method: "get",
+    params: query,
+  });
 }

ruoyi-ui/src/views/dpp/calculateDev/index.vue

@@ -216,6 +216,23 @@
                 </el-col>
             </el-row>
             <el-row :gutter="48">
+                <el-col :span="8">
+                    <el-form-item label="任务开发引擎:" prop="executorInfo">
+                        <el-select
+                        v-model="formJi.executorInfo"
+                        class=""
+                        placeholder=""
+                        style="width: 100%;margin-left: 0%;"
+                        >
+                            <el-option
+                            v-for="item in optionsYinqing"
+                            :key="item.value"
+                            :label="item.dictLabel"
+                            :value="item.dictCode"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
                 <el-col :span="8">
                     <el-form-item label="任务类型:" prop="taskType">
                         <el-select
@@ -233,6 +250,7 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
+                
             </el-row>
             <div style="margin-top: 0%;">
                 <el-row :gutter="48">
@@ -627,7 +645,8 @@ 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,getJobTaskPageLog,getBatchDataTable,editTask,getDataRen,getTaskDe,delTask,flowDispatch } from "@/api/service/info";
+import { modelTreeSelect,getSerDe,addService,addServiceParam,getJobTaskPageLog,getYinqing
+  ,getBatchDataTable,editTask,getDataRen,getTaskDe,delTask,flowDispatch } from "@/api/service/info";
 import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
 import JsonViewer from 'vue-json-viewer'
 import 'vue-json-viewer/style.css' 
@@ -659,7 +678,7 @@ const show1Lev = ref(true)
 const inputNode =ref('')
 const isEdit = ref(true)
 const dataReturn = ref('')
-
+const optionsYinqing = ref([])
 const optionsCan = ref([
   {
     label:"string",
@@ -822,7 +841,8 @@ const rulesJi = reactive({
   chargePhone: [{ required: true, message: '必填', trigger: 'blur' }],
   taskType: [{ required: true, message: '必填', trigger: 'blur' }],
   blockStrategy: [{ required: true, message: '必填', trigger: 'blur' }],
-  jobStatus: [{ required: true, message: '必填', trigger: 'blur' }]
+  jobStatus: [{ required: true, message: '必填', trigger: 'blur' }],
+  executorInfo: [{ required: true, message: '必填', trigger: 'blur' }]
 });
 const formRefJi = ref();
 const titleDe = ref('')
@@ -890,6 +910,14 @@ function changePage(val){
   pageNum.value = val
   getDataRen()
 }
+function getYinData(){
+  getYinqing().then(res=>{
+    if(res.data){
+      optionsYinqing.value = res.data
+      formJi.value.executorInfo = optionsYinqing.value[0].dictCode
+    }
+  })
+}
 async function changejobStatus(row){
   var par = {
     jobId:row.id,
@@ -1043,13 +1071,6 @@ function crontabFill(value) {
 function addTask(row){
   isAdd.value = true
   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 getEdit(row){
   isAdd.value = false
@@ -1122,6 +1143,7 @@ function clearAdd(){
     maxRetryTimes:3,
     retryInterval:1,
     jobStatus:1,
+    executorInfo: optionsYinqing.value[0].dictCode
   }
   tableDataCanStart.value = []
 }
@@ -1282,6 +1304,7 @@ function getList() {
 }
 onMounted(() => {
   getList()
+  getYinData()
 });
 
 </script>

ruoyi-ui/src/views/evaluate/index.vue

@@ -9,14 +9,6 @@
             年调用次数
           </div>
         </div>
-        <div shadow="always" style="width: 33%;margin-left: 1%;height: 100%;;border-radius: 10px;background-color: white;" class="boxShadow">
-          <div style="width: 100%;display: flex;align-items: center;justify-content: center;font-size: 35px;font-weight: bold;color: #477ACF;;height: 70%">
-            {{dayAll}}
-          </div>
-          <div style="display: flex;align-items: center;justify-content: center;background-color: #477ACF;font-size: 20px;width: 100%;color: white;text-align: center;border-radius: 0 0 10px 10px;height: 30%;">
-            日调用次数
-          </div>
-        </div>
         <div shadow="always" style="width: 33%;height: 100%;;border-radius: 10px;background-color: white;margin-left: 1%;" class="boxShadow">
           <div style="width: 100%;display: flex;align-items: center;justify-content: center;font-size: 35px;font-weight: bold;color: #40B0D7;;height: 70%">
             {{monAll}}
@@ -25,7 +17,14 @@
             月调用次数
           </div>
         </div>
-        
+        <div shadow="always" style="width: 33%;margin-left: 1%;height: 100%;;border-radius: 10px;background-color: white;" class="boxShadow">
+          <div style="width: 100%;display: flex;align-items: center;justify-content: center;font-size: 35px;font-weight: bold;color: #477ACF;;height: 70%">
+            {{dayAll}}
+          </div>
+          <div style="display: flex;align-items: center;justify-content: center;background-color: #477ACF;font-size: 20px;width: 100%;color: white;text-align: center;border-radius: 0 0 10px 10px;height: 30%;">
+            日调用次数
+          </div>
+        </div>
       </div>
       <div style="background-color:  #F7F7F7;padding-top:1%;">
         <div style="margin-left: 1%;width: 98%;display: flex;height: 32vh;">
@@ -457,7 +456,7 @@ async function getTreeLeft(){
     }
   }
   await modelTreeSelect(par).then(res=>{
-    optionsModel.value = res.data[0].children
+    optionsModel.value = res.data
     valueMod.value = optionsModel.value[0].id
     valueModMon.value = optionsModel.value[0].id
     valueMon.value = getFirstDayOfYear()

ruoyi-ui/src/views/evaluate/score.vue

@@ -52,6 +52,8 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column prop="estimateNum" label="已评分人数">
+                </el-table-column>
           <el-table-column prop="address" label="操作" width="200">
               <template #default="scope">
                   <div style="display: flex;">
@@ -79,6 +81,7 @@
                 </el-table-column>
                 <el-table-column prop="firmlyState" label="认定状态">
                 </el-table-column>
+                
                 <el-table-column prop="mdEstimates" label="评分项目列表">
                   <template #default="scope">
                     <el-popover placement="right" :width="400" trigger="click">
@@ -118,13 +121,24 @@
             </span>
           </template>
         </el-dialog>
-        <el-dialog @close="clearForm" v-model="dialogVisibleDe" :title="title" width="30%" destroy-on-close class="custom-dialog-bg">
+        <el-dialog @close="clearForm" v-model="dialogVisibleDe" :title="titleTest" width="35%" destroy-on-close class="custom-dialog-bg">
           <el-form size="mini" style="margin-top:5%;width: 98%;" :model="formAdd" label-position="right" :rules="rulesAdd"
-                 ref="formRefJi" label-width="100px" >
-            <el-form-item label="评价分值:" prop="estimateScore" style="">
-              <el-input v-model="formAdd.estimateScore"  style="width: 100%;" />
+                 ref="formRefJi" label-width="120px" >
+            <el-form-item label="评价时间:" prop=""  style="">
+              <el-date-picker
+                v-model="valueMon"
+                type="year"
+                disabled
+                style="width: 100%;"
+                @change="getMon"
+                placeholder="本年"
+                value-format="YYYY-MM-DD"
+              />
             </el-form-item>
-            <el-form-item label="评价项目:" prop="estimateType"  style="">
+            <!-- <el-form-item label="评价分值:" prop="estimateScore" style="">
+              <el-input v-model="formAdd.estimateScore"  style="width: 100%;" />
+            </el-form-item> -->
+            <!-- <el-form-item label="评价项目:" prop="estimateType"  style="">
               <el-select
                   v-model="formAdd.estimateType"
                   style="width: 100%;margin-left: 0%;"
@@ -133,23 +147,34 @@
                   <el-option label="效率指标" value="EFF"></el-option>
                   <el-option label="补充指标" value="SUP"></el-option>
               </el-select>
+            </el-form-item> -->
+            <el-form-item label="使用指标评分:" prop="USE"  style="">
+              <el-input v-model="formAdd.USE" style="width: 100%;" />
+            </el-form-item>
+            <el-form-item label="效率指标评分:" prop="EFF"  style="">
+              <el-input v-model="formAdd.EFF" style="width: 100%;" />
+            </el-form-item>
+            <el-form-item label="补充指标评分:" prop="SUP"  style="">
+              <el-input v-model="formAdd.SUP" style="width: 100%;" />
             </el-form-item>
             <el-form-item label="评价说明:" prop=""  style="">
               <el-input v-model="formAdd.remark" type="textarea" :row="2" style="width: 100%;" />
             </el-form-item>
-            <el-form-item label="评价时间:" prop=""  style="">
-              <el-date-picker
-                v-model="valueMon"
-                type="year"
-                disabled
-                style="width: 100%;"
-                @change="getMon"
-                placeholder="本年"
-                value-format="YYYY-MM-DD"
-              />
-            </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 type="primary" size="mini" v-if="isAdd" @click="addPing">确定</el-button>
@@ -157,8 +182,8 @@
             </span>
           </template>
         </el-dialog>
-        <el-dialog @close="clearForm" v-model="dialogVisibleRen" :title="title" width="30%" destroy-on-close class="custom-dialog-bg">
-          <el-form size="mini" style="margin-top:5%;width: 98%;" :model="formRen" label-position="right" :rules="rulesRen"
+        <el-dialog @close="clearForm" v-model="dialogVisibleRen" :title="titleTest" width="30%" destroy-on-close class="custom-dialog-bg">
+          <el-form size="mini" style="margin-top:1%;width: 98%;" :model="formRen" label-position="right" :rules="rulesRen"
                  ref="formRefRen" label-width="100px" >
             <el-form-item label="认定类型:" prop="firmlyType"  style="">
               <el-select
@@ -188,6 +213,7 @@
 import { getScoreList,postPingjia,getScoreListLog,delLog,editLogping,estimateFirmly } from "@/api/service/info";
 import { fa } from "element-plus/es/locale/index.mjs";
 import { ref, onMounted, onUnmounted, nextTick,onBeforeMount } from 'vue';
+import { getUserProfile } from "@/api/system/user";
 const {proxy} = getCurrentInstance();
 const isAdd = ref(false)
 const isEdit = ref(false)
@@ -196,8 +222,9 @@ const dialogVisibleDe = ref(false)
 const tableDataLog = ref([])
 const tableData = ref([])
 const rulesAdd = reactive({
-  estimateScore: [{required: true, message: '必填', trigger: 'blur'}],
-  estimateType: [{required: true, message: '必填', trigger: 'blur'}],
+  USE: [{required: true, message: '必填', trigger: 'blur'}],
+  EFF: [{required: true, message: '必填', trigger: 'blur'}],
+  SUP: [{required: true, message: '必填', trigger: 'blur'}],
 });
 const formAdd = ref({
   estimateScore:'',
@@ -219,7 +246,9 @@ const mdid = ref()
 const title = ref('')
 const estimateId = ref()
 const valueMon = ref('')
+const titleTest = ref('')
 function showPing(row){
+  titleTest.value = row.mdName
   isAdd.value = true
   isEdit.value = false
   mdid.value = row.mdid
@@ -250,6 +279,13 @@ function delLogList(row){
     proxy.$modal.msgSuccess("删除成功");
   }).catch(() => {});
 }
+const userName = ref('')
+const date = ref(new Date().toLocaleDateString())
+function fetchData() {
+  getUserProfile().then(response => {
+    userName.value = response.data.userName
+  });
+}
 function editLog(row){
   dialogVisibleDe.value = true
   isAdd.value = false
@@ -319,8 +355,20 @@ const formRefJi = ref();
 function addPing(){
   var par = [{
     mdid:mdid.value,
-    estimateScore:formAdd.value.estimateScore,
-    estimateType:formAdd.value.estimateType,
+    estimateScore:formAdd.value.USE,
+    estimateType:'USE',
+    remark:formAdd.value.remark,
+    estimateTime:valueMon.value
+  },{
+    mdid:mdid.value,
+    estimateScore:formAdd.value.EFF,
+    estimateType:'EFF',
+    remark:formAdd.value.remark,
+    estimateTime:valueMon.value
+  },{
+    mdid:mdid.value,
+    estimateScore:formAdd.value.SUP,
+    estimateType:'SUP',
     remark:formAdd.value.remark,
     estimateTime:valueMon.value
   }]
@@ -349,6 +397,7 @@ function getlist(){
 }
 onMounted(() => {
   getlist()
+  fetchData()
 });
 
 </script>

ruoyi-ui/src/views/register/componentReg/index.vue

@@ -50,7 +50,22 @@
         <el-table-column prop="type" label="模型类型" width="160"/>
         <el-table-column prop="mdUnit" label="模型单位" width="220"/>
         <el-table-column prop="mdContact" label="联系方式" width="150"/>
-        <el-table-column prop="status" label="模型状态" width="140">
+        <el-table-column prop="audit" label="审核状态" width="140">
+          <template #default="scope">
+            <div>
+              <div v-if="scope.row.audit === '0'||scope.row.audit === null" style="color:#909399">待审核</div>
+              <div v-else-if="scope.row.audit === '1'" style="color: #67C23A">审核通过</div>
+              <div v-else-if="scope.row.audit === '2'" style="color: #F56C6C">驳回</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="发布状态" width="140">
+          <template #default="scope">
+            <div>
+              <div v-if="scope.row.publish === '0'||scope.row.publish === null" style="color:#909399">未发布</div>
+              <div v-else-if="scope.row.publish === '1'" style="color: #67C23A">已发布</div>
+            </div>
+          </template>
         </el-table-column>
         <el-table-column prop="modifyBy" label="发布时间" width="170"/>
         <el-table-column prop="version" label="版本" width="120"/>
@@ -62,7 +77,7 @@
                     <!-- <el-button @click="showDe(scope.row)" type="primary" text size="mini" style="margin-left: -5%;">查看</el-button> -->
                     <el-button @click="showPei(scope.row)" type="warning" text size="mini" style="margin-left: -5%;">配置</el-button>
                     <el-button type="danger" @click="delModel(scope.row)" text size="mini" style="margin-left: -5%;">删除</el-button>
-                    <el-button type="danger" @click="shenhe(scope.row)" text size="mini" style="margin-left: -5%;">审核申请</el-button>
+                    <el-button v-if="scope.row.audit === '0'||scope.row.audit === null" type="info" @click="shenhe(scope.row)" text size="mini" style="margin-left: -5%;">审核申请</el-button>
                 </div>
             </template>
         </el-table-column>
@@ -859,7 +874,7 @@
                   :header-cell-style="{ textAlign: 'center'}"
                   :row-style="{ height: heightAll*0.01+'px',fontSize: '16px',textAlign:'center'  }"
                   border>
-                <el-table-column prop="itemName" label="参数字段">
+                <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"
@@ -867,7 +882,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="itemName" label="参数名称">
+                <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"
@@ -875,7 +890,7 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="itemName" label="参数类型" width="200">
+                <el-table-column prop="itemName" label="参数类型(必填)" width="200">
                   <template #default="scope">
                     <div style="width: 100%;">
                       <el-select
@@ -1531,6 +1546,7 @@ function test(){
   })
 }
 async function saveEditService() {
+  console.log(tableDataCanAdd.value.length)
   var valid
   await formRefAdd.value.validate((valid1) => {
     valid = valid1
@@ -1551,21 +1567,44 @@ async function saveEditService() {
       await editService(par).then(res => {
         if (res.code === 200) {
           var parCan = tableDataCanAdd.value
-          parCan.forEach(item => {
-            item.srvId = parId.value
-          });
-          addServiceParam(parCan).then(res1 => {
-            if (res1.code === 200) {
-              proxy.$modal.msgSuccess("修改成功");
-              dialogVisibleSer.value = false
-              showPei(parRow.value)
-            }
-          })
+          if(parCan.length!== 0){
+            parCan.forEach(item => {
+                item.srvId = parId.value
+              });
+              addServiceParam(parCan).then(res1 => {
+              if (res1.code === 200) {
+                proxy.$modal.msgSuccess("修改成功");
+                dialogVisibleSer.value = false
+                showPei(parRow.value)
+              }
+            })
+          }
+          else{
+            proxy.$modal.msgSuccess("修改成功");
+            dialogVisibleSer.value = false
+            showPei(parRow.value)
+          }
         }
       })
     }
   }
 }
+function clearAdd(){
+  formAdd.value = {
+    name: '',
+    cateCode: '',
+    type: '',
+    proxyPath: '',
+    url: '',
+    rqtype: '',
+    rptype: '',
+    intro: '',
+    mdid: parId.value
+  }
+  tableDataCanAdd.value = []
+  JsonAdd.value = ''
+  exampleAdd.value = ''
+}
 async function addSer() {
   console.log(JsonAdd.value)
   var valid
@@ -1581,7 +1620,7 @@ async function addSer() {
     await addService(par).then(res => {
       if (res.code === 200) {
         var parCan = tableDataCanAdd.value
-        if (parCan.length !== 0) {
+        if (tableDataCanAdd.value.length !== 0) {
           parCan.forEach((item, index) => {
             item.srvId = res.data.srvId
             if (item.paramName === '') {
@@ -1787,6 +1826,7 @@ async function showPei(row){
   var par = {
     mdid:row.mdid
   }
+  parId.value = row.mdid
   formAdd.value.mdid = row.mdid
   await getServiceInfo(par).then(res=>{
       if(res.data){

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

@@ -1,4 +1,4 @@
-<template>1
+<template>
   <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%;">

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

@@ -98,11 +98,11 @@
       </span>
     </template>
   </el-dialog>
-  <el-dialog @close=""  v-model="dialogVisibleTree" title="配置管理" width="50%" destroy-on-close :key="tableKey">
+  <el-dialog @close=""  v-model="dialogVisibleTree" title="数据项管理" width="50%" destroy-on-close :key="tableKey">
     <div style="margin-top: 2%;">
       <div style="display: flex;justify-content: space-between;align-items: center;">
         <div style="display: flex;justify-content: flex-end;width: 100%;margin-right: 2%;">
-          <el-button  @click="addCanAdd" style="margin-top: 1%;" type="success" size="mini" plain>新增参数</el-button>
+          <el-button  @click="addCanAdd" style="margin-top: 1%;" type="success" size="mini" plain>新增数据项</el-button>
         </div>
       </div>
       <div>

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

@@ -120,7 +120,7 @@
 
 import {onMounted, ref} from 'vue'
 import {Delete, Plus, Upload} from '@element-plus/icons-vue'
-import {addModeling, delModeling, editModeling, getModelingDe, getModellist} from '@/api/standardization/modeling'
+import {addModeling, delModeling, editModeling, getModelingFlow, getModellist,getModelingById} from '@/api/standardization/modeling'
 import {getToken} from '@/utils/auth'
 import imagePath from '@/assets/images/defaultModel.png';
 import {useStore} from 'vuex';
@@ -184,7 +184,7 @@ function editModel(item) {
   isAdd.value = false
   isContentVisible.value = true
   title.value = '修改模型应用'
-  getModelingDe(item.appId).then(res => {
+  getModelingById(item.appId).then(res => {
     if (res.code === 200) {
       formAdd.value.appTitle = res.data.appTitle
       formAdd.value.appNote = res.data.appNote