From 758ec43352e6327aa32182a19af3621404154bd6 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 4 May 2023 09:03:31 +0800
Subject: [PATCH] 111111111

---
 demo-web-ui/.env.development                  |   2 +-
 .../copyofprocess/liuchengchasongguanli.js    |  82 ++
 .../system/personalization/personalization.js |  52 +-
 demo-web-ui/src/api/system/region/region.js   |  65 +-
 demo-web-ui/src/router/index.js               |  18 +-
 demo-web-ui/src/utils/request.js              |   2 +-
 .../copyofprocess/liuchengchasongguanli.vue   | 492 ++++-------
 .../organizationManage/organizationManage.vue | 834 ++++--------------
 .../organizationManageInfo.vue                | 157 ++++
 .../views/personalization/personalization.vue | 247 ++++--
 demo-web-ui/src/views/region/region.vue       | 695 ++++-----------
 .../views/workflow/definition/definition.vue  | 380 ++++----
 12 files changed, 1220 insertions(+), 1806 deletions(-)
 create mode 100644 demo-web-ui/src/api/system/copyofprocess/liuchengchasongguanli.js
 create mode 100644 demo-web-ui/src/views/organizationManage/organizationManageInfo.vue

diff --git a/demo-web-ui/.env.development b/demo-web-ui/.env.development
index 9b523de..71fa840 100644
--- a/demo-web-ui/.env.development
+++ b/demo-web-ui/.env.development
@@ -6,6 +6,6 @@ VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
 ##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-# VUE_APP_URL = "http://anrui.yyundong.com"
+## VUE_APP_URL = "http://anrui.yyundong.com"
 ##VUE_APP_URL = "http://1mn7264414.qicp.vip"
 VUE_APP_URL = "http://39.104.100.138:9112"
diff --git a/demo-web-ui/src/api/system/copyofprocess/liuchengchasongguanli.js b/demo-web-ui/src/api/system/copyofprocess/liuchengchasongguanli.js
new file mode 100644
index 0000000..b3f4418
--- /dev/null
+++ b/demo-web-ui/src/api/system/copyofprocess/liuchengchasongguanli.js
@@ -0,0 +1,82 @@
+import request from '@/utils/request'
+
+let tokens = window.sessionStorage.getItem('token');
+
+//  论坛管理
+// 获取论坛管理
+export function selectSysForum(data) {
+  return request({
+    url: '/v1/sysforum/selectSysForum',
+    method: 'post',
+    params: data
+  })
+}
+
+// 新增论坛管理
+export function saveSysForum(data) {
+  return request({
+    url: '/v1/sysforum/saveSysForum',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+
+  })
+}
+
+// 删除论坛管理
+export function deleteSysForum(sid) {
+  return request({
+    url: '/v1/sysforum/deleteSysForum/' + sid,
+    method: 'delete',
+  })
+}
+
+// 修改论坛管理
+export function alterSysForum(data) {
+  return request({
+    url: '/v1/sysforum/alterSysForum',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+
+}
+
+// 新增论坛评论
+export function saveSysForumComment(data) {
+  return request({
+    url: '/v1/sysforumcommen/saveSysForumComment',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+  })
+  }
+
+  // 删除论坛评论
+  export function deleteSysForumComment(sid) {
+    return request({
+      url: '/v1/sysforumcommen/deleteSysForumComment/' + sid,
+      method: 'delete',
+    })
+  }
+
+  // 查询论坛评论
+  export function selectSysForumCommentOne(sid) {
+    return request({
+      url: '/v1/sysforumcommen/selectSysForumCommentOne/' + sid,
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'token': tokens
+      }
+    })
+  }
diff --git a/demo-web-ui/src/api/system/personalization/personalization.js b/demo-web-ui/src/api/system/personalization/personalization.js
index e22fc15..049be97 100644
--- a/demo-web-ui/src/api/system/personalization/personalization.js
+++ b/demo-web-ui/src/api/system/personalization/personalization.js
@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+let tokens = window.sessionStorage.getItem('token');
 // 获取菜单 分页列表
 export function getList(data) {
   return request({
@@ -15,6 +16,55 @@ export function saveOrUpdate(data) {
     url: '/portal/v1/sysuserdefaultorg/saveOrUpdate',
     method: 'post',
     data: data,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+
+}
+
+//  公告管理
+// 获取公告管理
+export function selectSysNotice(data) {
+  return request({
+    url: '/v1/sysnatic/selectSysNotice',
+    method: 'post',
+    params: data
+  })
+}
+
+// 新增公告管理
+export function saveSusNotice(data) {
+  return request({
+    url: '/v1/sysnatic/saveSysNotice',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+
+  })
+}
+
+// 删除公告管理
+export function deleteSysNotice(sid) {
+  return request({
+    url: '/v1/sysnatic/deleteSysNotice/' + sid,
+    method: 'delete',
   })
 }
+
+// 修改公告管理
+export function alterSusNotice(data) {
+  return request({
+    url: '/v1/sysnatic/alterSysNotice',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json',
+      'token': tokens
+    }
+
+  })
+}
\ No newline at end of file
diff --git a/demo-web-ui/src/api/system/region/region.js b/demo-web-ui/src/api/system/region/region.js
index edaf66a..4bf541e 100644
--- a/demo-web-ui/src/api/system/region/region.js
+++ b/demo-web-ui/src/api/system/region/region.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 export default {
 
   // 分页列表
-  pagerList: function (params) {
+  pagerList: function(params) {
     return request({
       url: '/portal/v1/regions/pagerList',
       method: 'post',
@@ -15,7 +15,7 @@ export default {
   },
 
   // 新增保存
-  save: function (regionDto) {
+  save: function(regionDto) {
     return request({
       url: '/portal/v1/regions/save',
       method: 'post',
@@ -49,7 +49,7 @@ export default {
   // },
 
   // 删除
-  delete: function (sid) {
+  delete: function(sid) {
     return request({
       url: '/portal/v1/regions/delete/' + sid,
       method: 'delete',
@@ -58,7 +58,7 @@ export default {
   },
 
   //点击修改回显数据
-  updateEcho: function (sid) {
+  updateEcho: function(sid) {
     return request({
       url: '/portal/v1/regions/getOne/' + sid,
       method: 'post',
@@ -70,7 +70,7 @@ export default {
 
   // 区域修改保存
   // system/region/update/{sid}
-  update: function (params,sid) {
+  update: function(params, sid) {
     return request({
       url: '/portal/v1/regions/update/' + sid,
       method: 'post',
@@ -79,5 +79,56 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-  }
-}
+  },
+
+
+  //  自主学姐计划
+
+  // 分页列表
+  selectSysPlan: function(params) {
+    return request({
+      url: '/v1/sysPlan/selectSysPlan',
+      method: 'post',
+      params: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 新增保存
+  saveSysPlan: function(data) {
+    return request({
+      url: '/v1/sysPlan/saveSysPlan',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 删除
+  deleteSysPlan: function(sid) {
+    return request({
+      url: '/v1/sysPlan/deleteSysPlan/' + sid,
+      method: 'delete'
+    })
+  },
+
+  //点击修改回显数据
+  alterSysPlant: function(data) {
+    return request({
+      url: '/v1/sysPlan/alterSysPlan',
+      method: 'POST',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+
+
+}
diff --git a/demo-web-ui/src/router/index.js b/demo-web-ui/src/router/index.js
index f0aea97..607ab79 100644
--- a/demo-web-ui/src/router/index.js
+++ b/demo-web-ui/src/router/index.js
@@ -22,8 +22,8 @@ export const constantRoutes = [
     redirect: 'login'
   },
   {
-    path: '/reg',
-    component: () => import("@/views/regist/User.vue")
+    path: '/Regist',
+    component: () => import("@/views/Regist/User.vue")
   },
   {
     path: '/login',
@@ -55,7 +55,8 @@ export const constantRoutes = [
       {
         path: '/region',
         component: () =>
-          import('@/views/region/region.vue'),
+          import('@/views/region/region.vue'),
+            name: 'region',
         meta: {
           title: '自主学习计划管理'
         }
@@ -115,14 +116,16 @@ export const constantRoutes = [
       },
       {
         path: '/personalization',
-        component: () => import('@/views/personalization/personalization.vue'),
+        component: () => import('@/views/personalization/personalization.vue'),
+          name: 'personalization',
         meta: {
           title: '公告管理'
         }
       },
       {
         path: '/copyofprocess',
-        component: () => import('@/views/copyofprocess/liuchengchasongguanli'),
+        component: () => import('@/views/copyofprocess/liuchengchasongguanli.vue'),
+           name: 'liuchengchasongguanli',
         meta: {
           title: '论坛管理'
         }
@@ -152,7 +155,8 @@ export const constantRoutes = [
       {
         path: '/organizationManage',
         component: () =>
-          import('@/views/organizationManage/organizationManage.vue'),
+          import('@/views/organizationManage/organizationManage.vue'),
+             name: 'organizationManage',
         meta: {
           title: '论坛交流'
         }
@@ -160,7 +164,7 @@ export const constantRoutes = [
       {
         path: '/datamapping',
         component: () => import('@/views/datamapping/shujuyingshe.vue'),
-        meta: { title: '自主学习计划制定指导', noCache: true }
+        meta: { title: '自主学习计划制定指导' }
       },
       {
         path: '/organizationManage',
diff --git a/demo-web-ui/src/utils/request.js b/demo-web-ui/src/utils/request.js
index 7420aec..f8cdd1c 100644
--- a/demo-web-ui/src/utils/request.js
+++ b/demo-web-ui/src/utils/request.js
@@ -7,7 +7,7 @@ import { getToken, getStorage } from '@/utils/auth'
 console.log('dadadadad', process.env.VUE_APP_URL)
 const service = axios.create({
   baseURL: process.env.VUE_APP_URL, // url = base url + request url
-  timeout: 5000, // request timeout
+  timeout: 50000, // request timeout
   // headers: { 'Content-Type': 'application/json' }
 })
 
diff --git a/demo-web-ui/src/views/copyofprocess/liuchengchasongguanli.vue b/demo-web-ui/src/views/copyofprocess/liuchengchasongguanli.vue
index c7bbae1..0aa7679 100644
--- a/demo-web-ui/src/views/copyofprocess/liuchengchasongguanli.vue
+++ b/demo-web-ui/src/views/copyofprocess/liuchengchasongguanli.vue
@@ -1,315 +1,211 @@
 <template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <button-bar
-        view-title="流程抄送设置"
-        ref="btnbar"
-        :btndisabled="btndisabled"
-        @btnhandle="btnHandle"
-      />
-      <div class="main-content">
-        <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{
-            searchxianshitit
-          }}</el-button>
-          <div v-show="isSearchShow" class="search">
-            <el-form
-              ref="listQueryform"
-              :inline="true"
-              :model="listQuery"
-              label-width="100px"
-              class="tab-header"
-            >
-              <el-form-item label="流程名称">
-                <el-select
-                  v-model="listQuery.params.flowName"
-                  placeholder="请选择"
-                  filterable
-                >
-                  <el-option
-                    v-for="item in flow_list"
-                    :key="item.key"
-                    :label="item.name"
-                    :value="item.name"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-form>
-            <div class="btn" style="text-align: center">
-              <el-button
-                type="primary"
-                size="small"
-                icon="el-icon-search"
-                @click="handleFilter"
-                >查询</el-button
-              >
-              <el-button
-                type="primary"
-                size="small"
-                icon="el-icon-refresh"
-                @click="handleReset"
-                >重置</el-button
-              >
-            </div>
-          </div>
-        </div>
-        <div class="listtop">
-          <div class="tit">业务流程列表</div>
-          <pageye
-            v-show="list.length > 0"
-            :total="listQuery.total"
-            :page.sync="listQuery.current"
-            :limit.sync="listQuery.size"
-            class="pagination"
-            @pagination="getList"
-          />
-        </div>
-        <div class="">
-          <el-table
-            :key="tableKey"
-            v-loading="listLoading"
-            :data="list"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              width="60"
-              label="序号"
-              type="index"
-              :index="indexMethod"
-              align="center"
-            />
-            <el-table-column width="180" label="操作" align="center">
-              <template slot-scope="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  @click="handleUpdate(scope.row)"
-                  >设置</el-button
-                >
-                <el-button
-                  size="small"
-                  type="danger"
-                  @click="handleDelete(scope.row)"
-                  >删除</el-button
-                >
-              </template>
-            </el-table-column>
-            <el-table-column label="流程名称" align="center" width="400">
-              <template slot-scope="scope">
-                <span>{{ scope.row.flowName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="抄送角色"
-              align="left"
-              header-align="center"
-            >
-              <template slot-scope="scope">
-                <span>{{ scope.row.roleName }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div class="pages">
-          <div class="tit" />
-          <!-- 翻页 -->
-          <pagination
-            v-show="list.length > 0"
-            :total="listQuery.total"
-            :page.sync="listQuery.current"
-            :limit.sync="listQuery.size"
-            class="pagination"
-            @pagination="getList"
-          />
-        </div>
+  <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+    <el-tab-pane label="论坛信息" name="roleList">
+      <div class="container">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column label="序号" width="70px" type="index" align="center">
+          </el-table-column>
+          <el-table-column label="操作" width="150px" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="editRow(scope.row)">
+                修改
+              </el-button>
+              <el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="type" label="论坛类别" align="center" />
+          <el-table-column prop="title" label="论坛标题" align="center" />
+          <el-table-column prop="content" label="论坛内容" align="center" />
+        </el-table>
       </div>
-    </div>
-    <liuchengchaosongAdd
-      v-show="viewState == 2 || viewState == 3"
-      ref="divadd"
-      @doback="resetState"
-      @reloadlist="getList"
-    />
-  </div>
+    </el-tab-pane>
+
+    <el-tab-pane label="论坛发布" name="addrole">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>论坛类别</td>
+          <td>
+           <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+             @change="getType">
+             <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+               :value="item.dictKey" />
+           </el-select>
+          </td>
+        </tr>
+        <tr>
+          <td>论坛标题</td>
+          <td>
+            <el-input v-model="form.title" style="width: 300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>论坛内容</td>
+          <td>
+            <el-input v-model="form.content" style="width: 300px"></el-input>
+          </td>
+        </tr>
+      </table>
+      <div style="margin-top: 20px; text-align: center">
+        <el-button type="primary" @click="save()">保存</el-button>
+      </div>
+    </el-tab-pane>
+    <el-dialog :title="dialogTitle + '论坛信息'" :visible.sync="editDialog" width="40%">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>论坛类别</td>
+          <td>
+           <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+             @change="getType">
+             <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+               :value="item.dictKey" />
+           </el-select>
+          </td>
+        </tr>
+        <tr>
+          <td>论坛标题</td>
+          <td>
+            <el-input v-model="form.title" style="width: 300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>论坛内容</td>
+          <td>
+            <el-input v-model="form.content" style="width: 300px"></el-input>
+          </td>
+        </tr>
+      </table>
+      <div style="margin-top: 20px; text-align: center">
+        <el-button type="primary" @click="save()">保存</el-button>
+      </div>
+    </el-dialog>
+  </el-tabs>
 </template>
 
 <script>
-import {
-  pageList,
-  delBySids,
-} from "@/api/system/liuchengchaosong/liuchengchaosong";
-import { selectFlowList } from "@/api/system/postManage/index";
-import Pagination from "@/components/pagination";
-import pageye from "@/components/pagination/pageye";
-import ButtonBar from "@/components/ButtonBar";
-import liuchengchaosongAdd from "./liuchengchaosongAdd";
+  import {
+    selectSysForum,
+    saveSysForum,
+    alterSysForum,
+    deleteSysForum,
+  } from "@/api/system/copyofprocess/liuchengchasongguanli.js";
 
-export default {
-  name: "liuchengchaosong",
-  components: {
-    Pagination,
-    pageye,
-    ButtonBar,
-    liuchengchaosongAdd,
-  },
-  data() {
-    return {
-      btndisabled: false,
-      btnList: [
-        {
-          type: "primary",
-          size: "small",
-          icon: "plus",
-          btnKey: "toAdd",
-          btnLabel: "新增",
-        },
-        {
-          type: "info",
-          size: "small",
-          icon: "cross",
-          btnKey: "doClose",
-          btnLabel: "关闭",
-        },
-      ],
-      isSearchShow: false,
-      searchxianshitit: "显示查询条件",
-      viewState: 1, // 1、列表 2、添加-车辆预订 3、编辑  4、查看 5、订金-订金收取
-      // 查询 -----------
-      flow_list: [], // 分公司
-      tableKey: 0,
-      list: [],
-      sids: [],
-      FormLoading: false,
-      listLoading: false,
-      listQuery: {
-        current: 1,
-        size: 5,
-        total: 0,
-        params: {
-          flowName: "",
-        },
-      },
-    };
-  },
-  mounted() {
-    this.$refs["btnbar"].setButtonList(this.btnList);
-  },
-  created() {
-    // 初始化变量
-    this.init();
-    // 加载列表
-    this.getList();
-  },
-  methods: {
-    init() {
-      selectFlowList().then((res) => {
-        if (res.success) {
-          this.flow_list = res.data;
-        }
-      });
-    },
-    btnHandle(btnKey) {
-      console.log("XXXXXXXXXXXXXXX    " + btnKey);
-      switch (btnKey) {
-        case "toAdd":
-          this.toAdd();
-          break;
-        case "doClose":
-          this.doClose();
-          break;
-        default:
-          break;
-      }
-    },
-    // 搜索条件效果
-    clicksearchShow() {
-      this.isSearchShow = !this.isSearchShow;
-      if (this.isSearchShow) {
-        this.searchxianshitit = "隐藏查询条件";
-      } else {
-        this.searchxianshitit = "显示查询条件";
-      }
+  export default {
+    data() {
+      return {
+        activeName: "roleList",
+        dialogTitle: "",
+        editDialog: false,
+        form: {},
+        formBackup: Object.assign({}, this.form),
+        tableData: [],
+        typeList:[
+          {
+            dictKey:"1",
+            dictValue:"JAVA",
+          }, {
+            dictKey:"2",
+            dictValue:"Python",
+          }, {
+            dictKey:"3",
+            dictValue:"C++",
+          }, {
+            dictKey:"4",
+            dictValue:"Excel",
+          }, {
+            dictKey:"5",
+            dictValue:"英语四六级考试",
+          }, {
+            dictKey:"6",
+            dictValue:"计算机等级考试",
+          }
+
+        ]
+      };
     },
-    // 序号
-    indexMethod(index) {
-      var pagestart = (this.listQuery.current - 1) * this.listQuery.size;
-      var pageindex = index + 1 + pagestart;
-      return pageindex;
+    mounted() {
+      this.getPageList();
     },
-    // 查询列表信息
-    getList() {
-      this.listLoading = true;
-      this.listQuery.params.orgSidPath =
-        window.sessionStorage.getItem("orgSidPath");
-      pageList(this.listQuery).then((response) => {
-        this.listLoading = false;
-        if (response.success) {
-          this.list = response.data.records;
-          this.listQuery.total = response.data.total;
+    methods: {
+      getType(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.typeList.filter((item) => item.dictKey === value)
+        this.form.type = choose[0].dictValue
+        // this.form.typeSid = choose[0].dictKey
+      },
+      getPageList() {
+        // 获取列表
+        selectSysForum().then((res) => {
+          this.tableData = res.data;
+        });
+      },
+      handleClick(tab, event) {
+        if (tab.name == "addrole") {
+          this.dialogTitle = "新增";
+          this.roleForm = Object.assign({}, this.formBackup);
         } else {
-          this.list = [];
-          this.listQuery.total = 0;
+          this.getPageList();
         }
-      });
-    },
-    // 查询按钮
-    handleFilter() {
-      this.listQuery.current = 1;
-      this.getList();
-    },
-    // 重置
-    handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 5,
-        total: 0,
-        params: {
-          flowName: "",
-        },
-      };
-      this.getList();
-    },
-    toAdd() {
-      this.viewState = 2;
-      this.$refs["divadd"].showAdd();
-    },
-    // 编辑
-    handleUpdate(row) {
-      this.viewState = 3;
-      this.$refs["divadd"].showEdit(row);
-    },
-    handleDelete(row) {
-      const tip = "请确认是否删除";
-      this.$confirm(tip, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        const aa = [];
-        aa.push(row.sid);
-        delBySids(aa).then((res) => {
-          if (res.success) {
+      },
+      save() {
+
+        console.log("form", this.form)
+
+        if (this.form.sid) {
+          alterSysForum(this.form).then((res) => {
+            this.editDialog = false;
+            this.getPageList();
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+          });
+        } else {
+          saveSysForum(this.form).then((res) => {
+            this.getPageList();
+            this.activeName = "roleList";
             this.$message({
-              showClose: true,
+              message: res.msg,
               type: "success",
-              message: "删除成功",
             });
-            this.getList();
-          }
+          });
+        }
+        this.reset();
+      },
+      reset() {
+        this.form = {};
+      },
+      editRow(row) {
+        this.dialogTitle = "编辑";
+        this.editDialog = true;
+        this.form = Object.assign({}, row);
+      },
+      deleteRow(row) {
+        this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          deleteSysForum(row.sid).then((res) => {
+            this.getPageList();
+
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+
+          });
+
         });
-      });
-    },
-    resetState() {
-      this.viewState = 1;
-    },
-    doClose() {
-      this.$store.dispatch("tagsView/delView", this.$route);
-      this.$router.go(-1);
+
+      },
     },
-  },
-};
+  };
 </script>
 
-<style scoped>
-</style>
+<style scoped="scoped" lang="scss">
+  .my-tabs {
+    margin-top: 10px;
+  }
+</style>
diff --git a/demo-web-ui/src/views/organizationManage/organizationManage.vue b/demo-web-ui/src/views/organizationManage/organizationManage.vue
index 3e27716..a19d896 100644
--- a/demo-web-ui/src/views/organizationManage/organizationManage.vue
+++ b/demo-web-ui/src/views/organizationManage/organizationManage.vue
@@ -1,660 +1,214 @@
 <template>
-  <div class="container" style="display: flex;">
-    <div class="org-tree">
-      <el-tree :data="treedata" node-key="sid" :props="props" :default-expanded-keys="['fd6435f2-0005-11ec-a033-48452053aa33']" @node-click="handleNodeClick">
-				<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)" @click.stop.native>
-					<span>{{ node.label || $store.getters.userInfo.Orgname }}</span>
-					<span v-show="data.del" class="handle">
-						<el-tooltip class="item" effect="dark" content="新增" placement="top-start">
-              <el-button type="text" size="mini" @click.stop="() => append(data)" icon="el-icon-circle-plus-outline">
-              </el-button>
-            </el-tooltip>
-            <!--            <el-tooltip v-show="data.sid" class="item" effect="dark" content="修改" placement="top-start">-->
-            <!--              <el-button type="text" size="mini" @click.stop="() => deit(data)" icon="el-icon-edit">-->
-            <!--              </el-button>-->
-            <!--            </el-tooltip>-->
-            <!--            <el-tooltip v-show="data.sid" class="item" effect="dark" content="删除" placement="top-start">-->
-            <!--              <el-button type="text" size="mini" @click.stop="() => remove(data)" icon="el-icon-delete">-->
-            <!--              </el-button>-->
-            <!--            </el-tooltip>-->
-					</span>
-				</span>
-      </el-tree>
+  <div class="app-container">
+    <div v-show="viewState ==1">
+      <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="论坛信息" name="roleList">
+          <div class="container">
+            <el-table :data="tableData" border style="width: 100%">
+              <el-table-column label="序号" width="70px" type="index" align="center">
+              </el-table-column>
+              <el-table-column label="操作" width="150px" align="center">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" @click="editRow(scope.row)">
+                    评论
+                  </el-button>
+                  <el-button type="danger" size="mini" @click.native.prevent="detail(scope.row)">
+                    查看
+                  </el-button>
+                </template>
+              </el-table-column>
+              <el-table-column prop="type" label="论坛类别" align="center" />
+              <el-table-column prop="title" label="论坛标题" align="center" />
+              <el-table-column prop="content" label="论坛内容" align="center" />
+            </el-table>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="论坛发布" name="addrole">
+          <table class="e-table" cellspacing="0">
+            <tr>
+              <td>论坛类别</td>
+              <td>
+                <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+                  @change="getType">
+                  <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select>
+              </td>
+            </tr>
+            <tr>
+              <td>论坛标题</td>
+              <td>
+                <el-input v-model="form.title" style="width: 300px"></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>论坛内容</td>
+              <td>
+                <el-input v-model="form.content" style="width: 300px"></el-input>
+              </td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px; text-align: center">
+            <el-button type="primary" @click="save()">保存</el-button>
+          </div>
+        </el-tab-pane>
+        <el-dialog :title="dialogTitle + '论坛信息'" :visible.sync="editDialog" width="40%">
+          <table class="e-table" cellspacing="0">
+            <tr>
+              <td>论坛类别</td>
+              <td>
+                <!-- <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+             @change="getType">
+             <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+               :value="item.dictKey" />
+           </el-select> -->
+                <span>{{form.type}}</span>
+              </td>
+            </tr>
+            <tr>
+              <td>论坛标题</td>
+              <td>
+                <span>{{form.title}}</span>
+                <!-- <el-input v-model="form.title" style="width: 300px"></el-input> -->
+              </td>
+            </tr>
+            <tr>
+              <td>论坛内容</td>
+              <td>
+                <span>{{form.content}}</span>
+                <!-- <el-input v-model="form.content" style="width: 300px"></el-input> -->
+              </td>
+            </tr>
+            <tr>
+              <td>评论内容</td>
+              <td>
+                <!-- <span>{{form.content}}</span> -->
+                <el-input v-model="commentContent"></el-input>
+              </td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px; text-align: center">
+            <el-button type="primary" @click="save()">保存</el-button>
+          </div>
+        </el-dialog>
+      </el-tabs>
     </div>
-    <el-dialog title="编辑节点" :visible.sync="dialogVisible" width="50%" class="edit">
-      <table class="e-table" cellspacing="0">
-        <tr>
-          <td>组织名称</td>
-          <td>
-            <el-input v-model="form.name" style="width:300px"></el-input>
-          </td>
-          <td>组织编码</td>
-          <td>
-            <el-input v-model="form.orgCode" style="width:300px"></el-input>
-          </td>
-        </tr>
-        <tr>
-          <td>主管人员</td>
-          <td>
-            <el-select v-model="form.zgStaffSid" style="width:300px" filterable>
-              <el-option v-for="item in staffdata" :key="item.sid" :label="item.name" :value="item.sid"/>
-            </el-select>
-          </td>
-          <td>分管人员</td>
-          <td>
-            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
-              <el-option v-for="item in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
-            </el-select>
-          </td>
-        </tr>
-        <tr>
-          <td>组织简称</td>
-          <td :colspan="3">
-            <el-input v-model="form.orgAbbre" style="width: 30%"></el-input>
-          </td>
-        </tr>
-        <tr>
-          <td>管理层级</td>
-          <td>
-            <el-select v-model="form.orgLevelValue" style="width:300px" placeholder="请选择" filterable @change="changeOrgLevel">
-              <el-option v-for="item in orgLevel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-            </el-select>
-          </td>
-          <td>其他编码</td>
-          <td>
-            <el-input v-model="form.otherCode" style="width:300px" placeholder="与财务中客户编码相同"></el-input>
-          </td>
-        </tr>
-        <tr>
-          <td>组织地址</td>
-          <td>
-            <el-input v-model="form.addrs" style="width:300px"></el-input>
-          </td>
-          <td>组织属性</td>
-          <td>
-            <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
-              <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-            </el-select>
-          </td>
-        </tr>
-        <tr>
-          <td>组织联系人</td>
-          <td>
-            <el-input v-model="form.linkPerson" style="width:300px"></el-input>
-          </td>
-
-          <td>联系电话</td>
-          <td>
-            <el-input v-model="form.linkPhone" style="width:300px"></el-input>
-          </td>
-        </tr>
-        <tr>
-          <td>是否独立法人</td>
-          <td>
-            <el-radio v-model="form.isDept" :label="0">是</el-radio>
-            <el-radio v-model="form.isDept" :label="1">否</el-radio>
-          </td>
-          <td>排序号</td>
-          <td>
-            <el-input v-model="form.sort" style="width:300px"></el-input>
-          </td>
-        </tr>
-      </table>
-      <div slot="footer" class="text-center">
-        <el-button type="primary" @click="nodeSave()">保 存</el-button>
-        <el-button @click="dialogVisible = false">返 回</el-button>
-      </div>
-    </el-dialog>
-    <div class="org-table" v-show="isshow == 'table'">
-      <div class="tab-header">
-        <el-form ref="form" :inline="true" :model="form" label-width="80px">
-          <el-row :gutter="20">
-            <el-col :span="24">
-              <el-form-item label="组织名称">
-                <el-input v-model="page.params.name" clearable></el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-button @click="onSearch()">查询</el-button>
-                <el-button @click="resetSearch()">重置</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- table -->
-      <el-table :data="tableData" default-expand-all border style="width: 100%;">
-        <el-table-column label="操作" align="center" width="160px">
-          <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="editRow(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="danger" size="mini" @click.native.prevent="remove(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="name" label="组织名称" align="center"></el-table-column>
-        <el-table-column prop="orgCode" label="组织编码" align="center"></el-table-column>
-<!--        <el-table-column prop="zgNames" label="主管" align="center"></el-table-column>-->
-        <el-table-column prop="fgNames" label="分管" align="center"></el-table-column>
-        <!--<el-table-column prop="contactMan" label="联系人" align="center" width="100px"></el-table-column>-->
-        <el-table-column prop="linkPhone" label="联系人手机号" width="110" align="center">
-        </el-table-column>
-        <el-table-column prop="addrs" label="地址" align="center">
-        </el-table-column>
-        <el-table-column prop="sort" label="排序" align="center" width="50px">
-        </el-table-column>
-        <el-table-column prop="qrText" label="二维码" align="center" width="80px">
-          <template slot-scope="scope">
-            <el-button @click.native.prevent="lookRow(scope.row)" type="text" size="small">查看</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/>
-    </div>
-
-    <div class="org-table" v-show="isshow == 'ewm'">
-      <div class="tab-header">
-        <el-form ref="form" :inline="true" :model="form" label-width="80px">
-          <el-row :gutter="20">
-            <el-col :span="16">
-              <h4 style="margin: 0;line-height: 32px;">组织二维码</h4>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item style="float: right;">
-                <el-button type="primary" @click="Printewm">打 印</el-button>
-                <el-button @click="isshow = 'table'">返 回</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- center -->
-      <div class="ewm" style="display: flex;justify-content: center; align-items: center;" ref="print">
-        <img style="width: 200px; height: 200px;" :src="ewmForm.qrFilePath" alt="">
-        <ul style="list-style:none; line-height: 32px; font-size: 16px;">
-          <li><label>组织名称: </label><span>{{ ewmForm.departmentName }}</span></li>
-        </ul>
-      </div>
-    </div>
-    <!-- 新增、编辑页面 -->
-    <div class="org-table" v-show="isshow == 'edit'">
-      <div class="tab-header">
-        <el-form ref="form" :inline="true" :model="form" label-width="80px">
-          <el-row :gutter="20">
-            <el-col :span="16">
-              <h4 style="margin: 0;line-height: 32px;"> {{ dialogTitle }}组织信息</h4>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item style="float: right;">
-                <el-button type="primary" @click="save()">保 存</el-button>
-                <el-button @click="isshow = 'table'">返 回</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <!-- center -->
-      <div class="ediut">
-        <table class="e-table" cellspacing="0">
-          <tr>
-            <td>组织名称</td>
-            <td>
-              <el-input v-model="form.name" style="width:300px"></el-input>
-            </td>
-            <td>组织编码</td>
-            <td>
-              <el-input v-model="form.orgCode" style="width:300px"></el-input>
-            </td>
-          </tr>
-          <tr>
-            <td>主管人员</td>
-            <td>
-              <el-select v-model="form.zgStaffSid" style="width:300px" filterable>
-                <el-option v-for="item in staffdata" :key="item.sid" :label="item.name" :value="item.sid"/>
-              </el-select>
-            </td>
-            <td>分管人员</td>
-            <td>
-              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
-                <el-option v-for="item in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
-              </el-select>
-            </td>
-          </tr>
-          <tr>
-            <td>组织简称</td>
-            <td :colspan="3">
-              <el-input v-model="form.orgAbbre" style="width: 300px"></el-input>
-            </td>
-          </tr>
-          <tr>
-            <td>管理层级</td>
-            <td>
-              <el-select v-model="form.orgLevelValue" style="width:300px" placeholder="请选择" filterable @change="changeOrgLevel">
-                <el-option v-for="item in orgLevel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-              </el-select>
-            </td>
-            <td>其他编码</td>
-            <td>
-              <el-input v-model="form.otherCode" style="width:300px" placeholder="与财务中客户编码相同"></el-input>
-            </td>
-          </tr>
-          <tr>
-            <td>组织地址</td>
-            <td>
-              <el-input v-model="form.addrs" style="width:300px"></el-input>
-            </td>
-            <td>组织属性</td>
-            <td>
-              <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
-                <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-              </el-select>
-            </td>
-          </tr>
-          <tr>
-            <td>组织联系人</td>
-            <td>
-              <el-input v-model="form.linkPerson" style="width:300px"></el-input>
-            </td>
-            <td>联系电话</td>
-            <td>
-              <el-input v-model="form.linkPhone" style="width:300px"></el-input>
-            </td>
-          </tr>
-          <tr>
-            <td>是否独立法人</td>
-            <td>
-              <el-radio v-model="form.isDept" :label="0">是</el-radio>
-              <el-radio v-model="form.isDept" :label="1">否</el-radio>
-            </td>
-            <td>排序号</td>
-            <td>
-              <el-input v-model="form.sort" style="width:300px"></el-input>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <!--  <Position v-if="mapDialog" :address.sync="form.addrs" :maker-position.sync="form.jwd"
-                :dialog-visible.sync="mapDialog"/>-->
+    <organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" />
   </div>
 </template>
 
 <script>
-import {
-  addOrgTree,
-  delOrgtree,
-  getQrCode, getStaff,
-  getStaffName,
-  orgList,
-  pageList,
-  postOrgtree,
-  putOrgtree,
-  selectBySid
-} from '@/api/system/departments/departments.js'
-import { typeValues } from '@/api/system/roleAdminister/index'
-import Position from '@/components/amap/amap.vue'
+  import {
+    selectSysForum,
+    saveSysForum,
+    alterSysForum,
+    deleteSysForum,
+    saveSysForumComment,
+  } from "@/api/system/copyofprocess/liuchengchasongguanli.js";
+  import organizationManageInfo from './organizationManageInfo.vue'
+  export default {
+    components: {
+      organizationManageInfo,
+    },
+    data() {
+      return {
+        viewState: 1,
+        activeName: "roleList",
+        dialogTitle: "",
+        editDialog: false,
+        form: {},
+        formBackup: Object.assign({}, this.form),
+        tableData: [],
+        commentContent: "", // 评论内容
+        typeList: [{
+            dictKey: "1",
+            dictValue: "JAVA",
+          }, {
+            dictKey: "2",
+            dictValue: "Python",
+          }, {
+            dictKey: "3",
+            dictValue: "C++",
+          }, {
+            dictKey: "4",
+            dictValue: "Excel",
+          }, {
+            dictKey: "5",
+            dictValue: "英语四六级考试",
+          }, {
+            dictKey: "6",
+            dictValue: "计算机等级考试",
+          }
 
-export default {
-  components: { Position },
-  data() {
-    return {
-      dialogVisible: false,
-      mapDialog: false,
-      dialogTitle: '',
-      props: {
-        label: 'name',
-        children: 'children'
-      },
-      nodeForm: {
-        sid: '',
-        name: '',
-        sortNo: ''
-      },
-      ewmForm: {
-        qrFilePath: '',
-        organizationName: '',
-        departmentName: '',
-        address: ''
+        ]
+      };
+    },
+    mounted() {
+      this.getPageList();
+      console.log("sssssssssss", window.sessionStorage.getItem('userSid'))
+    },
+    methods: {
+      getType(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.typeList.filter((item) => item.dictKey === value)
+        this.form.type = choose[0].dictValue
+        // this.form.typeSid = choose[0].dictKey
       },
-      orgAttribute_list: [],
-      orgLevel_list: [],
-      form: {
-        sid: '',
-        name: '',
-        orgCode: '',
-        /*  jwd: '',*/
-        addrs: '',
-        zgStaffSid: '',
-        zgStaffName: '',
-        fgStaffSid: '',
-        fgStaffName: '',
-        linkPerson: '',
-        linkPhone: '',
-        sort: '',
-        isDept: '',
-        orgAbbre: '',
-        orgAttributeValue: '',
-        orgAttributeKey: '',
-        orgLevelValue: '',
-        orgLevelKey: '',
-        otherCode: ''
+      getPageList() {
+        // 获取列表
+        selectSysForum().then((res) => {
+          this.tableData = res.data;
+        });
       },
-      fgStaffSid: [],
-      formBackup: Object.assign({}, this.form),
-      isshow: 'table',
-      page: {
-        total: 0, // 默认数据总数
-        current: 1, // 默认开始页面
-        size: 10, // 每页的数据条数
-        params: {
-          name: '',
-          organizationSid: '',
-          psid: ''
+      handleClick(tab, event) {
+        if (tab.name == "addrole") {
+          this.dialogTitle = "新增";
+          this.roleForm = Object.assign({}, this.formBackup);
+        } else {
+          this.getPageList();
         }
       },
-      tableData: [],
-      treedata: [],
-      staffdata: [],
-      staffdata2: [],
-      rules: {}
-    }
-  },
-  mounted() {
-    this.getOrgTree()
-    this.init()
-  },
-  methods: {
-    init() {
-      typeValues({ type: 'orgAttribute' }).then((res) => {
-        if (res.success) {
-          this.orgAttribute_list = res.data
-        }
-      })
-      typeValues({ type: 'orgLevel' }).then((res) => {
-        if (res.success) {
-          this.orgLevel_list = res.data
-        }
-      })
-    },
-    changeOrgLevel(value) {
-      let bb = null
-      this.orgLevel_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            value: e.dictValue,
-            key: e.dictKey
-          }
-        }
-      })
-      this.form.orgLevelValue = bb.value
-      this.form.orgLevelKey = bb.key
-    },
-    changeOrgAttribute(value) {
-      let bb = null
-      this.orgAttribute_list.forEach((e) => {
-        if (e.dictValue === value) {
-          bb = {
-            key: e.dictKey,
-            value: e.dictValue
-          }
-        }
-      })
-      this.form.orgAttributeKey = bb.key
-    },
-    pagination(val) { // 分页
-      this.page.current = val.pageNum
-      this.page.size = val.pageSize
-      this.getPageList(this.page)
-    },
-    handleNodeClick(data) {
-      this.isshow = 'table'
-      this.page.params.organizationSid = this.$store.getters.userInfo.orgSid
-      this.page.params.psid = data.sid || 0
+      save() {
+        console.log("form", this.form)
 
-      this.getPageList(this.page)
-    },
-    getPageList(data) { // 获取树形列表
-      pageList(data).then(res => {
-        console.log('返回子级:',res)
-        this.tableData = res.data.records
-        this.page.total = res.data.total
-      })
-    },
-    getOrgTree() { // 获取树形列表
-      orgList({}).then(res => {
-        this.treedata = res.data
-      })
-    },
-    save() {
-      if (this.fgStaffSid.length > 0) {
-        this.form.fgStaffSid = this.fgStaffSid.join()
-      } else {
-        this.form.fgStaffName = ''
-        this.form.fgStaffSid = ''
-      }
-      this.form.organizationSid = this.$store.getters.userInfo.orgSid
-//      this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join()
-      if (this.form.sid) {
-//      	console.log(this.form)
-        putOrgtree(this.form).then(res => {
-          if (res.success) {
-            this.isshow = 'table'
-            this.getOrgTree()
-            this.handleNodeClick({ sid: this.form.psid })
-            this.$message({
-              message: res.msg,
-              type: 'success'
-            })
-          }
-        })
-      } else {
-        addOrgTree(this.form).then(res => {
-          if (res.success) {
-            this.isshow = 'table'
-            this.getOrgTree()
-            this.handleNodeClick({ sid: this.form.psid })
-            this.$message({
-              message: res.msg,
-              type: 'success'
-            })
-          }
-        })
-      }
-    },
-    append(data) {
-      console.log(123456789, data)
-      this.dialogTitle = '新增'
-      this.isshow = 'edit'
-      this.fgStaffSid = []
-      this.form = Object.assign({}, this.formBackup)
-      this.form.psid = data.sid || 0
-      this.form.organizationSid = this.$store.getters.userInfo.orgSid
-      this.form.address = data.orgAddress || data.address
-      this.form.dlxx = data.gisInfo || data.dlxx
-      this.getStaff(data.sid)
-      this.getStaff2(data.sid)
-    },
-    editRow(row) {
-      this.getStaff(row.sid)
-      this.getStaff2(row.sid)
-      this.dialogTitle = '编辑'
-      this.isshow = 'edit'
-      this.fgStaffSid = []
-      selectBySid(row.sid).then((response) => {
-        if (response.success) {
-          this.form = response.data
-          this.form.fgStaffName = response.data.fgNames
-          this.form.fgStaffSid = response.data.fgStaffSid
-          if (this.form.fgStaffSid) {
-            this.fgStaffSid = response.data.fgStaffSid.split(',')
+        saveSysForumComment(
+
+          {
+            forumSid: this.form.sid,
+            content: this.commentContent,
+            createBySid: window.sessionStorage.getItem('userSid')
           }
-          this.form.zgStaffName = response.data.zgNames
-          this.form.zgStaffSid = response.data.zgStaffSid
-          console.log('编辑回显的数据', this.form)
-        }
-      })
-    },
-    deit(data) { // 节点编辑保存
-      this.getStaff(data.sid)
-      this.getStaff2(data.sid)
-      console.log(data, 8888)
-      this.dialogVisible = true
-      this.form.sid = data.sid
-      // this.form.psid = null
-      this.form.name = data.name
-      this.form.orgCode = data.orgCode
-      /* this.form.jwd = data.jwd*/
-      this.form.addrs = data.addrs
-      this.form.linkPerson = data.linkPerson
-      this.form.linkPhone = data.linkPhone
-      this.form.sort = data.sort
-      this.form.zgStaffSid = data.zgSids
-      this.form.fgStaffSid = data.fgSids.split(',')
-    },
-    nodeSave() { // 节点编辑保存
-      console.log('这是保存nodeSave(0')
-      this.form.fgStaffSid = this.form.fgStaffSid.join()
-      postOrgtree(this.form).then(res => {
-        this.getOrgTree()
-        this.dialogVisible = false
-        this.$message({
-          message: res.msg,
-          type: 'success'
-        })
-      })
-    },
-    remove(data) {
-      this.$confirm('确定要删除该组织吗, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        delOrgtree({ sid: data.sid }).then(res => {
-          this.getOrgTree()
-          this.handleNodeClick({ sid: data.psid })
+
+        ).then((res) => {
+          this.commentContent = ""
+          this.editDialog = false;
+          this.getPageList();
           this.$message({
             message: res.msg,
-            type: 'success'
-          })
-        })
-      })
-    },
-    lookRow(row) { // 查看二维码
-      this.isshow = 'ewm'
-      getQrCode({ sid: row.sid }).then(res => {
-        this.ewmForm = res.data
-      })
-    },
-    Printewm() {
-      this.$print(this.$refs.print) // 使用
-    },
-    mouseenter(data) {
-      this.$set(data, 'del', true)
-    },
-    mouseleave(data) {
-      this.$set(data, 'del', false)
-    },
-    onSearch() {
-      this.getPageList(this.page)
-    },
-    resetSearch() {
-      this.page.params.name = ''
-      this.getPageList(this.page)
-    },
-    // 主管人员
-    getStaff(orgSid) {
-      getStaff({ deptSid: orgSid }).then((res) => {
-        if (res.success) {
-          this.staffdata = res.data
-        }
-      })
+            type: "success",
+          });
+        });
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      editRow(row) {
+        this.dialogTitle = "评论";
+        this.editDialog = true;
+        this.form = Object.assign({}, row);
+      },
+      detail(row) {
+        this.viewState = 4
+        this.$refs['divInfo'].showAdd(row)
+
+      },
     },
-    // 分管人员
-    getStaff2(orgSid) {
-      getStaffName({ deptSid: orgSid }).then(res => {
-        this.staffdata2 = res.data
-        console.log('分管人员', this.staffdata2)
-      })
-    }
-  }
-}
+  };
 </script>
 
-<style>
-.el-icon-arrow-right:before {
-  content: '\e6e0';
-  color: #727272;
-}
-</style>
-
 <style scoped="scoped" lang="scss">
-.org-tree {
-  width: 240px;
-  min-height: 100%;
-  box-sizing: border-box;
-  /*padding-right: 10px;*/
-  border: 1px solid #edf1f7;
-  overflow: scroll;
-}
-
-.org-table {
-  flex: 1;
-  // padding-left: 10px;
-  margin: 0 10px;
-  border: 1px solid #edf1f7;
-  min-height: 100%;
-  overflow-y: scroll;
-
-  .ewm {
-    margin: 30px auto 0;
-    width: 560px;
-  }
-
-  .ediut {
-    margin: 30px auto 0;
-    /*width:750px;*/
+  .my-tabs {
+    margin-top: 10px;
   }
-}
-
-.custom-tree-node {
-  position: relative;
-  overflow: hidden;
-  width: 100%;
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  padding-right: 8px;
-}
-
-.handle {
-  position: absolute;
-  right: 0;
-
-  .el-button--text {
-    font-size: 15px;
-    background-color: #FFFFFF;
-  }
-}
-
-.my-tabs {
-  margin-top: 10px;
-}
-
-.edit {
-  .el-form-item__label {
-    width: 100px !important;
-    display: inline-block !important;
-  }
-
-  .el-input {
-    width: 70%;
-  }
-}
-
-.td_left {
-  border-left: 0 solid #e6e9f0;
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/demo-web-ui/src/views/organizationManage/organizationManageInfo.vue b/demo-web-ui/src/views/organizationManage/organizationManageInfo.vue
new file mode 100644
index 0000000..7f3b3aa
--- /dev/null
+++ b/demo-web-ui/src/views/organizationManage/organizationManageInfo.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>【查看】论坛信息</div>
+        <div>
+          <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="dataForm" :model="form" label-position="top" label-width="190px" class="formadd">
+          <div class="titwu">论坛信息</div>
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div>主体信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">论坛类别</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <span>{{form.type}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">论坛标题</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <span>{{form.title}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">论坛内容</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <span>{{form.content}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div>评论信息</div>
+          </div>
+          <el-table v-loading="listLoading" :data="temp" border style="width: 100%;"
+            :row-style="{height: '40px'}">
+            <!-- <el-table-column type="selection" align="center" width="50"/> -->
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="操作" wid align="center" width="150">
+              <template slot-scope="scope">
+                <!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> -->
+                <!-- <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button> -->
+                <el-button  type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="评论人员" prop="name" align="center" />
+            <el-table-column label="评论时间" prop="createTime" align="center" />
+            <el-table-column label="评论内容" prop="content" align="center" />
+          </el-table>
+
+        </el-form>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    selectSysForumCommentOne,
+    deleteSysForumComment,
+  } from "@/api/system/copyofprocess/liuchengchasongguanli.js";
+
+  export default {
+    data() {
+      return {
+        listLoading: false,
+        activeNames: ['1'],
+        form: {},
+        temp: [] ,// 添加和修改
+        userSid :""
+      };
+    },
+    mounted() {
+      this.userSid = window.sessionStorage.getItem('userSid')
+       console.log("ddddddddddddddd", this.userSid )
+    },
+    methods: {
+      // 序号
+      indexMethod(index) {
+        // var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        // var pageindex = index + 1 + pagestart
+        return index + 1
+      },
+      doDel(row) {
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteSysForumComment(row.sid).then((response) => {
+            if (response.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '删除成功'
+              })
+              this.showAdd( this.form)
+            } else {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '删除失败'
+              })
+            }
+          })
+        })
+      },
+      showAdd(row) {
+        this.form = row
+        selectSysForumCommentOne(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              console.log("ddddddddddddddd", resp)
+              this.temp = resp.data
+            }
+
+          })
+          .catch(e => {
+            this.$emit('doback')
+          })
+      },
+      // 组件返回
+      handleReturn() {
+        this.$emit('doback')
+      }
+
+    },
+  };
+</script>
+
+<style scoped="scoped" lang="scss">
+  .my-tabs {
+    margin-top: 10px;
+  }
+</style>
diff --git a/demo-web-ui/src/views/personalization/personalization.vue b/demo-web-ui/src/views/personalization/personalization.vue
index b30ce33..24497ac 100644
--- a/demo-web-ui/src/views/personalization/personalization.vue
+++ b/demo-web-ui/src/views/personalization/personalization.vue
@@ -1,117 +1,172 @@
 <template>
-  <div class="content">
-    <div class="right_cont">
-      <table class="tishi" cellspacing="0" style="margin:0 auto 30px">
+  <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+    <el-tab-pane label="公告信息" name="roleList">
+      <div class="container">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column label="序号" width="70px" type="index" align="center">
+          </el-table-column>
+          <el-table-column label="操作" width="150px" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="editRow(scope.row)">
+                修改
+              </el-button>
+              <el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="title" label="公告标题" align="center" />
+          <el-table-column prop="content" label="公告内容" align="center" />
+        </el-table>
+      </div>
+    </el-tab-pane>
+
+    <el-tab-pane label="发布公告" name="addrole">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>公告标题</td>
+          <td>
+            <el-input v-model="form.title" style="width: 300px"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>公告内容</td>
+          <td>
+            <el-input v-model="form.content" style="width: 300px"></el-input>
+          </td>
+        </tr>
+      </table>
+      <div style="margin-top: 20px; text-align: center">
+        <el-button type="primary" @click="save()">保存</el-button>
+      </div>
+    </el-tab-pane>
+    <el-dialog :title="dialogTitle + '公告信息'" :visible.sync="editDialog" width="40%">
+      <table class="e-table" cellspacing="0">
+        <tr>
+          <td>公告标题</td>
+          <td>
+            <el-input v-model="form.title" style="width: 300px"></el-input>
+          </td>
+        </tr>
         <tr>
-          <td style="border-right: none;">设置默认组织机构</td>
+          <td>公告内容</td>
           <td>
-            <el-select v-model="formobj.orgNamePath" filterable placeholder="请选择" @change="changeoOrgNamePath" clearable>
-              <el-option v-for="item in orgNamePath_list" :key="item.orgSidPath" :label="item.orgNamePath" :value="item.orgNamePath"/>
-            </el-select>
+            <el-input v-model="form.content" style="width: 300px"></el-input>
           </td>
         </tr>
       </table>
-      <span slot="footer" class="dialog-footer" style="margin-left:40%;">
-        <el-button style=" margin-left: 8%; width: 100px;height: 40px;" type="primary" @click="handleConfirm()">确认</el-button>
-      </span>
-    </div>
-  </div>
+      <div style="margin-top: 20px; text-align: center">
+        <el-button type="primary" @click="save()">保存</el-button>
+      </div>
+    </el-dialog>
+  </el-tabs>
 </template>
 
 <script>
-import { getList, saveOrUpdate } from '@/api/system/personalization/personalization'
+  import {
+    selectSysNotice,
+    saveSusNotice,
+    alterSusNotice,
+    deleteSysNotice,
+  } from "@/api/system/personalization/personalization.js";
 
-export default {
-  name: 'personalization',
-  data() {
-    return {
-      orgNamePath_list: [],
-      formobj: {
-        orgSidPath: '',
-        orgNamePath: '',
-        userSid: ''
-      }
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods: {
-    init() {
-      getList({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.formobj.orgNamePath = res.data.orgNamePath
-          this.formobj.orgSidPath = res.data.orgSidPath
-          this.orgNamePath_list = res.data.list
-        }
-      })
+  export default {
+    data() {
+      return {
+        activeName: "roleList",
+        dialogTitle: "",
+        editDialog: false,
+        form: {},
+        student: {},
+        formBackup: Object.assign({}, this.form),
+        tableData: [],
+      };
     },
-    changeoOrgNamePath(value) {
-      const choose = this.orgNamePath_list.filter((item) => item.orgNamePath === value)
-      this.formobj.orgSidPath = choose[0].orgSidPath
+    mounted() {
+      this.getPageList();
     },
-    handleConfirm() {
-      if (this.formobj.orgNamePath === '') {
-        this.$message({ showClose: true, type: 'error', message: '默认组织机构不能为空' })
-        return
-      }
-      this.formobj.userSid = window.sessionStorage.getItem('userSid')
-      saveOrUpdate(this.formobj).then((res) => {
-        if (res.success) {
-          this.$message({ showClose: true, type: 'success', message: '操作成功' })
+    methods: {
+      pagination(val) {
+        // 分页
+        this.page.current = val.pageNum;
+        this.page.size = val.pageSize;
+        this.getPageList(this.page);
+      },
+      resetSearch() {
+        this.getPageList();
+      },
+      getPageList() {
+        // 获取列表
+        selectSysNotice().then((res) => {
+          this.tableData = res.data;
+        });
+      },
+      handleClick(tab, event) {
+        if (tab.name == "addrole") {
+          this.dialogTitle = "新增";
+          this.roleForm = Object.assign({}, this.formBackup);
+        } else {
+          this.getPageList();
         }
-      })
-    }
-  }
-}
-</script>
+      },
+      save() {
 
-<style scoped="scoped" lang="scss">
+        console.log("form", this.form)
 
-.content {
-  width: 100%;
-  padding-top: 10px;
-  font-size: 16px;
-  color: #fff;
-  box-sizing: border-box;
-}
-.right_cont {
-  width: 100%;
-  height: 645px;
-  background-color: #fff;
-  margin: 0;
-  padding: 15px;
-  box-sizing: border-box;
-}
+        if (this.form.sid) {
+          alterSusNotice(this.form).then((res) => {
+            this.editDialog = false;
+            this.getPageList();
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+          });
+        } else {
+          saveSusNotice(this.form).then((res) => {
+            this.getPageList();
+            this.activeName = "roleList";
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+          });
+        }
+        this.reset();
+      },
+      reset() {
+        this.form = {};
+      },
+      editRow(row) {
+        this.dialogTitle = "编辑";
+        this.editDialog = true;
+        this.form = Object.assign({}, row);
+      },
+      deleteRow(row) {
+        this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          deleteSysNotice(row.sid).then((res) => {
+            this.getPageList();
 
-.tishi {
-  width: 560px;
-  color: #000;
-  padding-left: 1.5%;
-  margin-bottom: 50px;
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
 
-  tr {
-    height: 70px;
-  }
+          });
 
-  td {
-    border: 1px solid #e6e9f0;
-    text-align: center;
-  }
+        });
 
-  td:first-child {
-    background-color: #f7f9fc;
-  }
-
-  .el-input,
-  input {
-    width: 80%;
-  }
+      },
+    },
+  };
+</script>
 
-  span {
-    font-size: 26px;
-    color: red;
-    margin-left: 10px;
+<style scoped="scoped" lang="scss">
+  .my-tabs {
+    margin-top: 10px;
   }
-}
-</style>
+</style>
diff --git a/demo-web-ui/src/views/region/region.vue b/demo-web-ui/src/views/region/region.vue
index 1f0db5e..103088b 100644
--- a/demo-web-ui/src/views/region/region.vue
+++ b/demo-web-ui/src/views/region/region.vue
@@ -1,563 +1,204 @@
 <template>
   <div class="app-container">
-    <div v-show="viewState == 1">
-      <el-menu :default-active="activeIndex" style="" class="el-menu-demo" mode="horizontal">
-        <el-menu-item
-          index="1"
-          style="margin-left: 0;text-align: center; background-color: #028ac8!important;color: #fff;">
-          区域管理(省)
-        </el-menu-item>
-        <div class="new_" @click="showAddDialog">新增</div>
-      </el-menu>
-      <!-- 新增弹框开始-->
-      <regionAdd ref="reAdd" @closeLoding="newFails"/>
-      <!-- 新增弹框结束-->
-      <!-- 修改弹框开始-->
-      <!-- :psid="psid"  :huixian="huixian" @closeLoding="newFails"-->
-      <el-dialog width="60%" :append-to-body="true" :visible.sync="updateEcho_">
-        <div class="poptitle">
-          <div class="conter_title">名称：</div>
-          <div class="conter_content" style="flex:7">
-            <el-input v-model="huixian.name" style="width: 300px;margin-left: 20px"/>
+    <div v-show="viewState ==1">
+      <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="自主学习计划" name="roleList">
+          <div class="container">
+            <el-table :data="tableData" border style="width: 100%">
+              <el-table-column label="序号" width="70px" type="index" align="center">
+              </el-table-column>
+              <el-table-column label="操作" width="150px" align="center">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" @click="editRow(scope.row)">
+                    编辑
+                  </el-button>
+                  <el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
+                    删除
+                  </el-button>
+                  <!-- <el-button type="primary" size="mini" @click="detail(scope.row)">
+                    查看
+                  </el-button> -->
+                </template>
+              </el-table-column>
+              <el-table-column prop="teacherNo" label="教师工号" align="center" />
+              <el-table-column prop="studentNo" label="学生学号" align="center" />
+              <el-table-column prop="planContent" label="学习计划" align="center" />
+              <el-table-column prop="state" label="数据状态" align="center" />
+              <el-table-column prop="plan0pinion" label="反馈意见" align="center" />
+            </el-table>
           </div>
-        </div>
-        <div class="poptitle">
-          <div class="conter_title" style="">行政区域代码：</div>
-          <div class="conter_content" style="flex: 7">
-            <el-input v-model="huixian.districtCode" style="width: 300px;margin-left: 20px"/>
+        </el-tab-pane>
+
+        <el-tab-pane label="新增计划" name="addrole">
+          <table class="e-table" cellspacing="0">
+            <tr>
+              <td>教师工号</td>
+              <td>
+                <!-- <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+                  @change="getType">
+                  <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select> -->
+                <el-input v-model="form.teacherNo" style="width: 300px"></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>学生学号</td>
+              <td>
+                <el-input v-model="form.studentNo" style="width: 300px"></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>学习计划内容</td>
+              <td>
+                <el-input v-model="form.planContent" style="width: 300px"></el-input>
+              </td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px; text-align: center">
+            <el-button type="primary" @click="save()">保存</el-button>
           </div>
-        </div>
-        <div class="poptitle">
-          <div class="conter_title" style="">级别：</div>
-          <div class="conter_content" style="flex: 7">
-            <el-input v-model="huixian.level" type="namber" style="width: 300px;margin-left: 20px"/>
+        </el-tab-pane>
+        <el-dialog :title="dialogTitle + '学习计划'" :visible.sync="editDialog" width="40%">
+          <table class="e-table" cellspacing="0">
+            <tr>
+              <td>教师工号</td>
+              <td>
+                <!-- <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+             @change="getType">
+             <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+               :value="item.dictKey" />
+           </el-select> -->
+                <!-- <span>{{form.teacherNo}}</span> -->
+                <el-input v-model="form.teacherNo" style="width: 300px"></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>学生学号</td>
+              <td>
+                <!-- <span>{{form.studentNo}}</span> -->
+                <el-input v-model="form.studentNo" style="width: 300px"></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>学习计划内容</td>
+              <td>
+                <!-- <span>{{form.planContent}}</span> -->
+                <el-input v-model="form.planContent" style="width: 300px"></el-input>
+              </td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px; text-align: center">
+            <el-button type="primary" @click="save()">保存</el-button>
           </div>
-        </div>
-        <div class="poptitle">
-          <div class="conter_title" style="">排序号：</div>
-          <div class="conter_content" style="flex: 7">
-            <el-input v-model="huixian.sortNo" type="namber" style="width: 300px;margin-left: 20px"/>
-          </div>
-        </div>
-        <div style="width: 100%;display: flex;justify-content: center;margin-top: 20px;">
-          <el-button @click="newWrit_bc">保存</el-button>
-          <el-button @click="close_">关闭</el-button>
-        </div>
-      </el-dialog>
-      <!-- 修改弹框结束-->
-      <!-- Start 条件查询部分-->
-      <div style="display: flex;width: 100%;margin: 0 auto ;border: 1px solid #dcdfe6;margin-top: 20px;padding: 10px 0">
-        <div
-          style="margin-left: 20px;display: flex;width: 300px;height: 40px;justify-content:space-around;align-items: center ;"
-        >
-          <span>区域名称：</span>
-          <el-input v-model="queryparams.params.name" clearable style="width: 200px"/>
-        </div>
-        <div
-          style="margin-left: 20px;display: flex;width: 350px;height: 40px;justify-content:space-around;align-items: center ;"
-        >
-          <span>行政区域代码：</span>
-          <el-input v-model="queryparams.params.districtCode" clearable style="width: 200px"/>
-        </div>
-        <div style="width:140px;float: right;line-height: 30px;height: 30px;margin-top: 5px;margin-left: 30px;">
-          <el-button size="mini" type="primary" @click="loadList(1)">查询</el-button>
-          <el-button size="mini" type="primary" @click="reset()">重置</el-button>
-        </div>
-      </div>
-      <!-- End 条件查询部分-->
-      <!--Start 列表部分-->
-      <div class="liebiaotitle" style="background-color: #fff;background-color: #0099ff;margin-top: 10px;">
-        <div class="writ_title">
-          <div style="margin-left: 10px">区域列表</div>
-          <!--          <pagination :total="queryparams.total" :page.sync="queryparams.current" :limit.sync="queryparams.size"-->
-          <!--                      @pagination="pageSizeChange"/>-->
-          <el-pagination :total="queryparams.total" :page-size="queryparams.size" :page-sizes="[10, 20, 50, 100]"
-                         background layout="sizes"
-                         @size-change="pageSizeChange"/>
-        </div>
-      </div>
-      <div>
-        <el-table
-          v-loading="tableloading"
-          border
-          :data="tableList"
-          tooltip-effect="dark"
-          style="width: 100%"
-          :cell-class-name="addclass"
-          :header-cell-style="{ background: '#f8f8f8', color: '#333' }"
-        >
-          <!-- <el-table-column type="index" width="50" label="序号" /> -->
-          <el-table-column label="操作" width="220" align="center">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="administration(scope.row.sid)">管理</el-button>
-              <el-button type="primary" size="mini" @click="dataChang(scope.row.sid)">修改</el-button>
-              <el-button type="danger" size="mini" @click="delOne(scope.$index, scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="名称" align="center" prop="name"/>
-          <el-table-column label="行政区域代码" align="center" prop="districtCode"/>
-          <el-table-column label="排序" align="center" prop="sortNo"/>
-          <!-- <el-table-column label="区域名称" align="center" prop="title">
-            <template slot-scope="scope">
-              <div class="bgcolor" @click="cnsDetails(scope.row.sid)">{{ scope.row.title }}</div>
-            </template>
-          </el-table-column> -->
-        </el-table>
-        <pagging :notshowdelete="true" :queryparams="queryparams" @reloading="loadList"/>
-      </div>
-      <!--End 列表部分-->
-
-      <el-dialog width="28%" :append-to-body="true" :visible.sync="cns_details" style="margin-top: -10vh;">
-        <!-- 列表详情开始-->
-        <div class="xqlb_con">
-          <div class="xqlb_title">{{ deteils.title }}</div>
-          <div class="xqlb_contents" style="white-space: pre-wrap;" v-html="deteils.contents"/>
-        </div>
-      </el-dialog>
-      <!-- 列表详情结束-->
+        </el-dialog>
+      </el-tabs>
     </div>
-    <!--Start 城市页面-->
-    <region-city v-show="viewState == 2" ref="regionCity" @goBack="resetView"/>
+    <!-- <organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" /> -->
   </div>
 </template>
 
 <script>
-  import req from '@/api/system/region/region' // 请求方法
-  import pagging from '@/components/Pagging' // 删除一条数据
-  import regionAdd from './component/regionAdd' // 添加一条数据
-  import regionAlter from './component/regionAlter' // 修改一条数据
-  import regionCity from './regionCity' // 城市
-  import regionDistrict from './regionDistrict' // 区和县
-  // import '@/styles/e-region.scss'
+  import req from "@/api/system/region/region.js";
+  // import organizationManageInfo from './organizationManageInfo.vue'
   export default {
-    name: 'Region',
     components: {
-      pagging,
-      regionAdd,
-      // eslint-disable-next-line vue/no-unused-components
-      regionAlter,
-      regionCity,
-      // eslint-disable-next-line vue/no-unused-components
-      regionDistrict
+      // organizationManageInfo,
     },
     data() {
       return {
-        viewState: 1, // 1、省 2、市 3、区/县
-        sid: '', //每行的sid
-        //regionDto是一条数据
-        psid: '0',
-        regionDto: {
-          districtCode: '',
-          level: 0,
-          name: '',
-          psid: this.psid,
-          sortNo: 0
-        },
-        huixian: {},
-        tableloading: false,
-        title: '',
-        contents: '',
-        hxtitle: '',
-        hxcontents: '',
-        //列表查询
-        queryparams: {
-          total: 0,
-          current: 1,
-          params: {
-            districtCode: '',
-            name: '',
-            psid: 0
-          },
-          size: 10
-        },
-        name: '',
-        activeIndex: '1', // 报错:格式有问题，把数字1改成字符串'1'
-        new_file: false,
-        updateEcho_: false,
-        tableList: [],
-        hxsid: '',
-        cns_details: false,
-        deteils: {
-          title: '',
-          contents: ''
-        }
+        viewState: 1,
+        activeName: "roleList",
+        dialogTitle: "",
+        editDialog: false,
+        form: {},
+        formBackup: Object.assign({}, this.form),
+        tableData: [],
       }
     },
-    created() {
-      this.new_file = false
-      this.loadList()
+    mounted() {
+      this.getPageList();
     },
     methods: {
-      showAddDialog() {
-        var psid = this.queryparams.params.psid
-        var level = 1
-        this.$refs['reAdd'].showAdd(psid, level);
-        // this.$refs['reAdd'].regionDto.psid = sid;
-        // this.$refs['reAdd'].regionDto.level = 2;
+      getPageList() {
+        // 获取列表
+        req.selectSysPlan().then((res) => {
+          this.tableData = res.data;
+        });
       },
-      // 市返回到省
-      resetView() {
-        this.viewState = 1
+      handleClick(tab, event) {
+        if (tab.name == "addrole") {
+          this.dialogTitle = "新增";
+          this.roleForm = Object.assign({}, this.formBackup);
+        } else {
+          this.getPageList();
+        }
       },
+      save() {
+        console.log("form", this.form)
 
-      //
-      newFails() {
-        this.loadList()
-        this.new_file = false
-        this.updateEcho_ = false
-        this.psid = ''
-        this.huixian = {}
-      },
-      // 管理跳转页面到市
-      administration(sid) {
-        const _this = this;
-        this.viewState = 2;
-        this.$refs['regionCity'].psidRegion = this.queryparams.params.psid; //省级数据的psid传给市级
-        this.$refs['regionCity'].queryparams.params.psid = sid; //把省级数据的sid传给市级
-        // console.log('上一级sid传给添加页面',this.$refs['regionAdd'].regionDto.psid)
-        this.$refs['regionCity'].showCity()
-        this.queryparams.params.psid = sid;
-        req.pagerList(this.queryparams).then(resp => {
-          this.tableloading = false
-          if (resp && resp.success) {
-            _this.$refs['regionCity'].tableList = resp.data.records
-          }
-        })
-      },
-      // 重置
-      reset() {
-        this.queryparams.params.name = ''
-        this.queryparams.params.districtCode = ''
-      },
-      addclass(row) {
-        if (row.columnIndex === 1) {
-          return 'bgcolor'
-        }
+        if (this.form.sid) {
+          req.alterSysPlant(this.form).then((res) => {
+            this.editDialog = false;
+            this.getPageList();
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+          });
+        } else {
+          req.saveSysPlan(this.form).then((res) => {
+            this.getPageList();
+            this.activeName = "roleList";
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+          });
+        }
+          this.reset();
+      },
+      reset() {
+        this.form = {};
       },
-      //分页
-      pageSizeChange(val) {
-        this.queryparams.size = val
-        this.loadList()
+      resetState() {
+        this.viewState = 1
       },
-      // 关闭弹框
-      close_() {
-        this.new_file = false
-        this.updateEcho_ = false
+      editRow(row) {
+        this.dialogTitle = "编辑";
+        this.editDialog = true;
+        this.form = Object.assign({}, row);
       },
+      detail(row) {
+        this.viewState = 4
+        this.$refs['divInfo'].showAdd(row)
 
-      // 查询列表
-      loadList(flag) {
-        const _this = this
-        this.tableloading = true
-        if (flag == 1) {
-          this.queryparams.current = 1
-        }
-        req.pagerList(this.queryparams).then(resp => {
-          this.tableloading = false
-          if (resp && resp.success) {
-            const data = resp.data
-            _this.queryparams.total = data.total
-            _this.tableList = []
-            _this.tableList = data.records
-          }
-        })
       },
+      deleteRow(row) {
+        this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          req.deleteSysPlan(row.sid).then((res) => {
+            this.getPageList();
 
-      // 删除
-      delOne(index, row) {
-        this.$confirm('此操作将删除记录, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.doDelete(row.sid)
-          })
-          .catch(() => {
-          })
-      },
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
 
-      doDelete(sid) {
-        const _this = this
-        req.delete(sid).then(resp => {
-          console.log('resp' + resp)
-          if (resp && resp.success) {
-            _this.$message({
-              type: 'success',
-              message: resp.msg,
-              showClose: true
-            })
-            _this.loadList()
-          } else {
-            this.$message.error(resp.msg)
-          }
-        })
-      },
+          });
 
-      // 点击修改回显
-      dataChang(sid) {
-        const _this = this;
-        req.updateEcho(sid).then(resp => {
-          console.log('省级修改回显resp', resp);
-          if (resp && resp.success) {
-            const data = resp.data
-            _this.sid = data.sid
-            _this.psid = data.psid
-            this.huixian = data
-            _this.updateEcho_ = true
-          } else {
-            _this.$message.error(resp.msg)
-          }
-        })
-      },
-      // 修改保存
-      newWrit_bc() {
-        this.regionDto.districtCode = this.huixian.districtCode;
-        this.regionDto.level = this.huixian.level;
-        this.regionDto.name = this.huixian.name;
-        this.regionDto.sortNo = this.huixian.sortNo;
-        this.regionDto.psid = this.psid;
-        console.log('111省级-修改保存获取的regionDto', this.regionDto);
-        console.log('111省级-修改保存获取的psid', this.psid);
-        console.log('111省级-修改保存获取的sid', this.sid);
-        req.update(this.regionDto, this.sid).then(resp => {
-          console.log('这里是修改后的regionDto', this.regionDto, this.sid)
-          if (resp && resp.success) {
-            this.$message({
-              type: 'success',
-              message: resp.msg,
-              showClose: true
-            })
-            if (resp.code === '200') {
-              this.regionDto.districtCode = '';
-              this.regionDto.name = '';
-              this.regionDto.psid = '';
-              this.regionDto.level = '';
-              this.regionDto.sortNo = 0;
-              this.updateEcho_ = false;
-              this.loadList()
-            }
-          } else {
-            this.$message.error(resp.msg)
-          }
-        })
-      },
+        });
 
-      // 修改保存
-      newWrit_xg() {
-        console.log(this.hxcontents)
-        const dto = {
-          title: this.hxtitle,
-          contents: this.hxcontents,
-          sid: this.hxsid
-        }
-        console.log(dto)
-        // req.updateSave(dto).then(resp => {
-        //   if (resp && resp.success) {
-        //     this.$message({
-        //       type: 'success',
-        //       message: resp.msg,
-        //       showClose: true
-        //     })
-        //     this.updateEcho_ = false
-        //     this.hxtitle = ''
-        //     this.hxcontents = ''
-        //     this.loadList()
-        //   } else {
-        //     this.$message.error(resp.msg)
-        //   }
-        // })
-      }
+      },
     }
-  }
+  };
 </script>
 
-<style scoped lang="scss">
-  .app-container {
+<style scoped="scoped" lang="scss">
+  .my-tabs {
     margin-top: 10px;
   }
-
-  .editor {
-    line-height: normal !important;
-    /* height: 192px; */
-    width: 93%;
-    margin-top: 20px;
-    margin-left: 20px;
-  }
-
-  .xqlb_con {
-    width: 100%;
-    min-height: 500px;
-    padding: 10px 15px 10px 15px;
-    border: 1px solid #dedede;
-    margin: 0 auto;
-
-    .xqlb_title {
-      width: 90%;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      font-weight: 1000;
-      margin: 0 auto;
-    }
-
-    .xqlb_contents {
-    }
-
-  }
-
-  .el-dialog__title {
-    text-align: center !important;
-    background-color: #0099ff !important;
-    color: #fff !important;
-  }
-
-  .tab_left {
-    text-align: right !important;
-    padding-right: 30px !important;
-  }
-
-  .writ_title {
-    font-weight: bold;
-    margin: 0px 0px;
-    color: #fff;
-    padding: 5px 10px;
-    background-color: #0099ff;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  .poptitle {
-    width: 97%;
-    height: 50px;
-    line-height: 50px;
-    border: 1px solid #dedede;
-    display: flex;
-
-    .conter_title {
-      flex: 3;
-      height: 50px;
-      border-right: 1px solid #dedede;
-      text-align: center;
-      line-height: 50px;
-    }
-
-    .conter_content {
-      flex: 7;
-    }
-
-  }
-
-  .popitem {
-    width: 97%;
-    min-height: 300px;
-    line-height: 50px;
-    border-left: 1px solid #dedede;
-    border-right: 1px solid #dedede;
-    border-bottom: 1px solid #dedede;
-    display: flex;
-
-    .popitem_title {
-      flex: 3;
-      min-height: 300px;
-      border-right: 1px solid #dedede;
-      text-align: center;
-      line-height: 300px;
-    }
-
-  }
-
-  .textarea__inner {
-    overflow-y: auto;
-    min-height: 300px !important;
-    /* overflow-y: auto;兼容ie  */
-  }
-
-  .bgcolor {
-    color: #028ac8;
-    /* text-decoration: underline; 下划线*/
-    cursor: pointer;
-  }
-
-  .new_ {
-    margin-left: 150px;
-    text-align: center;
-    color: #9ea1a6 !important;
-    background-color: #fff;
-    border: 1px solid #dedede;
-    width: 100px;
-    height: 35px;
-    line-height: 35px;
-    cursor: pointer;
-  }
-
-  .el-menu.el-menu--horizontal {
-    padding-bottom: 10px;
-    border-bottom: 1px solid #018ad2 !important;
-    /*border-bottom: 2px solid #00ccff !important;*/
-  }
-
-  .el-submenu__title {
-    text-align: center;
-    line-height: 35px !important;
-    width: 130px !important;
-    height: 35px !important;
-    padding: 0 !important;
-  }
-
-  .el-menu--horizontal > .el-menu-item .is-active {
-    border-bottom: 1px solid #fff !important;
-  }
-
-  .el-menu-item.is-active {
-    color: #fff !important;
-    text-align: center;
-    line-height: 35px;
-    min-width: 100px !important;
-    height: 35px !important;
-  }
-
-  .el-menu--horizontal > .el-menu-item {
-    margin-left: 20px;
-    text-align: center;
-    line-height: 35px;
-    min-width: 100px !important;
-    height: 35px !important;
-    border: 1px solid #dedede;
-    border: 1px solid #dedede !important;
-    text-align: center;
-  }
-
-  .el-submenu__title {
-    height: 60px;
-    line-height: 60px;
-    border-bottom: 2px solid transparent;
-    color: #fff;
-    font-size: 20px;
-    text-align: center;
-  }
-
-  .el-menu--popup {
-    min-width: 100px !important;
-  }
-
-  .new_undertak {
-    cursor: pointer;
-    color: #909399;
-    font-size: 14px;
-    width: 100%;
-    padding: 5px 0;
-    border-bottom: 1px solid #909399;
-    text-align: center;
-  }
-
-  .new_undertak:hover {
-    color: #000;
-  }
-</style>
-<!--<style>-->
-<!--  .el-menu-item {-->
-<!--    text-align: left;-->
-<!--  }-->
-<!--</style>-->
+</style>
diff --git a/demo-web-ui/src/views/workflow/definition/definition.vue b/demo-web-ui/src/views/workflow/definition/definition.vue
index 7075a90..7445342 100644
--- a/demo-web-ui/src/views/workflow/definition/definition.vue
+++ b/demo-web-ui/src/views/workflow/definition/definition.vue
@@ -1,77 +1,33 @@
 <template>
-  <el-tabs
-    class="my-tabs"
-    v-model="activeName"
-    type="card"
-    @tab-click="handleClick"
-  >
+  <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
     <el-tab-pane label="学生信息" name="roleList">
       <div class="container">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column
-            label="序号"
-            width="70px"
-            type="index"
-            align="center"
-          >
+          <el-table-column label="序号" width="70px" type="index" align="center">
           </el-table-column>
           <el-table-column label="操作" width="150px" align="center">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="editRow(scope.row)">
                 修改
               </el-button>
-              <el-button
-                type="danger"
-                size="mini"
-                @click.native.prevent="deleteRow(scope.row)"
-              >
+              <el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
                 删除
               </el-button>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="name"
-            label="学生姓名"
-            width="100px"
-            align="center"
-          >
+          <el-table-column prop="name" label="学生姓名" width="100px" align="center">
           </el-table-column>
-          <el-table-column
-            prop="infoId"
-            label="学号ID"
-            align="center"
-            width="150px"
-          >
+          <el-table-column prop="infoId" label="学号ID" align="center" width="150px">
           </el-table-column>
           <el-table-column prop="sex" label="性别" align="center" width="70px">
           </el-table-column>
-          <el-table-column
-            prop="calss"
-            label="所属班级"
-            align="center"
-            width="100px"
-          >
+          <el-table-column prop="calss" label="所属班级" align="center" width="100px">
           </el-table-column>
-          <el-table-column
-            prop="department"
-            label="系别"
-            align="center"
-            width="100px"
-          >
+          <el-table-column prop="department" label="系别" align="center" width="100px">
           </el-table-column>
-          <el-table-column
-            prop="speciality"
-            label="专业"
-            align="center"
-            width="150px"
-          >
+          <el-table-column prop="speciality" label="专业" align="center" width="150px">
           </el-table-column>
-          <el-table-column
-            prop="studyYear"
-            label="入学年份"
-            align="center"
-            width="150px"
-          >
+          <el-table-column prop="studyYear" label="入学年份" align="center" width="150px">
           </el-table-column>
           <el-table-column width="200px" label="成绩录入" align="center">
             <template>
@@ -82,18 +38,9 @@
           </el-table-column>
         </el-table>
 
-        <pagination
-          :total="page.total"
-          :page.sync="page.current"
-          :limit.sync="page.size"
-          @pagination="pagination"
-        />
+        <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination" />
         <!-- 编辑角色信息 -->
-        <el-dialog
-          :title="dialogTitle + '角色信息'"
-          :visible.sync="editDialog"
-          width="40%"
-        >
+        <el-dialog :title="dialogTitle + '角色信息'" :visible.sync="editDialog" width="40%">
           <table class="e-table" cellspacing="0">
             <tr>
               <td>学生姓名</td>
@@ -122,29 +69,20 @@
             <tr>
               <td>系别</td>
               <td>
-                <el-input
-                  v-model="form.department"
-                  style="width: 300px"
-                ></el-input>
+                <el-input v-model="form.department" style="width: 300px"></el-input>
               </td>
             </tr>
             <tr>
               <td>专业</td>
               <td>
-                <el-input
-                  v-model="form.speciality"
-                  style="width: 300px"
-                ></el-input>
+                <el-input v-model="form.speciality" style="width: 300px"></el-input>
               </td>
             </tr>
 
             <tr>
               <td>入学年份</td>
               <td>
-                <el-input
-                  v-model="form.studyYear"
-                  style="width: 300px"
-                ></el-input>
+                <el-input v-model="form.studyYear" style="width: 300px"></el-input>
               </td>
             </tr>
           </table>
@@ -209,46 +147,30 @@
       <!--</div>-->
     </el-tab-pane>
     <!-- 学生成绩录入 -->
-    <el-dialog
-      :title="dialogTitle + '学生成绩'"
-      :visible.sync="entry"
-      width="40%"
-    >
+    <el-dialog :title="dialogTitle + '学生成绩'" :visible.sync="entry" width="40%">
       <table class="e-table" cellspacing="0">
         <tr>
           <td>学号ID</td>
           <td>
-            <el-input
-              v-model="student.studentNo"
-              style="width: 300px"
-            ></el-input>
+            <el-input v-model="student.studentNo" style="width: 300px"></el-input>
           </td>
         </tr>
         <tr>
           <td>四级(分)</td>
           <td>
-            <el-input
-              v-model="student.fourScore"
-              style="width: 300px"
-            ></el-input>
+            <el-input v-model="student.fourScore" style="width: 300px"></el-input>
           </td>
         </tr>
         <tr>
           <td>六级(分)</td>
           <td>
-            <el-input
-              v-model="student.sixScore"
-              style="width: 300px"
-            ></el-input>
+            <el-input v-model="student.sixScore" style="width: 300px"></el-input>
           </td>
         </tr>
         <tr>
           <td>计算机(分)</td>
           <td>
-            <el-input
-              v-model="student.computerScore"
-              style="width: 300px"
-            ></el-input>
+            <el-input v-model="student.computerScore" style="width: 300px"></el-input>
           </td>
         </tr>
         <tr>
@@ -288,152 +210,154 @@
 </template>
 
 <script>
-import {
-  pageList,
-  saveSourcesInfo,
-  putSourcesInfo,
-  delSources,
-  addStudentScore
-} from "@/api/system/sources/index.js";
+  import {
+    pageList,
+    saveSourcesInfo,
+    putSourcesInfo,
+    delSources,
+    addStudentScore
+  } from "@/api/system/sources/index.js";
 
-export default {
-  data() {
-    return {
-      activeName: "roleList",
-      dialogTitle: "",
-      editDialog: false,
-      entry: false,
-      form: {},
-      student: {},
-      type: "xs",
-      jiuye:'已就业',
-      formBackup: Object.assign({}, this.form),
-      page: {
-        total: 0, // 默认数据总数
-        current: 1, // 默认开始页面
-        size: 10, // 每页的数据条数
-        params: {
-          psid: "",
-          sourceId: "",
-          sourceName: "",
-        },
-      },
-      tableData: [],
-      zylb: [],
-      sourceList: [],
-    };
-  },
-  mounted() {
-    this.getPageList(this.page);
-    //    getsourceList().then(res => {
-    //      this.sourceList = res.data
-    //    })
-    //    getZzylb().then(res => {
-    //      this.zylb = res.data
-    //    })
-  },
-  methods: {
-    pagination(val) {
-      // 分页
-      this.page.current = val.pageNum;
-      this.page.size = val.pageSize;
-      this.getPageList(this.page);
-    },
-    resetSearch() {
-      // 重置
-      this.page = {
-        total: 0, // 默认数据总数
-        current: 1, // 默认开始页面
-        size: 10, // 每页的数据条数
-        params: {
-          name: "",
-          psid: "",
-          sourceId: "",
-          sourceName: "",
+  export default {
+    data() {
+      return {
+        activeName: "roleList",
+        dialogTitle: "",
+        editDialog: false,
+        entry: false,
+        form: {},
+        student: {},
+        type: "xs",
+        jiuye: '已就业',
+        formBackup: Object.assign({}, this.form),
+        page: {
+          total: 0, // 默认数据总数
+          current: 1, // 默认开始页面
+          size: 10, // 每页的数据条数
+          params: {
+            psid: "",
+            sourceId: "",
+            sourceName: "",
+          },
         },
+        tableData: [],
+        zylb: [],
+        sourceList: [],
       };
-      this.getPageList();
     },
-    getPageList() {
-      // 获取列表
-      pageList(this.type).then((res) => {
-        this.tableData = res.data;
-        this.page.total = res.data.total;
-      });
+    mounted() {
+      this.getPageList(this.page);
+      //    getsourceList().then(res => {
+      //      this.sourceList = res.data
+      //    })
+      //    getZzylb().then(res => {
+      //      this.zylb = res.data
+      //    })
     },
-    handleClick(tab, event) {
-      if (tab.name == "addrole") {
-        this.dialogTitle = "新增";
-        this.roleForm = Object.assign({}, this.formBackup);
-      } else {
+    methods: {
+      pagination(val) {
+        // 分页
+        this.page.current = val.pageNum;
+        this.page.size = val.pageSize;
+        this.getPageList(this.page);
+      },
+      resetSearch() {
+        // 重置
+        this.page = {
+          total: 0, // 默认数据总数
+          current: 1, // 默认开始页面
+          size: 10, // 每页的数据条数
+          params: {
+            name: "",
+            psid: "",
+            sourceId: "",
+            sourceName: "",
+          },
+        };
         this.getPageList();
-      }
-    },
-    save() {
-      if (this.form.sid) {
-        putSourcesInfo(this.form).then((res) => {
-          this.editDialog = false;
-          this.getPageList(this.page);
-          this.$message({
-            message: res.msg,
-            type: "success",
-          });
+      },
+      getPageList() {
+        // 获取列表
+        pageList(this.type).then((res) => {
+          this.tableData = res.data;
+          this.page.total = res.data.total;
         });
-      } else {
-        saveSourcesInfo(this.form).then((res) => {
+      },
+      handleClick(tab, event) {
+        if (tab.name == "addrole") {
+          this.dialogTitle = "新增";
+          this.roleForm = Object.assign({}, this.formBackup);
+        } else {
           this.getPageList();
-          this.activeName = "roleList";
-          this.$message({
-            message: res.msg,
-            type: "success",
+        }
+      },
+      save() {
+        if (this.form.sid) {
+          putSourcesInfo(this.form).then((res) => {
+            this.editDialog = false;
+            this.getPageList(this.page);
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
           });
-        });
-      }
-      this.reset();
-    },
-    save1() {
-      this.entry = false;
+        } else {
+          saveSourcesInfo(this.form).then((res) => {
+            this.getPageList();
+            this.activeName = "roleList";
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+          });
+        }
+        this.reset();
+      },
+      save1() {
+        this.entry = false;
         console.log(this.student);
-        addStudentScore(this.student).then((res)=>{
+        addStudentScore(this.student).then((res) => {
           console.log(res);
         })
-    },
-    reset() {
-      this.form = {};
-    },
-    editRow(row) {
-      this.dialogTitle = "编辑";
-      this.editDialog = true;
-      this.form = Object.assign({}, row);
-      // getSourcesInfo({sid: row.sid}).then(res => {
-      //   this.form = res.data
-      // })
-    },
-    chengji() {
-      this.dialogTitle = "录入";
-      this.entry = true;
-    },
-    deleteRow(row) {
-      this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        delSources({ sid: row.sid }).then((res) => {
-          this.getPageList();
-          this.$message({
-            type: "success",
-            message: "删除成功!",
+      },
+      reset() {
+        this.form = {};
+      },
+      editRow(row) {
+        this.dialogTitle = "编辑";
+        this.editDialog = true;
+        this.form = Object.assign({}, row);
+        // getSourcesInfo({sid: row.sid}).then(res => {
+        //   this.form = res.data
+        // })
+      },
+      chengji() {
+        this.dialogTitle = "录入";
+        this.entry = true;
+      },
+      deleteRow(row) {
+        this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          delSources({
+            sid: row.sid
+          }).then((res) => {
+            this.getPageList();
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
           });
         });
-      });
+      },
     },
-  },
-};
+  };
 </script>
 
 <style scoped="scoped" lang="scss">
-.my-tabs {
-  margin-top: 10px;
-}
-</style>
+  .my-tabs {
+    margin-top: 10px;
+  }
+</style>
\ No newline at end of file