Merge branch 'master' of http://120.24.203.75:3000/adiao/SSMWeb

src/views/admin1/index.vue

@@ -10,31 +10,15 @@
             <headerComponen />
           </el-header>
           <el-main>
-            <el-row
-              v-show="store.isRows"
-              @changRow="changRowStatus"
-              justify="center"
-              align="middle"
-            >
-              <el-col :span="9">
-                <el-card>
-                  <!-- <div class="image">
+              <el-row v-show="store.isRows" @changRow="changRowStatus" justify="center" align="middle">
+                  <el-col :span="9">
+                      <el-card >
+                        <div class="image">
                           <img class="image " src="@/assets/images/welcome.png">
-                        </div> -->
-                  <template>
-                    <el-image
-                      :src="featureState.property"
-                      fit="fill"
-                      :style="{
-                        height: featureState.asideimgHeight,
-                        width: featureState.width,
-                      }"
-                    >
-                    </el-image>
-                  </template>
-                </el-card>
-              </el-col>
-            </el-row>
+                        </div>
+                      </el-card>
+                  </el-col>
+              </el-row>
             <router-view />
           </el-main>
         </el-container>
@@ -44,22 +28,16 @@
   </div>
 </template>
 <script setup>
-import { onMounted, provide, ref, vShow } from "vue";
-import { useRouter } from "vue-router";
-import headerComponen from "@/components/header.vue";
-import Aside from "@/components/Aside.vue";
-import { useStore } from "@/store/index.js";
+import {onMounted, provide, ref} from 'vue'
+import {useRouter} from 'vue-router'
+import headerComponen from '@/components/header.vue'
+import Aside from '@/components/Aside.vue'
+import {useStore} from "@/store/index.js";
 
-const Router = useRouter();
-const AsideWidth = ref("64px");
-const store = useStore();
-const isRow = ref(store.isRows);
-
-const featureState = reactive({
-  property: "",
-  asideimgHeight: (document.body.clientHeight - 200) / 2 + "px",
-  width: 100 + "%",
-});
+const Router = useRouter()
+const AsideWidth = ref('64px')
+const store = useStore()
+const isRow = ref(store.isRows)
 
 provide("isRow", isRow);
 

src/views/admin1/me/index.vue

@@ -43,69 +43,16 @@ const tableColumn = ref([
   </el-breadcrumb>
 
   <!-- 卡片区域 -->
-  <el-card class="box-card">
-
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <!-- <el-row :gutter="20"> -->
-      <!-- 搜索区域 -->
-      <!-- <el-col :span="5">
-        <el-input placeholder="Please input" class="input-with-select">
-          <template #append>
-            <el-button :icon="Search" round>Search</el-button>
-          </template>
-        </el-input>
-      </el-col> -->
-      <!-- 添加按钮区域 -->
-      <!-- <el-col :span="4">
-        <el-button type="primary">添加部门</el-button>
-      </el-col>
-
-    </el-row> -->
-    <!-- 部门列表区 -->
-    <!-- <el-table
-            :data="tableData"
-            border
-            stripe
-            :height="680"
-    >
-        <el-table-column v-for="{id,prop,label} in tableColumn" :prop="prop" :key="id" :label="label" :width="label === '序号' ? 100:''" align="center" />
-        <el-table-column fixed="right" label="操作" align="center" width="240">
-            <template #default="scope">
-                <el-button link type="primary" size="small" @click="">操作</el-button>
-            </template>
-        </el-table-column>
-    </el-table> -->
-  <!--   分页区   -->
-    <!-- <el-pagination
-            background
-            @size-change=""
-            @current-change=""
-            :current-page="currentPage1"
-            :page-sizes="[15,30,45,60]"
-            :page-size="15"
-            layout="total,sizes,prev, pager,next,jumper"
-            :total="1000"
-    >
-
-    </el-pagination> -->
-  </el-card>
+ <el-row>
+   <el-col >
+     <el-card class="box-card">
+       <div class="meinfo">
+
+       </div>
+     </el-card>
+   </el-col>
+   <el-col></el-col>
+</el-row>
 </template>
 
 <style scoped lang="less">