0723

ruoyi-ui/.env.development

@@ -10,8 +10,8 @@ VITE_APP_BASE_Title = '/sh'
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/sh-api'
 
-VITE_DEV_PATH = 'http://localhost:8082'
-# VITE_DEV_PATH = 'http://39.98.38.2:18082/sh-api'
+# VITE_DEV_PATH = 'http://localhost:8082'
+VITE_DEV_PATH = 'http://39.98.38.2:18082/sh-api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -12,7 +12,7 @@
         </div>
       </el-col>
       <el-col :span="14">
-        <el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper">
+        <el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper" style="margin-left: 5%;">
           <el-menu
               :default-active="activeMenu"
               :collapse="isCollapse"
@@ -69,7 +69,8 @@ import useAppStore from '@/store/modules/app'
 import useSettingsStore from '@/store/modules/settings'
 import usePermissionStore from '@/store/modules/permission'
 import useUserStore from '@/store/modules/user'
-
+import { ref, onMounted, onUnmounted, nextTick } from 'vue';
+import Cookies from 'js-cookie'
 const route = useRoute();
 const appStore = useAppStore()
 const userStore = useUserStore()
@@ -91,7 +92,10 @@ const activeMenu = computed(() => {
   return path;
 
 })
-
+onMounted(() => {
+  appStore.sidebar.opened = true
+  console.log(Cookies.get('sidebarStatus'))
+});
 function handleCommand(command) {
   switch (command) {
     case "setLayout":
@@ -125,7 +129,7 @@ function handleCommand(command) {
     float: left;
 
     span {
-      font-size: 28px;
+      font-size: 25px;
       font-weight: bold;
       color: #f5f6f8;
       height: 60px;

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

@@ -42,11 +42,11 @@
             end-placeholder="End date"
             />
         </div>
-        <div style="display: flex;width: 20%;align-items: center;margin-left: 8%;">
+        <div style="display: flex;width: 20%;align-items: center;margin-left: 20%;">
             <el-button type="primary" style="margin-left: 5%;" :icon="Search">查询</el-button>
             <el-button type="primary" style="margin-left: 5%;" icon="Refresh">重置</el-button>
             <el-button type="primary" style="margin-left:5%;" @click="reg" icon="Plus">注册</el-button>
-            <el-button type="" style="margin-left:5%;" plain icon="Plus">切换展示模式</el-button>
+            <!-- <el-button type="" style="margin-left:5%;" plain icon="Plus">切换展示模式</el-button> -->
         </div>
     </div>
     <div style="display: flex;align-items: center;background-color:#EFFAFF ;margin-top: 1%;width: 98%;margin-left: 1%;line-height: 1.5" :style="{'height':heightAll * 0.03+'px'}">
@@ -71,14 +71,14 @@
         border 
         :max-height="tableheight">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="name" label="组件名称" width="250">
+        <el-table-column type="index" label="序号" width="80"></el-table-column>
+        <el-table-column prop="name" label="组件名称">
 
         </el-table-column>
         <el-table-column prop="className" label="组件分类" width="160"/>
         <el-table-column prop="mdUnit" label="提供单位" width="160"/>
         <el-table-column prop="address2" label="注册人员" width="100"/>
-        <el-table-column prop="st3" label="模型测试" width="140">
+        <el-table-column prop="st3" label="测试状态" width="140">
             <template #default="scope">
               <el-button v-if="scope.row.st1=='1'" type="success" plain>测试完成</el-button>
               <el-button v-if="scope.row.st1=='2'" type="danger" plain>测试失败</el-button>
@@ -100,7 +100,7 @@
         </el-table-column>
         <el-table-column prop="modifyBy" label="发布时间" width="170"/>
         <el-table-column prop="version" label="版本" width="120"/>
-        <el-table-column prop="address" label="操作" >
+        <el-table-column prop="address" label="操作" width="360">
             <template #default="scope">
                 <div style="display: flex;justify-content: space-between;width: 80%;">
                     <el-button type="primary" size="mini" text style="margin-left: -2%;">发布</el-button>
@@ -110,7 +110,6 @@
                     <el-button type="primary" size="mini" text style="margin-left: -5%;">编辑</el-button>
                     <el-button type="danger" text size="mini" style="margin-left: -5%;" @click="handleDelete(scope.row)">注销</el-button>
                     <el-button type="primary" text size="mini" style="margin-left: -5%;">查看</el-button>
-                    <el-button type="primary" text size="mini" style="margin-left: -5%;">后处理</el-button>
                 </div>
             </template>
         </el-table-column>
@@ -129,7 +128,6 @@
             <el-step title="第一步"></el-step>
             <el-step title="第二步"></el-step>
             <el-step title="第三步"></el-step>
-            <el-step title="第四步"></el-step>
           </el-steps>
             <div v-if="active==0">
               <div v-if="active==0" style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;">
@@ -137,22 +135,22 @@
                 <div style="font-weight: bold;font-size: 16px;margin-left: 0.5%;">基本信息</div>
               </div>
               <div v-if="active==0" style="margin-left: 1%;margin-top: 1%;">
-                  <el-form style="margin-left: 5%;"  :model="form" class="demo-form-inline" :rules="rules">
+                  <el-form style="margin-left: 5%;"  :model="form" label-position="left" class="demo-form-inline" :rules="rules">
                       <el-row :gutter="40">
                       <el-col :span="9">
-                          <el-form-item label="组件名称:" prop="name">
-                          <el-input v-model="form.name" />
+                          <el-form-item label="组件名称:" prop="name" style="margin-left: -3%;">
+                            <el-input v-model="form.name" />
                           </el-form-item>
                       </el-col>
                       <el-col :span="9">
-                          <el-form-item label="版本号:" prop="version">
+                          <el-form-item label="版本号:" prop="version" style="margin-left: -3%;">
                               <el-input v-model="form.version" />
                           </el-form-item>
                       </el-col>
                       </el-row>
                       <el-row :gutter="40" style="margin-top: 1%;">
                       <el-col :span="9" >
-                          <el-form-item label="组件英文名称:" prop="enname"> 
+                          <el-form-item label="组件英文名称:" prop="enname" style="margin-left: -3%;"> 
                             <el-input v-model="form.enname" />
                           </el-form-item>
                       </el-col>
@@ -191,7 +189,7 @@
                       </el-col>
                       </el-row>
                       <el-form-item label="组件简介:">
-                          <el-input v-model="form.region" style="width: 30%;" :rows="2" type="textarea"/>
+                          <el-input v-model="form.region" style="width: 30%;" :rows="2" resize="none" type="textarea"/>
                       </el-form-item>
                   </el-form>
               </div>
@@ -237,7 +235,7 @@
               </div>
             </div>
             <div v-if="active==1">
-              <div style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;">
+              <!-- <div style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;">
                 <div style="background-color: blue;width: 2px;height: 16px;"></div>
                 <div style="font-weight: bold;font-size: 16px;margin-left: 0.5%;">示例数据</div>
               </div>
@@ -286,15 +284,15 @@
                       </el-col>
                       </el-row>
                   </el-form>
-              </div>
+              </div> -->
               <div style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;">
                   <div style="background-color: blue;width: 2px;height: 16px;"></div>
                   <div style="font-weight: bold;font-size: 16px;margin-left: 0.5%;">模型组件上传</div>
               </div>
               <div style="margin-left: 1%;margin-top: 1%;">
                   <el-form style="margin-left: 5%;margin-top: 2%;"  :model="form" class="demo-form-inline" :rules="rules">
-                    <el-form-item label="组件执行包:" prop="name">
-                      <el-input v-model="form.region" style="width: 75%;" placeholder="请输入示例" :rows="2" type="textarea"/>
+                    <el-form-item label="组件执行包:" prop="name" style="margin-left: -1%;">
+                      <el-input v-model="form.region" style="width: 75%;" placeholder="请输入组件执行路径" :rows="2" type="textarea" resize="none"/>
                     </el-form-item>
                     <el-form-item label="组件说明文档:" prop="">
                       <div style="width: 60%;">
@@ -314,8 +312,8 @@
                                   </template>
                                 </el-upload>
                       </div>
-                      <div style="color: #b1b3b8;">
-                        注:请上传后缀名为.jar、·ph、.sh、.exe、.zip、.bat的文件
+                      <div style="color: #b1b3b8;width: 100%;">
+                        注:请上传后缀名为.docx .pdf .txt的文件
                       </div>
                     </el-form-item>
                   </el-form>
@@ -328,7 +326,7 @@
                   <el-form style="margin-left: 5%;margin-top: 2%;"  :model="form" class="demo-form-inline" :rules="rules">
                       <el-row :gutter="40">
                       <el-col :span="12">
-                          <el-form-item label="CPU核心数:" prop="mdCPU">
+                          <el-form-item label="CPU核心数:" prop="mdCPU" style="margin-left: -2%;">
                               <el-input v-model="form.mdCPU" style="width: 50%;" placeholder=""/>
                               <div style="margin-left: 2%;">
                                 个
@@ -368,7 +366,7 @@
                       </el-row>
                   </el-form>
               </div>
-              <div style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;">
+              <!-- <div style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;">
                   <div style="background-color: blue;width: 2px;height: 16px;"></div>
                   <div style="font-weight: bold;font-size: 16px;margin-left: 0.5%;">运行命令</div>
               </div>
@@ -378,7 +376,7 @@
                       <el-input v-model="form.region" style="width: 75%;" placeholder="请输入示例" :rows="2" type="textarea"/>
                     </el-form-item>
                   </el-form>
-              </div>
+              </div> -->
             </div>
             <div v-if="active==2">
               <div style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;width: 98%;">
@@ -458,7 +456,7 @@
                 </el-table-column>
               </el-table>
             </div>
-            <div v-if="active==3">
+            <!-- <div v-if="active==3">
               <div style="margin-left: 1%;margin-top: 1%;display: flex;align-items: center;width: 98%;">
                 <div style="background-color: blue;width: 2px;height: 16px;"></div>
                 <div style="font-weight: bold;font-size: 16px;margin-left: 0.5%;">前处理</div>
@@ -571,7 +569,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-            </div>
+            </div> -->
             <template #footer>
             <span class="dialog-footer">
                 <el-button @click="forward" style="float: left;">上一步</el-button>
@@ -650,7 +648,7 @@ const data = reactive({
 });
 
 const { queryParams, form, rules } = toRefs(data);
-const tableData2 = ref([
+const tableData2 = ref([ 
   { date1:'流域拓扑', date2:'', date3:'single', date4:'基于水文响应' },
   { date1:'雨量站', date2:'', date3:'single', date4:'基于水文响应' },
   { date1:'水库', date2:'', date3:'single', date4:'基于水文响应' }
@@ -674,7 +672,7 @@ const checkGroup = [
     {label:'二维水动力'},
     {label:'机器学习'},
 ]
-let tableData = ref([])
+let tableData = ref([{name:'1'}])
 const heightAll = window.innerHeight
 const valueHelpSel = '';
 const tableheight = window.innerHeight*0.7
@@ -812,7 +810,7 @@ const initSortable1 = () => {
 onMounted(() => {
   nextTick(initSortable);
   nextTick(initSortable1);
-  getModelListTable()
+  // getModelListTable()
   // addNewModel()
 });