工具管理、技术交流平台、统计分析、消息中心静态页面调整

.gitignore

@@ -0,0 +1,22 @@
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
+package-lock.json

src/api/message/message.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+/**
+ * 查询消息列表
+ * @returns
+ */
+export function getMessageList(params) {
+  return Promise.resolve({
+    total: 5,
+    rows: [
+      { id: 1, msgContent: '测试1111', msgRecTime: '2024-08-05 12:31:59', msgStatus: 'unread' },
+      { id: 2, msgContent: '测试2222', msgRecTime: '2024-08-05 13:32:01', msgStatus: 'readed' },
+      { id: 3, msgContent: '测试333', msgRecTime: '2024-08-05 14:09:07', msgStatus: 'unread' },
+      { id: 4, msgContent: '测试4444', msgRecTime: '2024-08-05 15:37:10', msgStatus: 'readed' },
+      { id: 5, msgContent: '测试5555', msgRecTime: '2024-08-05 17:29:39', msgStatus: 'unread' }
+    ],
+    code: 200,
+    msg: '操作成功'
+  })
+}
+
+/**
+ * 标记所有已读
+ * @returns
+ */
+export function markAllRead() {
+  return Promise.resolve({
+    result: {},
+    code: 200,
+    msg: '操作成功'
+  })
+}
+
+/**
+ * 根据id标记单个已读
+ * @returns
+ */
+export function markReadById(id) {
+  return Promise.resolve({
+    result: {},
+    code: 200,
+    msg: '操作成功'
+  })
+}
+

src/views/dashboard/PieChart.vue

@@ -60,7 +60,7 @@ export default {
             type: 'pie',
             roseType: 'radius',
             radius: [15, 95],
-            center: ['50%', '38%'],
+            center: ['50%', '50%'],
             data: [
               { value: 320, name: 'Industries' },
               { value: 240, name: 'Technology' },

src/views/interchange/index.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-form label-width="80px">
+        <div class="grab"  id="add">
+          <div class="search">
+            <div class="sl">
+              <el-form-item label="工具编号" prop="toolCode">
+                <el-input
+                  v-model="queryParams.toolCode"
+                  placeholder="请输入工具编号"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="工具名称" prop="toolName">
+                <el-input
+                  v-model="queryParams.toolName"
+                  placeholder="请输入工具名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="状态" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="状态"
+                  clearable
+                  style="width: 240px"
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_normal_disable"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="dateRange"
+                  style="width: 240px"
+                  value-format="yyyy-MM-dd"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+            </div>
+            <div class="sr">
+              <el-button type="primary" icon="el-icon-search">搜索</el-button>
+              <el-button icon="el-icon-refresh-left">重置</el-button>
+            </div>
+          </div><!--search 默认查询-->
+        </div><!--grab-->
+      </el-form><!--el-form-->
+    </el-card><!--el-card-->
+
+    <el-card class="lrtt">
+      <div class="lt">
+        <el-input
+          v-model="deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          prefix-icon="el-icon-search"
+          style="margin-bottom: 20px"
+        />
+        <div class="divide"></div><!--divide 分隔-->
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
+      </div><!--lt 左-->
+      <div class="rt">
+        <el-table v-loading="loading" :data="toolList">
+          <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" v-if="columns[0].visible" />
+          <el-table-column label="工具名称" align="center" key="toolName" prop="toolName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="工具类别" align="center" key="toolType" prop="toolType" v-if="columns[2].visible" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+              <template v-for="dict in dict.type.tool_type">
+                <span v-if="scope.row.toolType == dict.value">{{ dict.label }}</span>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="负责人" align="center" key="toolPrincipalsName" prop="toolPrincipalsName" v-if="columns[4].visible" width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.status == '0'">正常</el-tag>
+              <el-tag type="info" v-if="scope.row.status == '1'">禁用</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="250"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" icon="el-icon-info" @click="handleDetail(scope.row)">详情</el-button>
+             <!--  <el-button type="text" icon="el-icon-download">下载</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['tool:edit', 'tool:remove']">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleUpdate" icon="el-icon-edit"
+                                    v-hasPermi="['tool:edit']">编辑</el-dropdown-item>
+                  <el-dropdown-item command="handleDelete" icon="el-icon-delete"
+                                    v-hasPermi="['tool:remove']">删除</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown> -->
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div><!--rt 右-->
+    </el-card><!--el-card-->
+
+    <!-- 工具详情对话框 -->
+    <el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" size="85%" class="no-padding">
+      <template #title>
+        <span>工具名称</span>
+      </template>
+      <tool-detail ref="toolDetailRef" :toolDetail="toolDetail"/>
+    </el-drawer><!--el-drawer 详情-抽屉-->
+
+    <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
+  </div><!--app-container-->
+</template>
+
+<script>
+  import { listDocument } from "@/api/document/document";
+  import { listTool, getTool, delTool, addTool, updateTool } from "@/api/tool/tool";
+  import { deptTreeSelect } from "@/api/system/user";
+import { getToken } from "@/utils/auth";
+import { Base64 } from 'js-base64'
+import Treeselect from "@riophae/vue-treeselect";
+import blUserSelector from "@/components/user-selector/src/user-selector";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import toolDetail from "./toolDetail";
+
+export default {
+  name: "User",
+  dicts: ['sys_normal_disable', 'tool_type'],
+  components: { Treeselect, blUserSelector, toolDetail },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      toolPrincipalsChoose: false,
+      // 总条数
+      total: 0,
+      // 工具表格数据
+      toolList: null,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      toolPrincipalsData: [],
+      toolDetail: {},
+      detailDrawerOpen: false,
+      // 部门名称
+      deptName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        toolCode: undefined,
+        toolName: undefined,
+        status: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `工具编号`, visible: true },
+        { key: 1, label: `工具名称`, visible: true },
+        { key: 2, label: `工具类别`, visible: true },
+        { key: 3, label: `部门`, visible: true },
+        { key: 4, label: `负责人`, visible: true },
+        { key: 5, label: `状态`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
+      ],
+      // 表单校验
+      rules: {
+        toolCode: [
+          { required: true, message: "工具编号不能为空", trigger: "blur" },
+          { min: 2, max: 30, message: '工具编号长度必须介于 2 和 30 之间', trigger: 'blur' }
+        ],
+        toolName: [
+          { required: true, message: "工具名称不能为空", trigger: "blur" },
+          { max: 50, message: '工具名称不能超过50个字', trigger: 'blur' }
+        ],
+        toolPrincipals: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+        toolSource: [
+          { max: 50, message: '工具来源不能超过50个字', trigger: 'blur' }
+        ],
+        toolUse: [
+          { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
+        ]
+      },
+      // 新增时的关联附件
+      docList: [],
+      docQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        toolId: ''
+      },
+      addDocShow: false,
+      viewDialogOpen: false,
+      viewDialogTitle: '',
+      previewUrl: ''
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getDeptTree();
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+  },
+  methods: {
+    handlePriew(row){
+      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
+      this.viewDialogTitle = '文档在线预览'
+      this.viewDialogOpen = true;
+    },
+    /**
+     * 新增上传附件
+     */
+    handleDocAdd() {
+      this.addDocShow = true
+    },
+    handleClick(){
+
+    },
+    submitPeople(peopleList){
+      console.log(peopleList);
+      this.form.toolPrincipals = peopleList[0]['userId']
+      this.form.toolPrincipalsName = peopleList[0]['nickName']
+      this.toolPrincipalsChoose = false;
+    },
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listTool(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.toolList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    getDeptName(items, id) {
+      let label = ''
+      items.forEach(item => {
+        if(item['id'] == id){
+          label = item['label']
+          return
+        }
+      })
+      if(label == ''){
+        items.forEach(item => {
+          if (item.children) {
+            label = this.getDeptName(item.children, id)
+          }
+        })
+      }
+      return label
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.toolRespDept = data.id;
+      this.handleQuery();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        return changeUserStatus(row.userId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.addDrawerOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: undefined,
+        deptId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: []
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.queryParams.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
+      this.handleQuery();
+    },
+    handleDetail(row){
+      this.detailDrawerOpen = true
+      this.toolDetail = row
+    },
+  }
+};
+</script>
+<style scoped>
+</style>

src/views/interchange/toolDetail.vue

@@ -0,0 +1,173 @@
+<template>
+  <div class="card-box pt5">
+    <div>
+      <div class="box-title">
+        基本信息
+      </div>
+      <div class="el-form-border">
+        <el-form ref="form" label-width="150px">
+          <el-row>
+            <el-col :span="12"> <el-form-item label="工具名称">工具名称2</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="工具类别">网络工具</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="工具来源">单位自建</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="负责人">赵宁宇</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="归属单位">人力资源部/员工关系组</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="状态"><span class="green">启用中</span></el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="工具用途">主要用于单位网络使用</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="测评情况">运行良好，可正常使用</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="功能描述">单位网络使用</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="适用条件">网络正常</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="操作说明">正常开启即可用</el-form-item> </el-col>
+            <el-col :span="12"> <el-form-item label="备注">工具使用完成后，请做好保养工作。</el-form-item> </el-col>
+          </el-row>
+        </el-form><!--el-form-->
+      </div><!--el-form-border 表单-->
+    </div><!--fl 左侧页签-->
+    <div>
+      <div class="tboper">
+        <div class="tit">评论</div>
+      </div><!--tboper 标题与操作按钮-->
+      <div class="pltextarea">
+        <el-input type="textarea" placeholder="请输入您的意见" :rows="4" maxlength="1000" show-word-limit></el-input>
+        <div class="plbtn"><el-button>发布</el-button></div>
+      </div><!--pltextarea-->
+      <div class="pllist">
+        <div class="list">
+          <div class="luser"><span class="xuser">张</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">张鑫辉</span><span class="time">05/01 12:00</span></div>
+            <div class="te">这个工具可以！</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+            <div class="pltextarea">
+              <el-input type="textarea" placeholder="请输入您的意见" :rows="2" maxlength="1000" show-word-limit></el-input>
+              <div class="plbtn"><el-button>取消</el-button><el-divider direction="vertical"></el-divider><el-button>发布</el-button></div>
+            </div><!--pltextarea-->
+          </div>
+        </div><!--list-->
+        <div class="list">
+          <div class="luser"><span class="xuser">钱</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">钱多多</span><span class="time">05/01 12:00</span></div>
+            <div class="te">好用！</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+            <div class="list">
+              <div class="luser"><span class="xuser">赵</span></div>
+              <div class="ltext">
+                <div class="nt"><span class="name">赵宇</span><span class="time">05/01 12:00</span></div>
+                <div class="te">希望再选代一下，还有待完善的地方。</div>
+                <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+              </div>
+            </div><!--list-->
+            <div class="list">
+              <div class="luser"><span class="xuser">李</span></div>
+              <div class="ltext">
+                <div class="nt"><span class="name">李志</span><span class="time">05/01 12:00</span></div>
+                <div class="te">很好的解决了我的问题，感谢！</div>
+                <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+              </div>
+            </div><!--list-->
+          </div>
+        </div><!--list-->
+        <div class="list">
+          <div class="luser"><span class="xuser">赵</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">赵宇</span><span class="time">05/01 12:00</span></div>
+            <div class="te">希望再选代一下，还有待完善的地方。</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+          </div>
+        </div><!--list-->
+        <div class="list">
+          <div class="luser"><span class="xuser">李</span></div>
+          <div class="ltext">
+            <div class="nt"><span class="name">李志</span><span class="time">05/01 12:00</span></div>
+            <div class="te">很好的解决了我的问题，感谢！</div>
+            <div class="hb"><a class="btn"><i class="el-icon-chat-line-round"></i>回复</a></div>
+          </div>
+        </div><!--list-->
+      </div><!--pllist-->
+    </div><!--fl 右侧评论-->
+  </div><!--fbox1 左右分栏-->
+</template>
+
+<script>
+  import { listDocument, getDocument, delDocument, addDocument, updateDocument } from "@/api/document/document";
+  import editDocument from "../document/editDocument";
+  import { Base64 } from 'js-base64';
+  export default {
+    name: 'toolDetail',
+    components: { editDocument },
+    props: {
+      toolDetail: {
+        type: Object,
+        default: {},
+      }
+    },
+    data(){
+      return{
+        detailActiveName: 'first',
+        docList: [],
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          toolId: ''
+        },
+        previewUrl: '',
+        viewDialogTitle: "",
+        viewDialogOpen: false,
+        title: '新增文档',
+        open: false,
+      }
+    },
+    created(){
+      this.getDocList()
+    },
+    methods:{
+      getDocList() {
+        this.loading = true;
+        this.queryParams.toolId = this.toolDetail.toolId
+        listDocument(this.queryParams).then(response => {
+            this.docList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }
+        );
+      },
+      handleAdd(){
+        this.open = true
+      },
+      editDocumentSubmit(){
+        this.open = false
+        this.getDocList()
+      },
+      handlePriew(row){
+        this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
+        this.viewDialogTitle = '文档在线预览'
+        this.viewDialogOpen = true;
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const docIds = row.docId || this.ids;
+        this.$modal.confirm('是否确认删除？').then(function() {
+          return delDocument(docIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.box-title {
+  margin-bottom: 3px;
+}
+.box-title:before {
+    display: inline-block;
+    content: "";
+    height: 14px;
+    width: 3px;
+    background-color: #034aac;
+    margin-right: 5px;
+}
+</style>

src/views/message/index.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+        <div class="search">
+          <div class="sl">
+            <el-form-item label="消息内容" prop="mesContent">
+              <el-input
+                v-model="queryParams.mesContent"
+                placeholder="请输入消息内容"
+                clearable
+                style="width: 240px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </div>
+          <div class="sr">
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </div>
+        </div>
+      </el-form>
+    </el-card>
+    <el-card class="lrtt">
+      <div class="lt">
+        <el-input
+          v-model="deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          prefix-icon="el-icon-search"
+          style="margin-bottom: 20px"
+        />
+        <div class="divide"></div><!--divide 分隔-->
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
+      </div><!--lt 左-->
+      <div class="rt">
+        <div class="operate">
+          <el-button type="primary" @click="markRead(null)">全部标记已读</el-button>
+        </div><!--operate 操作按钮-->
+        <el-table v-loading="loading" :data="tableList">
+          <el-table-column label="消息内容" prop="msgContent" min-width="120" />
+          <el-table-column label="接收时间" prop="msgRecTime" :show-overflow-tooltip="true" min-width="120"/>
+          <el-table-column label="消息状态" prop="msgStatus" :show-overflow-tooltip="true" min-width="80" >
+            <template  v-slot="{ row }">
+              <template v-for="dict in dict.type.msg_status">
+                <!-- {{ dict }} -->
+                <el-tag :type="dict.raw.listClass" v-if="row.msgStatus == dict.value" :key="dict.value">{{ dict.label }}</el-tag>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" min-width="100">
+            <template v-slot="{ row }">
+              <el-button
+                size="mini"
+                type="text"
+                v-if="row.msgStatus === 'unread'"
+                @click="markRead(row.id)"
+              >标记已读</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { markAllRead, markReadById, getMessageList } from "@/api/message/message"
+import { deptTreeSelect } from "@/api/system/user";
+
+export default {
+  name: "Document",
+  dicts: ['msg_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 部门名称
+      deptName: undefined,
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 总条数
+      total: 0,
+      // 表格数据
+      tableList: [],
+      // 弹出层标题
+      title: "",
+      viewDialogTitle: "",
+      viewDialogOpen: false,
+      open: false,
+      // 日期范围
+      dateRange: [],
+      previewUrl: '',
+      progress: 0,
+      fileList: [],
+      websocket: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mesContent: ''
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getDeptTree();
+  },
+  methods: {
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data
+      })
+    },
+    getList() {
+      this.loading = true
+      getMessageList(this.queryParams).then(response => {
+        this.total = response?.total
+        this.tableList = response?.rows || []
+        this.loading = false
+      }).catch(() => { this.loading = false });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+     /** 重置按钮操作 */
+     resetQuery() {
+      this.tableList = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.toolRespDept = data.id;
+      this.handleQuery();
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    /**
+     * 标记已读：id为null时表示标记全部已读
+     * @param id
+     */
+    markRead(id) {
+      this.$confirm('确认标记已读吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if(id) {
+          markReadById(id).then(response => {
+            this.$modal.msgSuccess(response?.msg || '操作成功')
+            this.getList();
+          })
+        } else {
+          markAllRead().then(response => {
+            this.$modal.msgSuccess(response?.msg || '操作成功')
+            this.getList();
+          })
+        }
+      }).catch(() => {});
+    },
+  }
+};
+</script>
+

src/views/statistic/PieChart.vue

@@ -0,0 +1,102 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from '@/views/dashboard/mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    },
+    /**
+     * 饼图数据
+     */
+    data: {
+      type: Array,
+      default: () => []
+    },
+    /**
+     * 底部提示数据
+     */
+    legendData: {
+      type: Array,
+      default: () => []
+    },
+    /**
+     * 底部提示距底部距离
+     */
+    legendBottom: {
+      type: String,
+      default: '5'
+    },
+    roseType: {
+      type: String,
+      default: 'radius'
+    },
+    radius: {
+      type: Array | String | Number,
+      default: 50
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: this.legendBottom,
+          data: this.legendData
+        },
+        series: [
+          {
+            name: 'WEEKLY WRITE ARTICLES',
+            type: 'pie',
+            roseType: this.roseType,
+            radius: this.radius,
+            center: ['50%', '50%'],
+            data: this.data,
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  }
+}
+</script>

src/views/statistic/index.vue

@@ -8,13 +8,33 @@
             <el-col :span="12">
               <el-card>
                 <div slot="header" class="clearfix"><span class="tline">工具类别统计</span></div>
-                <div class="tjbox2"><img src="images/tjt1.jpg" /></div>
+                <!--  -->
+                <div class="tjbox2">
+                  <PieChart
+                    height="207px"
+                    :data="toolTypeData"
+                    :legendData="toolTypeLegendData"
+                    legendBottom="5"
+                    chartRef="toolType"
+                    :radius="50"
+                  />
+                </div>
               </el-card><!--el-card-->
             </el-col><!--el-col-->
             <el-col :span="12">
               <el-card>
-                <div slot="header" class="clearfix"><span class="tline">工具使用情况</span></div>
-                <div class="tjbox2"><img src="images/tjt2.jpg" /></div>
+                <div slot="header" class="clearfix"><span class="tline">工具状态统计</span></div>
+                <div class="tjbox2">
+                  <PieChart
+                    height="207px"
+                    :data="toolStatusData"
+                    :legendData="toolStatusLegendData"
+                    legendBottom="5"
+                    :radius="['40%', '70%']"
+                    chartRef="toolStatus"
+                  />
+                  <!-- <img src="images/tjt2.jpg" /> -->
+                </div>
               </el-card><!--el-card-->
             </el-col><!--el-col-->
           </el-row><!--el-row-->
@@ -22,13 +42,24 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-card>
-                <div slot="header" class="clearfix"><span class="tline">工具归属单位分布情况</span></div>
-                <div class="tjbox2"><img src="images/tjt5.jpg" /></div>
+                <div slot="header" class="clearfix"><span class="tline">工具来源统计</span></div>
+                <div class="tjbox2">
+                  <PieChart
+                    height="207px"
+                    :data="toolSourceData"
+                    :legendData="toolSourceLegendData"
+                    legendBottom="5"
+                    :radius="['40%', '70%']"
+                    chartRef="toolStatus"
+                  />
+                </div>
               </el-card><!--el-card-->
             </el-col><!--el-col-->
-            <el-col :span="12">
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
               <el-card>
-                <div slot="header" class="clearfix"><span class="tline">近一年工具使用数量统计</span></div>
+                <div slot="header" class="clearfix"><span class="tline">工具下载</span></div>
                 <div class="tjbox2"><img src="images/tjt6.jpg" /></div>
               </el-card><!--el-card-->
             </el-col><!--el-col-->
@@ -77,11 +108,34 @@
 </template>
 
 <script>
-  export default {
+import PieChart from './PieChart'
+export default {
   name: 'statistic',
+  components: {
+    PieChart,
+  },
   data() {
     return {
-        activeName: 'first'
+      activeName: 'first',
+      toolTypeData: [
+        { value: 320, name: '检测型' },
+        { value: 240, name: '服务型' }
+      ],
+      toolTypeLegendData:['检测型', '服务型'],
+      toolStatusData: [
+        { value: 212, name: '已保存' },
+        { value: 76, name: '审批中' },
+        { value: 32, name: '审批不通过' },
+        { value: 971, name: '已发布' }
+      ],
+      toolStatusLegendData: ['已保存','审批中','审批不通过','已发布'],
+      toolSourceData: [
+        { value: 20, name: 'QQ' },
+        { value: 60, name: '微信' },
+        { value: 18, name: '官网' },
+        { value: 47, name: '熟人介绍' }
+      ],
+      toolSourceLegendData: ['QQ', '微信', '官网', '熟人介绍']
     };
   },
   methods: {
@@ -89,7 +143,7 @@
       console.log(tab, event);
     }
   }
-  }
+}
 </script>
 
 <style scoped>

src/views/tool/AddDoc.vue

@@ -0,0 +1,58 @@
+<template>
+  <el-dialog title="新增文档" :visible.sync="visible" width="85%" append-to-body>
+    <edit-document ref="editDocumentRef" :toolId="toolId" @submit="editDocumentSubmit"/>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="$refs.editDocumentRef.submitForm()">确 定</el-button>
+      <el-button @click="cancel()">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import editDocument from "../document/editDocument";
+export default {
+  components: {
+    editDocument
+  },
+  props: {
+    /**
+     * 控制显示/隐藏
+     */
+    show: {
+      type: Boolean,
+      default: false
+    },
+    /**
+     * 工具id
+     */
+    toolId: {
+      type: String,
+      default: true
+    }
+  },
+  computed: {
+    visible: {
+      get() {
+        return this.show
+      },
+      set(val) {
+        this.$emit('update:show', false)
+      }
+    }
+  },
+  data () {
+    return {
+
+    }
+  },
+  methods: {
+    editDocumentSubmit(){
+      this.$emit('callback')
+      this.visible = false
+    },
+    cancel() {
+      this.$refs.editDocumentRef.cancel()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/tool/index.vue

@@ -88,7 +88,7 @@
             icon="el-icon-plus"
             @click="handleAdd"
             v-hasPermi="['system:user:add']"
-          >新增</el-button>
+          >工具发布</el-button>
           <el-button type="primary" icon="el-icon-position">发布</el-button>
           <el-button icon="el-icon-thumb" @click="applyUse()">申请使用</el-button>
           <el-button icon="el-icon-delete">批量删除</el-button>
@@ -150,7 +150,7 @@
     </el-card><!--el-card-->
 
     <!-- 添加或修改工具信息对话框 -->
-    <el-drawer :visible.sync="addDrawerOpen" size="75%">
+    <el-drawer :visible.sync="addDrawerOpen" size="75%" @open="openEvent">
       <template #title>
         <span>新增工具</span>
         <div class="drawer-head-btn">
@@ -160,6 +160,10 @@
       </template>
       <div class="el-form-border">
         <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+          <div>
+            <div class="box-title">
+              基本信息
+            </div>
             <el-row>
               <el-col :span="12">
                 <el-form-item label="工具编号" prop="toolCode">
@@ -257,7 +261,49 @@
                 </el-form-item>
               </el-col>
             </el-row>
+          </div>
+          <div>
+            <div class="box-title">
+              关联附件
+            </div>
+            <div class="operate">
+              <el-button type="primary" icon="el-icon-upload2" @click="handleDocAdd">上传</el-button>
+              <el-button icon="el-icon-delete">删除</el-button>
+            </div><!--operate 操作按钮-->
+            <el-table :data="docList" style="width: 100%">
+              <el-table-column type="selection" width="50" align="center"> </el-table-column>
+              <el-table-column label="文档名称" prop="docName" :show-overflow-tooltip="true" />
+              <el-table-column label="类别" prop="docType" :show-overflow-tooltip="true" width="80" />
+              <el-table-column label="负责人" prop="docPrincipals" :show-overflow-tooltip="true" width="80" />
+              <el-table-column label="归属部门" prop="docRespDept" :show-overflow-tooltip="true" width="150" />
+              <el-table-column label="来源" prop="docSource" width="100" />
+              <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="180">
+                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-view"
+                    @click="handlePriew(scope.row)"
+                  >预览</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.row)"
+                  >删除</el-button>
+                  <el-button type="text" icon="el-icon-download">下载</el-button>
+                </template>
+              </el-table-column>
+            </el-table><!--el-table-->
+          </div>
         </el-form>
+        <!-- 上传 -->
+        <AddDoc :show.sync="addDocShow" toolId="1111" @callback="openEvent"/>
       </div><!--el-form-border 表单-->
     </el-drawer><!--el-drawer 新增抽屉-->
 
@@ -353,6 +399,7 @@
 </template>
 
 <script>
+  import { listDocument } from "@/api/document/document";
   import { listTool, getTool, delTool, addTool, updateTool } from "@/api/tool/tool";
   import { deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
@@ -361,11 +408,12 @@ import Treeselect from "@riophae/vue-treeselect";
 import blUserSelector from "@/components/user-selector/src/user-selector";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import toolDetail from "./toolDetail";
+import AddDoc from './AddDoc'
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'tool_type'],
-  components: { Treeselect, blUserSelector, toolDetail },
+  components: { Treeselect, blUserSelector, toolDetail, AddDoc },
   data() {
     return {
       // 遮罩层
@@ -465,7 +513,18 @@ export default {
         toolUse: [
           { max: 50, message: '工具用途不能超过50个字', trigger: 'blur' }
         ]
-      }
+      },
+      // 新增时的关联附件
+      docList: [],
+      docQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        toolId: ''
+      },
+      addDocShow: false,
+      viewDialogOpen: false,
+      viewDialogTitle: '',
+      previewUrl: ''
     };
   },
   watch: {
@@ -482,6 +541,17 @@ export default {
     });
   },
   methods: {
+    handlePriew(row){
+      this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
+      this.viewDialogTitle = '文档在线预览'
+      this.viewDialogOpen = true;
+    },
+    /**
+     * 新增上传附件
+     */
+    handleDocAdd() {
+      this.addDocShow = true
+    },
     handleClick(){
 
     },
@@ -712,7 +782,33 @@ export default {
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
+    },
+    /**
+     * 打开新增页面的回调事件
+     */
+    openEvent() {
+      this.loading = true
+      this.docQueryParams.toolId = '1111'
+      listDocument(this.queryParams).then(response => {
+          this.docList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
     }
   }
 };
 </script>
+<style scoped>
+.box-title{
+  margin-bottom: 3px;
+}
+.box-title:before {
+    display: inline-block;
+    content: "";
+    height: 14px;
+    width: 3px;
+    background-color: #034aac;
+    margin-right: 5px;
+}
+</style>

src/views/tool/toolDetail.vue

@@ -123,25 +123,19 @@
         </div><!--list-->
       </div><!--pllist-->
     </div><!--fl 右侧评论-->
-
-    <el-dialog :title="title" :visible.sync="open" width="85%" append-to-body>
-      <edit-document ref="editDocumentRef" :toolId="toolDetail.toolId" @submit="editDocumentSubmit"/>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="$refs.editDocumentRef.submitForm()">确 定</el-button>
-        <el-button @click="$refs.editDocumentRef.cancel()">取 消</el-button>
-      </div>
-    </el-dialog>
-
+    <!-- 上传 -->
+    <AddDoc :show.sync="open" :toolId="toolDetail.toolId" @callback="getDocList"/>
   </div><!--fbox1 左右分栏-->
 </template>
 
 <script>
   import { listDocument, getDocument, delDocument, addDocument, updateDocument } from "@/api/document/document";
+  import AddDoc from './AddDoc'
   import editDocument from "../document/editDocument";
   import { Base64 } from 'js-base64';
   export default {
     name: 'toolDetail',
-    components: { editDocument },
+    components: { editDocument, AddDoc },
     props: {
       toolDetail: {
         type: Object,
@@ -186,7 +180,6 @@
         this.getDocList()
       },
       handlePriew(row){
-        console.log('mmmmmmmmmmm',process.env.VUE_APP_BASE_API + row.docUrl)
         this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
         this.viewDialogTitle = '文档在线预览'
         this.viewDialogOpen = true;