Browse Source

516样式修改

tangjunhao 3 months ago
parent
commit
8ab7caf819

File diff suppressed because it is too large
+ 1695 - 492
package-lock.json


+ 2 - 1
src/main.ts

@@ -7,10 +7,11 @@ import router from '@/router/index'
 import pinia from '@/store'
 //3、element-plus
 import ElementPlus from 'element-plus'
+import "normalize.css/normalize.css";//重置样式
 import 'element-plus/dist/index.css'
 import './style/index.css' // 
 //import './style/style.css'
-import "normalize.css/normalize.css";//重置样式
+
 import '@/js/lindex.js'
 import '@/js/jquery.min.js'
 import '@/js/webuploader.min.js'

+ 1 - 0
src/style/index.css

@@ -759,6 +759,7 @@ height: 30px;
 }
 
 .dialog_style {
+  padding: 0;
   color: #333333;
   font-size: 16px;
   font-family: 'Microsoft YaHei';

+ 91 - 6
src/views/home.vue

@@ -37,38 +37,122 @@
                     <div class="item2 margr" @click="clickgeometry($event, index, 'Role-' + '2', undmodel)">
                       <el-image :src="getImgPath('tow1.png')" fit="cover" />
                       <span>{{ f4ce }}</span>
-                      <el-select v-model="f4ce" class="no-border headersele" :suffix-icon="CaretBottom">
+                      <!-- <el-select v-model="f4ce" class="no-border headersele" :suffix-icon="CaretBottom">
                         <el-option v-for="item in optiongroup1" :key="item.value" :label="item.label" :value="item.value">
                           <div style="display: flex; align-items: center;">
                             <img :src="getflowImgPath(item.img)" style="width: 20px; height: 20px; margin-right: 10px;" />
                             <span>{{ item.label }}</span>
                           </div>
                         </el-option>
-                      </el-select>
+                      </el-select> -->
+                      <el-dropdown 
+                        trigger="click" 
+                        
+                      >
+                        <!-- 下拉触发区域(只显示图标) -->
+                        <span class="dropdown-trigger">
+                          <el-icon :size="12" style="width:78px;top:-4px"><arrow-down /></el-icon> <!-- 自定义图标 -->
+                        </span>
+
+                        <!-- 下拉菜单选项 -->
+                        <template #dropdown>
+                          <el-dropdown-menu>
+                            <el-dropdown-item 
+                              v-for="item in optiongroup1" 
+                              :key="item.value" 
+                              :command="item.value"
+                            >
+                              <div style="display: flex; align-items: center;">
+                                <img 
+                                  :src="getflowImgPath(item.img)" 
+                                  style="width: 20px; height: 20px; margin-right: 10px;" 
+                                />
+                                <span>{{ item.label }}</span>
+                            </div>
+                            </el-dropdown-item>
+                          </el-dropdown-menu>
+                        </template>
+                      </el-dropdown>
                     </div>
                     <div class="item2 margr" @click="clickgeometry($event, index, 'Role-' + '1', modelban)">
                       <el-image :src="getImgPath('tow2.png')" fit="cover" />
                       <span>{{ modelban }}</span>
-                      <el-select v-model="modelban" class="no-border headersele" :suffix-icon="CaretBottom">
+                      <!-- <el-select v-model="modelban" class="no-border headersele" :suffix-icon="CaretBottom">
                         <el-option v-for="item in optiongroup" :key="item.value" :label="item.label" :value="item.value">
                           <div style="display: flex; align-items: center;">
                             <img :src="getflowImgPath(item.img)" style="width: 20px; height: 20px; margin-right: 10px;" />
                             <span>{{ item.label }}</span>
                           </div>
                         </el-option>
-                      </el-select>
+                      </el-select> -->
+                      <el-dropdown 
+                        trigger="click" 
+                        
+                      >
+                        <!-- 下拉触发区域(只显示图标) -->
+                        <span class="dropdown-trigger">
+                          <el-icon :size="12" style="width:78px;top:-4px"><arrow-down /></el-icon> <!-- 自定义图标 -->
+                        </span>
+
+                        <!-- 下拉菜单选项 -->
+                        <template #dropdown>
+                          <el-dropdown-menu>
+                            <el-dropdown-item 
+                              v-for="item in optiongroup" 
+                              :key="item.value" 
+                              :command="item.value"
+                            >
+                              <div style="display: flex; align-items: center;">
+                                <img 
+                                  :src="getflowImgPath(item.img)" 
+                                  style="width: 20px; height: 20px; margin-right: 10px;" 
+                                />
+                                <span>{{ item.label }}</span>
+                            </div>
+                            </el-dropdown-item>
+                          </el-dropdown-menu>
+                        </template>
+                      </el-dropdown>
                     </div>
                     <div class="item2 margr" @click="clickgeometry($event, index, 'Role-' + '2', undmodel)">
                       <el-image :src="getImgPath('tow3.png')" fit="cover" />
                       <span>{{ undmodel }}</span>
-                      <el-select v-model="undmodel" class="no-border headersele" :suffix-icon="CaretBottom">
+                      <!-- <el-select v-model="undmodel" class="no-border headersele" :suffix-icon="CaretBottom">
                         <el-option v-for="item in options4" :key="item.value" :label="item.label" :value="item.value">
                           <div style="display: flex; align-items: center;">
                             <img :src="item.icon" style="width: 20px; height: 20px; margin-right: 10px;" />
                             <span>{{ item.label }}</span>
                           </div>
                         </el-option>
-                      </el-select>
+                      </el-select> -->
+                      <el-dropdown 
+                        trigger="click" 
+                        
+                      >
+                        <!-- 下拉触发区域(只显示图标) -->
+                        <span class="dropdown-trigger">
+                          <el-icon :size="12" style="width:78px;top:-4px"><arrow-down /></el-icon> <!-- 自定义图标 -->
+                        </span>
+
+                        <!-- 下拉菜单选项 -->
+                        <template #dropdown>
+                          <el-dropdown-menu>
+                            <el-dropdown-item 
+                              v-for="item in options4" 
+                              :key="item.value" 
+                              :command="item.value"
+                            >
+                              <div style="display: flex; align-items: center;">
+                                <img 
+                                  :src="item.icon"
+                                  style="width: 20px; height: 20px; margin-right: 10px;" 
+                                />
+                                <span>{{ item.label }}</span>
+                            </div>
+                            </el-dropdown-item>
+                          </el-dropdown-menu>
+                        </template>
+                      </el-dropdown>
                     </div>
                   </div>
                   <!--  -->
@@ -1642,6 +1726,7 @@ import { request, uploadFile } from "@/utils/request";
 import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
 import { Edit, CaretBottom } from '@element-plus/icons-vue'
 // import '@/utils/flexible'
+import { ArrowDown } from '@element-plus/icons-vue';
 import s0 from "@/assets/img/s0.png"
 import gc1 from "@/assets/img/gc1.png"
 import gc2 from "@/assets/img/gc2.png"

+ 1 - 1
src/views/index.vue

@@ -321,7 +321,7 @@
                 <el-table-column type="index" label="编号" width="70" />
                 <el-table-column prop="qi" label="启用" width="70">
                   <template v-slot="scope">
-                    <el-checkbox :label="false" v-model="scope.row.qi" />
+                    <el-checkbox  v-model="scope.row.qi" />
                   </template>
                 </el-table-column>
                 <el-table-column prop="data" label="目标类型" width="120">

+ 2 - 2
src/views/titlecomponent/ADflow.vue

@@ -89,7 +89,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>
@@ -361,7 +361,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>

+ 4 - 4
src/views/titlecomponent/Flight.vue

@@ -35,7 +35,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>
@@ -63,7 +63,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>
@@ -158,7 +158,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>
@@ -184,7 +184,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>

+ 2 - 2
src/views/titlecomponent/MathFunc.vue

@@ -35,7 +35,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>
@@ -65,7 +65,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>

+ 2 - 2
src/views/titlecomponent/TACS.vue

@@ -159,7 +159,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="writesolution"
               />
             </template>
@@ -200,7 +200,7 @@
               <el-checkbox
                 :false-label="0"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>

+ 2 - 2
src/views/titlecomponent/Xfoil.vue

@@ -33,7 +33,7 @@
               <el-checkbox
                 :false-label="-1"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>
@@ -62,7 +62,7 @@
               <el-checkbox
                 :false-label="-1"
                 :true-label="1"
-                :label="false"
+                
                 v-model="scope.row.flag"
               />
             </template>

+ 5 - 5
src/views/vueflow/main.css

@@ -1,8 +1,8 @@
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/core@1.40.1/dist/style.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/core@1.40.1/dist/theme-default.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/controls@latest/dist/style.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/minimap@latest/dist/style.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/node-resizer@latest/dist/style.css';
+@import '@vue-flow/core/dist/style.css';
+@import '@vue-flow/core/dist/theme-default.css';
+@import '@vue-flow/controls/dist/style.css';
+@import '@vue-flow/minimap/dist/style.css';
+@import '@vue-flow/node-resizer/dist/style.css';
 
 html,
 body,

+ 9 - 1
src/views/vuetree/index.vue

@@ -1,7 +1,7 @@
 <template>
   <VueFlow ref="vueFlowRef" v-model:nodes="nodes" v-model:edges="edges"  :class="{ dark }"
     class="basic-flow" 
-    style="background-image: url('src/assets/flowimg/surromdao.png'); background-position: center; background-repeat: no-repeat;"
+    :style="backgroundStyle"
     :default-viewport="{ zoom: 1.5 }" :min-zoom="0.2" :max-zoom="2.5" @drop="onDrop1"
     @node-contextmenu="onNodeContextMenu" 
     @dragover="onDragOver" @dragleave="onDragLeave" @edge-click="onEdgeClick" @node-double-click="onNodeDoubleClick" 
@@ -475,6 +475,14 @@ import emitter from "@/utils/emitter";
 import linetablecard from '@/views/vuetree/linetablecard.vue'
 // import func from 'vue-temp/vue-editor-bridge.js';
 
+import backgroundImg from '@/assets/flowimg/surromdao.png'
+
+const backgroundStyle = {
+  backgroundImage: `url(${backgroundImg})`,
+  backgroundPosition: 'center',
+  backgroundRepeat: 'no-repeat'
+}
+
 const dark = ref(false)
 let datatree=ref();
 const route = useRoute();

+ 5 - 5
src/views/vuetree/main.css

@@ -1,8 +1,8 @@
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/core@1.40.1/dist/style.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/core@1.40.1/dist/theme-default.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/controls@latest/dist/style.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/minimap@latest/dist/style.css';
-@import 'https://cdn.jsdelivr.net/npm/@vue-flow/node-resizer@latest/dist/style.css';
+@import '@vue-flow/core/dist/style.css';
+@import '@vue-flow/core/dist/theme-default.css';
+@import '@vue-flow/controls/dist/style.css';
+@import '@vue-flow/minimap/dist/style.css';
+@import '@vue-flow/node-resizer/dist/style.css';
 
 html,
 body,

Some files were not shown because too many files changed in this diff