权限

src/router/index.js

@@ -55,15 +55,15 @@ export const constantRoutes = [
     }],
     hidden: true
   },
-  {
+  // {
-    path: "/dataShow",
+  //   path: "/dataShow",
-    name: '数据展示',
+  //   name: '数据展示',
-    component: () => import('@/views/dataShow/index'),
+  //   component: () => import('@/views/dataShow/index'),
-    meta: {
+  //   meta: {
-      title: "大屏展示",
+  //     title: "大屏展示",
-      icon: "el-icon-data-board"
+  //     icon: "el-icon-data-board"
-    }
+  //   }
-  },
+  // },
   {
     path: '/',
     component: Layout,

src/views/assets/component/addHandles.vue

@@ -204,7 +204,8 @@ export default {
                   {
                     "prop": "id",
                     "width": 60,
-                    "label": "序号"
+                    "label": "序号",
+                    formatter: (row, column, cellValue, index) => (this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
                   },
                   {
                     "prop": "tudiquanshuren",
@@ -432,7 +433,8 @@ export default {
                   {
                     "prop": "id",
                     "width": 60,
-                    "label": "序号"
+                    "label": "序号",
+                    formatter: (row, column, cellValue, index) => (this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
                   },
                   {
                     "prop": "quanshuren",
@@ -604,10 +606,12 @@ export default {
       landDialog: false,
       leasePlans: [],
       landSelect: {
+        is_auth: 1,
         table_name: "lands",
         keyword: ""
       },
       houseSelect: {
+        is_auth: 1,
         table_name: "houses",
         keyword: ""
       },

src/views/assets/detail.vue

@@ -862,31 +862,14 @@ export default {
     },
 
     anchorSelect (href) {
-      const cubic = value => Math.pow(value, 3);
-      const easeInOutCubic = value => value < 0.5
-        ? cubic(value * 2) / 2
-        : 1 - cubic((1 - value) * 2) / 2;
       const { y } = document.querySelector(href)?.getBoundingClientRect()
-      let scrollTop = y - 70
+      const el = document.querySelector(".app-main-scroll")
-      const el = document.querySelector(".app-main-scroll");
+      let scrollTop = y - 70 + el.scrollTop
       el.scrollTo({
         left: 0,
         top: scrollTop,
         behavior: "smooth"
       })
-      // const beginTime = Date.now();
-      // const beginValue = el.scrollTop;
-      // const rAF = window.requestAnimationFrame || (func => setTimeout(func, 16));
-      // const frameFunc = () => {
-      //   const progress = (Date.now() - beginTime) / 500;
-      //   if (progress < 1) {
-      //     el.scrollTop = beginValue * (1 - easeInOutCubic(progress));
-      //     rAF(frameFunc);
-      //   } else {
-      //     el.scrollTop = 0;
-      //   }
-      // };
-      // rAF(frameFunc);
     },
 
     copyLocation () {
@@ -1087,6 +1070,7 @@ export default {
     },
 
     async getLeases () {
+      if(this.detail.leases.length <= 0) return
       const res = await index({
         table_name: 'leases',
         page: 1,

src/views/assets/fileList.vue

@@ -178,6 +178,7 @@ export default {
         }
       ],
       select: {
+        is_auth: 1,
         keyword: ""
       }
     };

src/views/assets/handle.vue

@@ -654,6 +654,22 @@ export default {
         label: "序号",
         formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
       })
+      this.table.push({
+        prop: 'admin.name',
+        width: 120,
+        label: '提交人'
+      })
+      this.table.push({
+        prop: 'department.name',
+        width: 120,
+        label: '提交部门'
+      })
+      this.table.push({
+        prop: 'created_at',
+        width: 160,
+        label: '提交日期',
+        formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+      })
     },
 
     adjustAlignment () {

src/views/assets/handleSign.vue

@@ -210,6 +210,8 @@ export default {
         </el-card>
 
         <el-drawer
+          append-to-body
+          modal-append-to-body
           title="土地列表"
           visible={this.landDialog}
           size="64%"
@@ -252,6 +254,7 @@ export default {
                   prop: "id",
                   width: 60,
                   label: "序号",
+                  formatter: (row, column, cellValue, index) => (this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
                 },
                 {
                   prop: "tudiquanshuren",
@@ -445,6 +448,8 @@ export default {
         </el-drawer>
 
         <el-drawer
+          append-to-body
+          modal-append-to-body
           title="房产列表"
           visible={this.houseDialog}
           size="64%"
@@ -487,6 +492,7 @@ export default {
                   prop: "id",
                   width: 60,
                   label: "序号",
+                  formatter: (row, column, cellValue, index) => (this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
                 },
                 {
                   prop: "quanshuren",

src/views/assets/handleSignList.vue

@@ -629,6 +629,22 @@ export default {
         label: "序号",
         formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
       })
+      this.table.push({
+        prop: 'admin.name',
+        width: 120,
+        label: '提交人'
+      })
+      this.table.push({
+        prop: 'department.name',
+        width: 120,
+        label: '提交部门'
+      })
+      this.table.push({
+        prop: 'created_at',
+        width: 160,
+        label: '提交日期',
+        formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+      })
     },
 
     adjustAlignment () {

src/views/assets/house.vue

@@ -789,6 +789,22 @@ export default {
         label: "序号",
         formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
       })
+      this.table.push({
+        prop: 'admin.name',
+        width: 120,
+        label: '提交人'
+      })
+      this.table.push({
+        prop: 'department.name',
+        width: 120,
+        label: '提交部门'
+      })
+      this.table.push({
+        prop: 'created_at',
+        width: 160,
+        label: '提交日期',
+        formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+      })
     },
     adjustAlignment () {
       if (this.firstAdjustTable) {

src/views/assets/land.vue

@@ -786,7 +786,22 @@ export default {
         label: "序号",
         formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
       })
-
+      this.table.push({
+        prop: 'admin.name',
+        width: 120,
+        label: '提交人'
+      })
+      this.table.push({
+        prop: 'department.name',
+        width: 120,
+        label: '提交部门'
+      })
+      this.table.push({
+        prop: 'created_at',
+        width: 160,
+        label: '提交日期',
+        formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+      })
     },
     adjustAlignment () {
       if (this.firstAdjustTable) {

src/views/lease/component/addLet.vue

@@ -186,7 +186,8 @@ export default {
                   {
                     "prop": "id",
                     "width": 60,
-                    "label": "序号"
+                    "label": "序号",
+                    formatter: (row, column, cellValue, index) => (this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
                   },
                   {
                     "prop": "tudiquanshuren",
@@ -413,7 +414,8 @@ export default {
                   {
                     "prop": "id",
                     "width": 60,
-                    "label": "序号"
+                    "label": "序号",
+                    formatter: (row, column, cellValue, index) => (this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
                   },
                   {
                     "prop": "quanshuren",
@@ -580,10 +582,12 @@ export default {
       landDialog: false,
       leasePlans: [],
       landSelect: {
+        is_auth: 1,
         table_name: "lands",
         keyword: ""
       },
       houseSelect: {
+        is_auth: 1,
         table_name: "houses",
         keyword: ""
       },

src/views/lease/component/payList.vue

@@ -25,6 +25,7 @@ export default {
       form: {},
       expands: [],
       select: {
+        is_auth: 1,
         table_name: "lease_plans",
         filter: [
           {

src/views/lease/index.vue

@@ -334,6 +334,7 @@ export default {
       firstAdjustTable: true,
       op,
       select: {
+        is_auth: 1,
         table_name: "",
         filter: [
           {
@@ -630,6 +631,22 @@ export default {
         label: "序号",
         formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
       })
+      this.table.push({
+        prop: 'admin.name',
+        width: 120,
+        label: '提交人'
+      })
+      this.table.push({
+        prop: 'department.name',
+        width: 120,
+        label: '提交部门'
+      })
+      this.table.push({
+        prop: 'created_at',
+        width: 160,
+        label: '提交日期',
+        formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+      })
     },
 
     adjustAlignment () {

src/views/lease/leaseLog.vue

@@ -293,6 +293,7 @@ export default {
       firstAdjustTable: true,
       op,
       select: {
+        is_auth: 1,
         table_name: "",
         filter: [
           {

src/views/lease/let.vue

@@ -312,6 +312,7 @@ export default {
       firstAdjustTable: true,
       op,
       select: {
+        is_auth: 1,
         table_name: "",
         filter: [
           {
@@ -571,6 +572,22 @@ export default {
         label: "序号",
         formatter: (row, column, cellValue, index) => (this.$refs['xyTable'].selectOpt.page - 1) * this.$refs['xyTable'].selectOpt.page_size + index + 1
       })
+      this.table.push({
+        prop: 'admin.name',
+        width: 120,
+        label: '提交人'
+      })
+      this.table.push({
+        prop: 'department.name',
+        width: 120,
+        label: '提交部门'
+      })
+      this.table.push({
+        prop: 'created_at',
+        width: 160,
+        label: '提交日期',
+        formatter: (row, column, cellValue, index) => this.$moment(cellValue).format('YYYY-MM-DD')
+      })
     },
 
     adjustAlignment () {

src/views/lease/plan.vue

@@ -332,6 +332,7 @@ export default {
       firstAdjustTable: true,
       op,
       select: {
+        is_auth: 1,
         sort_name: 'zujindiyicidaoweishijian',
         table_name: "",
         filter: [

src/views/lease/sign.vue

@@ -722,6 +722,7 @@ export default {
                   prop: "id",
                   width: 60,
                   label: "序号",
+                  formatter: (row, column, cellValue, index) => (this.$refs['landLinkTable'].selectOpt.page - 1) * this.$refs['landLinkTable'].selectOpt.page_size + index + 1
                 },
                 {
                   prop: "tudiquanshuren",
@@ -973,6 +974,7 @@ export default {
                   prop: "id",
                   width: 60,
                   label: "序号",
+                  formatter: (row, column, cellValue, index) => (this.$refs['houseLinkTable'].selectOpt.page - 1) * this.$refs['houseLinkTable'].selectOpt.page_size + index + 1
                 },
                 {
                   prop: "quanshuren",
@@ -1155,10 +1157,12 @@ export default {
       leasePlans: [],
       oldLeasePlans: [],
       landSelect: {
+        is_auth: 1,
         table_name: "lands",
         keyword: "",
       },
       houseSelect: {
+        is_auth: 1,
         table_name: "houses",
         keyword: "",
       },