From 281f7e35f6b6652c10b32411fb419174b9617f78 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 31 Aug 2023 15:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A4=B9+demo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.js                            |   1 -
 src/views/main-navbar.vue                     |  64 +++++-
 src/views/modules/Project/demo.vue            | 207 ++++++++++++++++++
 src/views/modules/base/factoryInformation.vue |   1 +
 src/views/modules/sys/user.vue                |   2 +-
 5 files changed, 271 insertions(+), 4 deletions(-)
 create mode 100644 src/views/modules/Project/demo.vue

diff --git a/src/utils/index.js b/src/utils/index.js
index 963d19d..e104929 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -16,7 +16,6 @@ export function getUUID () {
  * @param {*} key
  */
 export function isAuth (key) {
-  console.log(sessionStorage.getItem('permissions'))
   // console.log(key)
   // console.log(JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false)
   return JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index cd340bc..051fc26 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -21,6 +21,11 @@
       <el-menu
         class="site-navbar__menu site-navbar__menu--right"
         mode="horizontal">
+        <el-menu-item class="site-navbar__avatar" index="0">
+          <span @click="favoriteFunction()">
+         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
+        </span>
+        </el-menu-item>
         <el-menu-item class="site-navbar__avatar" index="1">
          <span class="el-dropdown-link" @click="userSetting">
             <icon-svg name="editTable"  style="width: 25px;height: 25px;margin-top: 5px"></icon-svg>
@@ -91,12 +96,14 @@ import {
   searchSysLanguage,
 } from "@/api/sysLanguage.js"
 
-
+import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
 
 export default {
   inject: ['refresh'],
   data() {
     return {
+      favorite: false,
+      route:this.$route.meta.menuId,
       visible: false,
       updatePassowrdVisible: false,
       updateLanguageVisible: false,
@@ -195,6 +202,12 @@ export default {
         this.pending.pendingSum = this.pending.pendingReview
       }
     },
+    $route: {
+      deep: true,
+      handler: function (newV, oldV) {
+        this.favoriteIsOk();
+      }
+    },
   },
   components: {
     UpdatePassword,
@@ -332,7 +345,54 @@ export default {
         })
       }).catch(() => {
       })
-    }
+    },
+
+    //收藏夹功能      // 校验用户是否收藏
+    favoriteIsOk() {
+
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        languageCode: 'cn'
+      }
+
+      userFavoriteList(userFavorite).then(({data}) => {
+        this.favorite = false
+        for (let i = 0; i < data.list.length; i++) {
+          if(this.$route.meta.menuId==data.list[i].menuId){
+            this.favorite = true
+            // flag=true;
+          }
+        }
+
+      })
+    },
+    // 收藏 OR 取消收藏
+    favoriteFunction() {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        functionId: this.$route.meta.menuId,
+      }
+      if (this.favorite) {
+        // 取消收藏
+        this.$confirm(`确定取消收藏`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          removeUserFavorite(userFavorite).then(({data}) => {
+            this.$message.success(data.msg)
+            this.favorite = false
+          })
+        })
+      } else {
+        // 收藏
+        saveUserFavorite(userFavorite).then(({data}) => {
+          this.$message.success(data.msg)
+          this.favorite = true
+        })
+      }
+
+    },
   },
   created() {
     this.getLanguageList()
diff --git a/src/views/modules/Project/demo.vue b/src/views/modules/Project/demo.vue
new file mode 100644
index 0000000..0b9b771
--- /dev/null
+++ b/src/views/modules/Project/demo.vue
@@ -0,0 +1,207 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -10px;">
+      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 33px">查询</el-button>
+    </el-form>
+
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</a>
+          <a type="text" size="small" @click="deleteHandle(scope.row.id)">删除</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                             style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </div>
+</template>
+
+<script>
+
+  import {
+    getTableDefaultListLanguage,
+    getTableUserListLanguage,
+  } from "@/api/table.js"
+  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+
+  export default {
+    name: "null",
+    data() {
+      return {
+        // 是否收藏 收藏夹功能
+        favorite: false,
+        //动态列开始
+        visible: false,
+        queryTable: {
+          functionId: this.$route.meta.menuId,
+          tableId: "mainTable",
+          languageCode: this.$i18n.locale
+        },
+        // 用户table 查询参数
+        queryTableUser: {
+          userId: this.$store.state.user.name,
+          functionId: this.$route.meta.menuId,
+          tableId: "mainTable",
+          status: true,
+          languageCode: this.$i18n.locale
+        },
+        //动态列结束
+        height: 200,
+        dataList:[],
+        dataListLoading: false,
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 104001001,
+            serialNumber: '104001001Table3OrderNo',
+            tableId: "104001001Table3",
+            tableName: "生产订单数据获取表",
+            columnProp: "orderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "订单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },
+        ],
+      }
+    },
+    watch: {
+      // $route: {
+      //   handler: function (val, oldVal) {
+      //     this.$router.onReady(() => {
+      //       if (this.$route.query.order) {
+      //         this.modelData.orderNo = this.$route.query.order
+      //         this.modelData.site = this.$route.query.site
+      //         this.modelData.user = this.$route.query.user
+      //         if (this.modelData.orderNo) {
+      //           this.tableHanddle(this.modelData)
+      //         }
+      //       }
+      //     })
+      //   },
+      //   // 深度观察监听
+      //   deep: true
+      // },
+
+      // updateData: {
+      //   deep: true,
+      //   handler: function (newV, oldV) {
+      //     this.updateData.projectID = this.updateData.projectID.toUpperCase();
+      //     this.updateData.oriSOOrderNo = this.updateData.oriSOOrderNo.toUpperCase();
+      //     this.updateData.orderType = this.updateData.orderType.toUpperCase();
+      //   }
+      // }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 240;
+      })
+    },
+    methods: {
+      // 动态列开始 获取 用户保存的 格式列
+      async getTableUserColumn(tableId, columnId) {
+        let queryTableUser = {
+          userId: this.$store.state.user.name,
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          status: true,
+          languageCode: this.$i18n.locale
+        }
+        await getTableUserListLanguage(queryTableUser).then(({data}) => {
+          if (data.rows.length > 0) {
+            //this.columnList = []
+            switch (columnId) {
+              case 1:
+                this.columnList = data.rows
+                break;
+              // case 2:
+              //   this.columnList1 = data.rows
+              //   break;
+              // case 3:
+              //   this.columnList2 = data.rows
+              //   break;
+              // case 4:
+              //   this.columnList3 = data.rows
+              //   break;
+            }
+
+          } else {
+            this.getColumnList(tableId, columnId)
+          }
+        })
+
+      },
+      // 获取 tableDefault 列
+      async getColumnList(tableId, columnId) {
+        this.queryTable.tableId = tableId
+        let   queryTable= {
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          languageCode: this.$i18n.locale
+        }
+        await getTableDefaultListLanguage(queryTable).then(({data}) => {
+          if (!data.rows.length == 0) {
+            switch (columnId) {
+              case 1:
+                this.columnList = data.rows
+                break;
+              // case 2:
+              //   this.columnList1 = data.rows
+              //   break;
+              // case 3:
+              //   this.columnList2 = data.rows
+              //   break;
+              // case 4:
+              //   this.columnList3 = data.rows
+              //   break;
+            }
+          } else {
+            // this.showDefault = true
+          }
+        })
+
+      },
+      // 动态列结束
+
+
+    },
+    created() {
+      this.getTableUserColumn(this.queryTable.functionId+'table',1)
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue
index 56b9a73..a17b34c 100644
--- a/src/views/modules/base/factoryInformation.vue
+++ b/src/views/modules/base/factoryInformation.vue
@@ -362,6 +362,7 @@
             companyInformation:'查看会计单位信息',
             save:'保存',
             close:'关闭',
+
           },
           queryButton: {
             functionId: functionId,
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index d89d5a9..fbc24d1 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -66,7 +66,7 @@
       </el-table-column>
       <el-table-column
         prop="createTime"
-        header-align="center"0
+        header-align="center"
         align="center"
         width="180"
         :label="buttons.createTime||'创建时间'">