Kezdőlap Felfedezés Súgó
Bejelentkezés
wutong-dev
/
wt_project_web_bak
2
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

fix ui

scorpio 2 éve
szülő
0614ea63cb
commit
b7930c06b8
15 módosított fájl, 116 hozzáadás és 129 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 1 1
      index.html
  2. 2 12
      src/App.vue
  3. 4 3
      src/layout/index.vue
  4. 2 12
      src/layout/left.vue
  5. 5 3
      src/layout/top.vue
  6. 27 18
      src/views/database/component/serach.vue
  7. 5 7
      src/views/database/index.vue
  8. 8 9
      src/views/home/component/dash.vue
  9. 2 2
      src/views/home/component/owner_serach.vue
  10. 5 4
      src/views/home/component/pro_left.vue
  11. 3 2
      src/views/home/details.vue
  12. 1 1
      src/views/invest/components/years.vue
  13. 9 11
      src/views/invest/index.vue
  14. 2 4
      src/views/invest/resource.vue
  15. 40 40
      src/views/recycle/index.vue

+ 1 - 1
index.html
Fájl Megtekintése 

@@ -6,7 +6,7 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>梧桐树项目管理平台</title>
 
   </head>
 
-  <body style='height: 100%'>
 
+  <body style='height: 100%;background-color: #f6f7f8'>
 
     <div id="app" style='height: 100%'></div>
 
     <script type="module" src="/src/main.js">
 
       console.info('%c由%cFantastic-admin%c提供支持', 'font-size: 14px; margin-bottom: 2px; padding: 6px 8px; color: #fff; background: #707070;', 'font-size: 14px; margin-bottom: 2px; padding: 6px 8px; color: #fff; background: #e24329;', 'font-size: 14px; margin-bottom: 2px; padding: 6px 8px; color: #fff; background: #707070;', '\nhttps://gitee.com/hooray/fantastic-admin')

+ 2 - 12
src/App.vue
Fájl Megtekintése 

@@ -27,17 +27,7 @@ export default {
 
 </script>
 
 
 <style scoped>
 
-.logo {
 
-  height: 6em;
 
-  padding: 1.5em;
 
-  will-change: filter;
 
-}
 
-
 
-.logo:hover {
 
-  filter: drop-shadow(0 0 2em #646cffaa);
 
-}
 
-
 
-.logo.vue:hover {
 
-  filter: drop-shadow(0 0 2em #42b883aa);
 
+#app {
 
+  background-color: #f6f7f8;
 
 }
 
 </style>

+ 4 - 3
src/layout/index.vue
Fájl Megtekintése 

@@ -5,10 +5,10 @@
 
         <top @openMenu="show = true" />
 
       </el-header>
 
       <div class="flex" style="padding: 20px 20px; background-color: #f6f7f8">
 
-        <el-aside style="width: 200px" v-if="!mini">
 
+        <el-aside style="width: 200px; position: fixed; left: 0" v-if="!mini">
 
           <left />
 
         </el-aside>
 
-        <el-main class="wt-main" @scroll="scroll">
 
+        <el-main class="wt-main hide-scrollbar" @scroll="scroll">
 
           <div class="wrapper">
 
             <router-view v-slot="{ Component, route }">
 
               <keep-alive :include="keepAlive.list">
 
@@ -114,8 +114,9 @@ export default {
 
 
 .wt-main {
 
   width: 1200px;
 
-  height: calc(100vh - 60px);
 
+  height: calc(100vh - 100px);
 
   background-color: #f6f7f8;
 
+  overflow-x: hidden;
 
   padding: 0;
 
 }

+ 2 - 12
src/layout/left.vue
Fájl Megtekintése 

@@ -76,23 +76,12 @@ export default {
 
       const item = localStorage.getItem('index')
 
       if (item) {
 
         const menu = JSON.parse(item)
 
-        console.log(menu)
 
         this.active = menu.active
 
         this.subActive = menu.subActive
 
       }
 
-      this.navClick(
 
-        this.active,
 
-        this.data[this.active].hasChildren ? 2 : 1,
 
-        this.subActive
 
-      )
 
-      console.log(this.data[this.active].hasChildren)
 
       if (this.data[this.active].hasChildren === true) {
 
         this.activeCollapse = this.data[this.active].name
 
         this.data[this.active].children[this.subActive].checked = true
 
-        console.log(
 
-          this.activeCollapse,
 
-          this.data[this.active].children[this.subActive].checked
 
-        )
 
       } else {
 
         this.activeCollapse = this.data[this.active].name
 
         this.data[this.active].checked = true
 
@@ -100,6 +89,7 @@ export default {
 
     },
 
     menus() {
 
       this.$api.common.getMenus().then(res => {
 
+        console.log('fuck' + new Date().getTime())
 
         if (res.code === 200) {
 
           this.data = res.data.map(sub => {
 
             sub.hasChildren = Object.hasOwn(sub, 'children')
 
@@ -141,7 +131,7 @@ export default {
 
             : 'project'
 
         )
 
       } else {
 
-        this.$router.push(this.data[index].path)
 
+        // this.$router.push(this.data[index].path)
 
         localStorage.setItem(
 
           'data-type',
 
           this.data[index].remark ? this.data[index].remark : 'project'

+ 5 - 3
src/layout/top.vue
Fájl Megtekintése 

@@ -13,9 +13,11 @@
 
             @click="openMenu"
 
             v-if="mini"
 
           />
 
-          <div class="flex flex-center">
 
-            <img src="@/assets/svg/logo.svg" />
 
-          </div>
 
+          <router-link to="/">
 
+            <div class="flex flex-center">
 
+              <img src="@/assets/svg/logo.svg" />
 
+            </div>
 
+          </router-link>
 
         </div>
 
       </el-col>
 
       <el-col :span="12">

+ 27 - 18
src/views/database/component/serach.vue
Fájl Megtekintése 

@@ -1,13 +1,16 @@
 
 <template>
 
-  <div class="flex flex-col flex-justify-between padding white-bg">
 
+  <el-card
 
+    shadow="hover"
 
+    class="flex flex-col flex-justify-between padding white-bg"
 
+  >
 
     <el-form v-model="form" class="lab mt-20" label-width="120px">
 
       <el-col :span="24" class="flex flex-center">
 
         <el-col :span="12">
 
           <el-form-item class="full-width" label="搜索文件">
 
             <el-input
 
-                v-model="form.keyword"
 
-                placeholder="输入文件关键字"
 
-                prefix-icon="Search"
 
+              v-model="form.keyword"
 
+              placeholder="输入文件关键字"
 
+              prefix-icon="Search"
 
             />
 
           </el-form-item>
 
         </el-col>
 
@@ -27,11 +30,11 @@
 
             <el-col :span="11">
 
               <el-form-item>
 
                 <el-date-picker
 
-                    v-model="form.startTime"
 
-                    placeholder="开始日期"
 
-                    style="width: 100%"
 
-                    type="date"
 
-                    value-format="YYYY-MM-DD"
 
+                  v-model="form.startTime"
 
+                  placeholder="开始日期"
 
+                  style="width: 100%"
 
+                  type="date"
 
+                  value-format="YYYY-MM-DD"
 
                 />
 
               </el-form-item>
 
             </el-col>
 
@@ -41,11 +44,11 @@
 
             <el-col :span="11">
 
               <el-form-item>
 
                 <el-date-picker
 
-                    v-model="form.endTime"
 
-                    placeholder="结束日期"
 
-                    style="width: 100%"
 
-                    type="date"
 
-                    value-format="YYYY-MM-DD"
 
+                  v-model="form.endTime"
 
+                  placeholder="结束日期"
 
+                  style="width: 100%"
 
+                  type="date"
 
+                  value-format="YYYY-MM-DD"
 
                 />
 
               </el-form-item>
 
             </el-col>
 
@@ -67,11 +70,17 @@
 
     <div class="flex full-width flex-center flex-justify-between">
 
       <div></div>
 
       <div class="flex flex-center mb-10 mt-10">
 
-        <base-button class="pointer" icon="Delete" title="清空" type="0" @click="clear"/>
 
-        <base-button class="ml-20 pointer" @click="fileSure"/>
 
+        <base-button
 
+          class="pointer"
 
+          icon="Delete"
 
+          title="清空"
 
+          type="0"
 
+          @click="clear"
 
+        />
 
+        <base-button class="ml-20 pointer" @click="fileSure" />
 
       </div>
 
     </div>
 
-  </div>
 
+  </el-card>
 
 </template>
 
 
 <script>
 
@@ -79,7 +88,7 @@ import baseButton from '../../../components/base-button.vue'
 
 
 export default {
 
   name: 'serach',
 
-  components: {baseButton},
 
+  components: { baseButton },
 
   data() {
 
     return {
 
       form: {

+ 5 - 7
src/views/database/index.vue
Fájl Megtekintése 

@@ -1,9 +1,9 @@
 
 <template>
 
   <div class="flex flex-col full-height">
 
-    <serach/>
 
-    <div class="full-width full-height mt-10">
 
-      <list/>
 
-    </div>
 
+    <serach />
 
+    <el-card shadow="hover" class="full-width full-height mt-10">
 
+      <list />
 
+    </el-card>
 
   </div>
 
 </template>
 
 
@@ -24,6 +24,4 @@ export default {
 
 }
 
 </script>
 
 
-<style scoped>
 
-
 
-</style>
 
+<style scoped></style>

+ 8 - 9
src/views/home/component/dash.vue
Fájl Megtekintése 

@@ -1,5 +1,5 @@
 
 <template>
 
-  <div class="full-height full-width flex flex-col">
 
+  <el-card shadow="hover" class="full-height full-width flex flex-col">
 
     <div class="flex flex-col padding white-bg">
 
       <div class="flex flex-align-center tip">
 
         <el-icon class="ml-20" color="#BC002D">
 
@@ -13,8 +13,7 @@
 
         >
 
       </div>
 
       <div
 
-        class="flex ml-20 hide-scrollbar"
 
-        style="overflow-x: scroll; width: 86vw"
 
+        class="flex ml-20 hide-scrollbar full-width flex-wrap"
 
         v-show="numList && numList.length > 0"
 
       >
 
         <div
 
@@ -357,7 +356,7 @@
 
         </div>
 
       </div>
 
     </el-dialog>
 
-  </div>
 
+  </el-card>
 
 </template>
 
 
 <script>
 
@@ -369,6 +368,7 @@ import summaryDialog from '@/views/home/component/summary_dialog.vue'
 
 import { useStore } from '@/store/user.js'
 
 import confing from '@/config/website'
 
 import { ElMessageBox } from 'element-plus'
 
+import BasicContainer from '@/components/basic-container/main.vue'
 
 
 export default {
 
   name: 'dash',
 
@@ -447,7 +447,8 @@ export default {
 
           },
 
           {
 
             label: '责任单位',
 
-            prop: 'unit_name'
 
+            prop: 'unit_name',
 
+            width: 180
 
           },
 
           {
 
             label: '子项目数量',
 
@@ -610,10 +611,8 @@ export default {
 
       if (!Object.hasOwn(this.owerQuery, 'projectYear')) {
 
         this.owerQuery.projectYear = new Date().getFullYear()
 
       }
 
-      console.log(this.owerQuery)
 
       const data = { ...this.owerQuery, parentId: this.parentId }
 
       this.queryData = data
 
-      console.log(this.queryData)
 
       this.$api.project
 
         .projectList(this.page.currentPage, this.page.pageSize, this.queryData)
 
         .then(res => {
 
@@ -931,7 +930,7 @@ export default {
 
 }
 
 
 .total-s {
 
-  width: 200px;
 
+  width: 160px;
 
   height: 50px;
 
   border: 1px solid #825618;
 
   border-radius: 10px;
 
@@ -951,7 +950,7 @@ export default {
 
 }
 
 
 .total {
 
-  width: 200px;
 
+  width: 160px;
 
   height: 50px;
 
   border-radius: 10px;
 
   margin-right: 20px;

+ 2 - 2
src/views/home/component/owner_serach.vue
Fájl Megtekintése 

@@ -1,5 +1,5 @@
 
 <template>
 
-  <div class="flex flex-center padding white-bg">
 
+  <el-card shadow="hover" class="flex flex-center padding white-bg">
 
     <el-form v-model="form" class="lab mt-20 full-width" label-width="145px">
 
       <div class="flex">
 
         <!-------left------->
 
@@ -216,7 +216,7 @@
 
         />
 
       </div>
 
     </el-dialog>
 
-  </div>
 
+  </el-card>
 
 </template>
 
 
 <script>

+ 5 - 4
src/views/home/component/pro_left.vue
Fájl Megtekintése 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div>
 
-    <div
 
-      class="white-bg top full-height flex flex-col hide-scrollbar"
 
+    <el-card
 
+      class="top full-height flex flex-col hide-scrollbar"
 
       style="overflow-y: auto"
 
     >
 
       <div class="flex flex-col flex-center mt-15 padding">
 
@@ -82,7 +82,7 @@
 
           </div>
 
         </div>
 
       </div>
 
-    </div>
 
+    </el-card>
 
     <pro-relation
 
       :showRelation="showRelation"
 
       :projectId="data.id"
 
@@ -305,7 +305,8 @@ export default {
 
 .top {
 
   width: 300px;
 
   position: fixed;
 
-  background-color: #faf9fa;
 
+  height: calc(100vh - 100px);
 
+  background-color: white;
 
 }
 
 
 .down {

+ 3 - 2
src/views/home/details.vue
Fájl Megtekintése 

@@ -9,7 +9,8 @@
 
         @typeChange1="typeChange1"
 
       />
 
     </div>
 
-    <div
 
+    <el-card
 
+      shadow="hover"
 
       class="full-height full-width white-bg padding-left padding-top"
 
       style="margin-left: 300px"
 
     >
 
@@ -27,7 +28,7 @@
 
         :projectStageId="projectStageId"
 
       />
 
       <grant-record v-else />
 
-    </div>
 
+    </el-card>
 
   </div>
 
 </template>

+ 1 - 1
src/views/invest/components/years.vue
Fájl Megtekintése 

@@ -9,7 +9,7 @@
 
       />
 
     </div>
 
     <el-row class="flex flex-center full-width mt-10 flex-wrap">
 
-      <el-col :lg="12" :xl="6" v-for="i in dash" :key="i">
 
+      <el-col :span="12" v-for="i in dash" :key="i">
 
         <div class="box" :style="`box-shadow: ` + i.box">
 
           <div class="flex flex-col bold font-16 padding-14">
 
             <div class="flex flex-justify-start flex-align-end">

+ 9 - 11
src/views/invest/index.vue
Fájl Megtekintése 

@@ -2,12 +2,12 @@
 
   <div class="flex flex-center full-width">
 
     <div class="full-width flex mt-10">
 
       <el-col :span="6" v-if="hasChildrenDept">
 
-        <basic-container>
 
+        <el-card shadow="hover" style="bottom: 0">
 
           <left :has-children="hasChildrenDept" @change="changeDept" />
 
-        </basic-container>
 
+        </el-card>
 
       </el-col>
 
-      <el-col :span="hasChildrenDept ? 18 : 24">
 
-        <basic-container>
 
+      <el-col class="ml-10" :span="hasChildrenDept ? 18 : 24">
 
+        <el-card shadow="hover">
 
           <div class="flex flex-align-start">
 
             <el-select
 
               v-model="year"
 
@@ -26,8 +26,8 @@
 
           <div class="mt-20">
 
             <years :dept-id="dept" :year="year" @change="change" />
 
           </div>
 
-        </basic-container>
 
-        <basic-container>
 
+        </el-card>
 
+        <el-card shadow="hover" class="mt-10">
 
           <div class="flex query-screen">
 
             <div
 
               class="flex-child-average full-width flex flex-col flex-justify-start"
 
@@ -84,7 +84,7 @@
 
               <complete v-else :type="yearType" :deptId="dept" :year="year" />
 
             </div>
 
           </div>
 
-        </basic-container>
 
+        </el-card>
 
       </el-col>
 
     </div>
 
   </div>
 
@@ -193,9 +193,7 @@ export default {
 
 </script>
 
 
 <style scoped>
 
-@media (max-width: 1440px) {
 
-  .query-screen {
 
-    flex-direction: column;
 
-  }
 
+.query-screen {
 
+  flex-direction: column;
 
 }
 
 </style>

+ 2 - 4
src/views/invest/resource.vue
Fájl Megtekintése 

@@ -193,9 +193,7 @@ export default {
 
 </script>
 
 
 <style scoped>
 
-@media (max-width: 1440px) {
 
-  .query-screen {
 
-    flex-direction: column;
 
-  }
 
+.query-screen {
 
+  flex-direction: column;
 
 }
 
 </style>

+ 40 - 40
src/views/recycle/index.vue
Fájl Megtekintése 

@@ -1,19 +1,21 @@
 
 <template>
 
-  <div class="full-height full-width flex flex-col">
 
-    <avue-crud ref="crud"
 
-               v-model="form"
 
-               v-model:page="page"
 
-               :before-open="beforeOpen"
 
-               :data="data"
 
-               :option="option"
 
-               :table-loading="loading"
 
-               @row-del="rowDel"
 
-               @current-change="currentChange"
 
-               @size-change="sizeChange"
 
-               @refresh-change="refreshChange"
 
-               @on-load="onLoad">
 
+  <el-card shadow="hover" class="full-height full-width flex flex-col">
 
+    <avue-crud
 
+      ref="crud"
 
+      v-model="form"
 
+      v-model:page="page"
 
+      :before-open="beforeOpen"
 
+      :data="data"
 
+      :option="option"
 
+      :table-loading="loading"
 
+      @row-del="rowDel"
 
+      @current-change="currentChange"
 
+      @size-change="sizeChange"
 
+      @refresh-change="refreshChange"
 
+      @on-load="onLoad"
 
+    >
 
     </avue-crud>
 
-  </div>
 
+  </el-card>
 
 </template>
 
 
 <route>
 
@@ -24,10 +26,9 @@ name: '回收站',
 
 </route>
 
 
 <script>
 
-
 
 export default {
 
   name: 'index',
 
-  data () {
 
+  data() {
 
     return {
 
       keyWords: '',
 
       loading: false,
 
@@ -95,12 +96,13 @@ export default {
 
           {
 
             label: '删除人',
 
             prop: 'createUserName'
 
-          }]
 
+          }
 
+        ]
 
       }
 
     }
 
   },
 
   methods: {
 
-    onLoad () {
 
+    onLoad() {
 
       this.loading = true
 
       this.page.current = this.page.currentPage
 
       this.page.size = this.page.pageSize
 
@@ -113,15 +115,16 @@ export default {
 
         }
 
       })
 
     },
 
-    beforeOpen (done, type) {
 
+    beforeOpen(done, type) {
 
       if (type === 'edit') {
 
         this.$confirm('确定恢复所选择的文件?', {
 
           confirmButtonText: '确定',
 
           cancelButtonText: '取消',
 
           type: 'warning'
 
-        })
 
-          .then(() => {
 
-            this.$api.recycle.recycleBack({ recycleBinId: this.form.id }).then(res => {
 
+        }).then(() => {
 
+          this.$api.recycle
 
+            .recycleBack({ recycleBinId: this.form.id })
 
+            .then(res => {
 
               if (res.code === 200) {
 
                 this.$message.success(res.msg)
 
                 this.onLoad()
 
@@ -129,39 +132,36 @@ export default {
 
                 this.$message.error(res.msg)
 
               }
 
             })
 
-          })
 
+        })
 
       }
 
     },
 
-    currentChange (currentPage) {
 
+    currentChange(currentPage) {
 
       this.page.currentPage = currentPage
 
     },
 
-    sizeChange (pageSize) {
 
+    sizeChange(pageSize) {
 
       this.page.size = pageSize
 
     },
 
-    refreshChange () {
 
+    refreshChange() {
 
       this.onLoad()
 
     },
 
-    rowDel (row) {
 
+    rowDel(row) {
 
       this.$confirm('确定彻底删除所选择的文件?', {
 
         confirmButtonText: '确定',
 
         cancelButtonText: '取消',
 
         type: 'warning'
 
-      })
 
-        .then(() => {
 
-          this.$api.recycle.recycleRemove({ ids: row.id }).then(res => {
 
-            if (res.code === 200) {
 
-              this.$message.success(res.msg)
 
-              this.onLoad()
 
-            } else {
 
-              this.$message.error(res.msg)
 
-            }
 
-          })
 
+      }).then(() => {
 
+        this.$api.recycle.recycleRemove({ ids: row.id }).then(res => {
 
+          if (res.code === 200) {
 
+            this.$message.success(res.msg)
 
+            this.onLoad()
 
+          } else {
 
+            this.$message.error(res.msg)
 
+          }
 
         })
 
+      })
 
     }
 
   }
 
 }
 
 </script>
 
 
-<style scoped>
 
-
 
-</style>
 
+<style scoped></style>