From b92aab2d41ba17fc274060ecc6246e55148622cf Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 4 May 2023 14:18:00 +0800
Subject: [PATCH] 11111111111

---
 demo-web-ui/.env.development                  |   6 +-
 .../src/api/system/datamapping/datamapping.js |  15 +-
 demo-web-ui/src/api/system/region/region.js   |  11 +
 demo-web-ui/src/router/index.js               |  51 +--
 .../src/views/datamapping/shujuyingshe.vue    | 364 ++++++------------
 .../organizationManageInfo.vue                |   5 +-
 demo-web-ui/src/views/region/region.vue       |  20 +-
 7 files changed, 193 insertions(+), 279 deletions(-)

diff --git a/demo-web-ui/.env.development b/demo-web-ui/.env.development
index 71fa840..bf4ed3f 100644
--- a/demo-web-ui/.env.development
+++ b/demo-web-ui/.env.development
@@ -5,7 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-##VUE_APP_URL = "http://26077a35f5.wicp.vip"
-## VUE_APP_URL = "http://anrui.yyundong.com"
-##VUE_APP_URL = "http://1mn7264414.qicp.vip"
-VUE_APP_URL = "http://39.104.100.138:9112"
+##VUE_APP_URL = "http://39.104.100.138:9112"
+VUE_APP_URL = "http://192.168.3.183:9112"
diff --git a/demo-web-ui/src/api/system/datamapping/datamapping.js b/demo-web-ui/src/api/system/datamapping/datamapping.js
index aa8e59e..42a86e1 100644
--- a/demo-web-ui/src/api/system/datamapping/datamapping.js
+++ b/demo-web-ui/src/api/system/datamapping/datamapping.js
@@ -6,5 +6,18 @@ export function listPage(data) {
     method: 'post',
     data: data,
     headers: { 'Content-Type': 'application/json' }
-  })
+  })
+  
 }
+
+// 自主学习计划指导
+
+export function selectSysPlanStudent(data) {
+  return request({
+    url: '/v1/sysPlan/selectSysPlanStudent',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+  
+}
\ 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 4bf541e..b0b81ee 100644
--- a/demo-web-ui/src/api/system/region/region.js
+++ b/demo-web-ui/src/api/system/region/region.js
@@ -128,6 +128,17 @@ export default {
     })
   },
 
+ //提交数据
+  upSysPlan: function(data) {
+   return request({
+     url: 'v1/sysPlan/upSysPlan',
+     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 65771fd..f2a8f95 100644
--- a/demo-web-ui/src/router/index.js
+++ b/demo-web-ui/src/router/index.js
@@ -7,8 +7,7 @@ Vue.use(Router)
 
 /* 所有角色可以访问/没有权限要求的基页 */
 
-export const constantRoutes = [
-  {
+export const constantRoutes = [{
     path: '/redirect',
     component: Layout,
     hidden: true,
@@ -33,8 +32,7 @@ export const constantRoutes = [
     path: '/index',
     component: Layout,
     redirect: '/index',
-    children: [
-      {
+    children: [{
         path: '/index',
         component: () =>
           import('@/views/index.vue'),
@@ -56,7 +54,7 @@ export const constantRoutes = [
         path: '/region',
         component: () =>
           import('@/views/region/region.vue'),
-            name: 'region',
+        name: 'region',
         meta: {
           title: '自主学习计划管理'
         }
@@ -117,7 +115,7 @@ export const constantRoutes = [
       {
         path: '/personalization',
         component: () => import('@/views/personalization/personalization.vue'),
-          name: 'personalization',
+        name: 'personalization',
         meta: {
           title: '公告管理'
         }
@@ -125,7 +123,7 @@ export const constantRoutes = [
       {
         path: '/copyofprocess',
         component: () => import('@/views/copyofprocess/liuchengchasongguanli.vue'),
-           name: 'liuchengchasongguanli',
+        name: 'liuchengchasongguanli',
         meta: {
           title: '论坛管理'
         }
@@ -156,15 +154,18 @@ export const constantRoutes = [
         path: '/organizationManage',
         component: () =>
           import('@/views/organizationManage/organizationManage.vue'),
-             name: 'organizationManage',
+        name: 'organizationManage',
         meta: {
           title: '论坛交流'
         }
       },
       {
         path: '/datamapping',
-        component: () => import('@/views/datamapping/shujuyingshe.vue'),
-        meta: { title: '自主学习计划制定指导' }
+        component: () => import('@/views/datamapping/shujuyingshe.vue'),
+         name: 'shujuyingshe',
+        meta: {
+          title: '自主学习计划制定指导'
+        }
       },
       {
         path: '/organizationManage',
@@ -207,7 +208,8 @@ export const constantRoutes = [
     redirect: '/RoleAdminister',
     children: [{
       path: '/RoleAdminister',
-      component: () => import('@/views/RoleAdminister/RoleAdminister.vue'), name: 'RoleAdminister',
+      component: () => import('@/views/RoleAdminister/RoleAdminister.vue'),
+      name: 'RoleAdminister',
       meta: {
         title: '角色管理'
       }
@@ -363,8 +365,7 @@ export const constantRoutes = [
     meta: {
       title: '用户管理'
     },
-    children: [
-      {
+    children: [{
         path: '/workflow/definition',
         component: () =>
           import('@/views/workflow/definition/definition.vue'),
@@ -392,7 +393,10 @@ export const constantRoutes = [
       path: '/datamapping',
       component: () => import('@/views/datamapping/shujuyingshe.vue'),
       name: 'shujuyingshe',
-      meta: { title: '数据映射', noCache: true }
+      meta: {
+        title: '数据映射',
+        noCache: true
+      }
     }]
   },
   // {
@@ -450,12 +454,13 @@ export const constantRoutes = [
     path: '/flow/flowRecordForBusiness',
     component: () => import('@/views/flow/flowRecordForBusiness'),
     name: 'flowRecordForBusiness'
-  }/*,
-  {
-    path: '/portal/flow/flowRecord',
-    component: ()=> import('@/views/flow/flowRecord'),
-    name: 'flowRecord'
-  }*/
+  }
+  /*,
+    {
+      path: '/portal/flow/flowRecord',
+      component: ()=> import('@/views/flow/flowRecord'),
+      name: 'flowRecord'
+    }*/
   // 404 page must be placed at the end !!!
   // { path: '*', redirect: '/404', hidden: true }
 ]
@@ -464,7 +469,9 @@ export const constantRoutes = [
 
 const createRouter = () => new Router({
   // mode: 'history', // require service support
-  scrollBehavior: () => ({ y: 0 }),
+  scrollBehavior: () => ({
+    y: 0
+  }),
   routes: constantRoutes
 })
 
@@ -476,4 +483,4 @@ export function resetRouter() {
   router.matcher = newRouter.matcher // reset router
 }
 
-export default router
+export default router
diff --git a/demo-web-ui/src/views/datamapping/shujuyingshe.vue b/demo-web-ui/src/views/datamapping/shujuyingshe.vue
index 0a419a0..c78e2ef 100644
--- a/demo-web-ui/src/views/datamapping/shujuyingshe.vue
+++ b/demo-web-ui/src/views/datamapping/shujuyingshe.vue
@@ -1,261 +1,135 @@
 <template>
   <div class="app-container">
-    <!-- Start 列表页面 -->
-    <div>
-      <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" class="tab-header" label-width="150px">
-              <el-form-item label="数据字典类别编码:">
-                <el-input v-model="listQuery.params.dictTypeCode" clearable placeholder=""/>
-              </el-form-item>
-              <el-form-item label="数据字典类别名称:">
-                <el-input v-model="listQuery.params.dictTypeName" clearable placeholder=""/>
-              </el-form-item>
-              <el-form-item label="数据key:">
-                <el-input v-model="listQuery.params.dictKey" clearable placeholder=""/>
-              </el-form-item>
-              <el-form-item label="数据value:">
-                <el-input v-model="listQuery.params.dictValue" clearable placeholder=""/>
-              </el-form-item>
-              <el-form-item label="映射来源:">
-                <el-select v-model="listQuery.params.map_sourceKey" filterable placeholder="">
-                  <el-option v-for="item in mappingsource_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="映射实体名称:">
-                <el-input v-model="listQuery.params.map_object" clearable placeholder=""/>
-              </el-form-item>
-              <el-form-item label="映射项目类别:">
-                <el-input v-model="listQuery.params.map_item" clearable placeholder=""/>
-              </el-form-item>
-              <el-form-item label="映射项目编码:">
-                <el-input v-model="listQuery.params.map_itemKey" clearable placeholder=""/>
-              </el-form-item>
-              <el-form-item label="映射项目值:">
-                <el-input v-model="listQuery.params.map_itemValue" clearable placeholder=""/>
-              </el-form-item>
-            </el-form>
-            <div class="btn" style="text-align: center;">
-              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
-              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
-            </div>
+    <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="100px" align="center">
+                <template slot-scope="scope">
+                  <el-button  type="primary" size="mini" @click="editRow(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="stateChinese" label="数据状态" align="center" />
+              <el-table-column prop="plan0pinion" label="反馈意见" align="center" />
+            </el-table>
           </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 fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="数据字典类别编码" width="200" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.dictTypeCode }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="数据字典类别名称" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.dictTypeName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="数据key" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.dictKey }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="数据value" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.dictValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="映射来源" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.map_sourceValue }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="映射实体名称" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.map_object }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="映射项目类别" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.map_item }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="映射项目编码" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.map_itemKey }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="映射项目值" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.map_itemValue }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div class="pages">
-          <!-- 翻页 -->
-          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-        </div>
-      </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.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>
+            <tr>
+              <td>反馈意见</td>
+              <td>
+                <!-- <span>{{form.planContent}}</span> -->
+                <el-input v-model="form.planOpinion" 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>
     </div>
+    <!-- <organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" /> -->
   </div>
 </template>
 
 <script>
-import Pagination from '@/components/pagination'
-import pageye from '@/components/pagination/pageye'
-import ButtonBar from '@/components/ButtonBar'
-import { listPage } from '@/api/system/datamapping/datamapping'
-import { typeValues } from '@/api/system/roleAdminister'
-
-export default {
-  name: 'shujuyingshe',
-  components: {
-    Pagination,
-    pageye,
-    ButtonBar,
-  },
-  data() {
-    return {
-      btndisabled: false,
-      btnList: [
-        {
-          type: 'info',
-          size: 'small',
-          icon: 'cross',
-          btnKey: 'doClose',
-          btnLabel: '关闭'
-        }
-      ],
-      isSearchShow: false,
-      searchxianshitit: '显示查询条件',
-      // 查询条件 -----------
-      tableKey: 0,
-      list: [],
-      mappingsource_list: [],
-      FormLoading: false,
-      listLoading: false,
-      listQuery: {
-        params: {
-          map_sourceKey: '',
-          map_sourceValue: '',
-          map_object: '',
-          map_item: '',
-          map_itemKey: '',
-          map_itemValue: '',
-          dictTypeCode: '',
-          dictTypeName: '',
-          dictKey: '',
-          dictValue: ''
-        },
-        current: 1,
-        size: 5,
-        total: 0
-      },
-      rules: {}
-    }
-  },
-  created() {
-    // 加载列表
-    this.getList()
-    this.init()
-  },
-  mounted() {
-    this.$refs['btnbar'].setButtonList(this.btnList)
-  },
-  methods: {
-    init() {
-      typeValues({ type: 'sys_mappingsource' }).then((resp) => {
-        if (resp.success) {
-          this.mappingsource_list = resp.data
-        }
-      })
-    },
-    // 搜索条件效果
-    clicksearchShow() {
-      this.isSearchShow = !this.isSearchShow
-      if (this.isSearchShow) {
-        this.searchxianshitit = '隐藏查询条件'
-      } else {
-        this.searchxianshitit = '显示查询条件'
-      }
+  import {
+    selectSysPlanStudent,
+  } from "@/api/system/datamapping/datamapping.js";
+  // import organizationManageInfo from './organizationManageInfo.vue'
+  export default {
+    components: {
+      // organizationManageInfo,
     },
-    btnHandle(btnKey) {
-      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
-      switch (btnKey) {
-        case 'doClose':
-          this.doClose()
-          break
-        default:
-          break
+    data() {
+      return {
+        viewState: 1,
+        activeName: "roleList",
+        dialogTitle: "",
+        editDialog: false,
+        form: {},
+        formBackup: Object.assign({}, this.form),
+        tableData: [],
       }
     },
-    // 序号
-    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
-      listPage(this.listQuery).then((response) => {
-        console.log('列表查询结果：', response)
-        this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
-          this.list = response.data.records
-          this.listQuery.total = response.data.total
+    methods: {
+      getPageList() {
+        // 获取列表
+        selectSysPlanStudent().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 = {
-        params: {
-          map_sourceKey: '',
-          map_sourceValue: '',
-          map_object: '',
-          map_item: '',
-          map_itemKey: '',
-          map_itemValue: '',
-          dictTypeCode: '',
-          dictTypeName: '',
-          dictKey: '',
-          dictValue: ''
-        },
-        current: 1,
-        size: 5,
-        total: 0
-      }
-      this.getList()
-    },
-    doClose() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.go(-1)
+      },
+      save() {
+        console.log("form", this.form)
+
+
+          this.reset();
+      },
+      reset() {
+        this.form = {};
+      },
+      editRow(row) {
+        this.dialogTitle = "反馈";
+        this.editDialog = true;
+        this.form = Object.assign({}, row);
+      },
     }
-  }
-}
+  };
 </script>
-<style scoped>
-/*表格列设置fixed后固定列出现下边框的设置*/
-/deep/ .el-table__fixed {
-  height: 100% !important;
-}
-/*表格列设置fixed后固定列出现下边框的设置*/
-/deep/ .el-table__fixed-right {
-  height: 100% !important;
-}
-</style>
+
+<style scoped="scoped" lang="scss">
+  .my-tabs {
+    margin-top: 10px;
+  }
+</style>
diff --git a/demo-web-ui/src/views/organizationManage/organizationManageInfo.vue b/demo-web-ui/src/views/organizationManage/organizationManageInfo.vue
index 7f3b3aa..9eec204 100644
--- a/demo-web-ui/src/views/organizationManage/organizationManageInfo.vue
+++ b/demo-web-ui/src/views/organizationManage/organizationManageInfo.vue
@@ -60,7 +60,7 @@
               <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>
+                <el-button  :disabled='userSid != scope.row.createBySid' type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column label="评论人员" prop="name" align="center" />
@@ -88,11 +88,10 @@
         activeNames: ['1'],
         form: {},
         temp: [] ,// 添加和修改
-        userSid :""
+        userSid :window.sessionStorage.getItem('userSid')
       };
     },
     mounted() {
-      this.userSid = window.sessionStorage.getItem('userSid')
        console.log("ddddddddddddddd", this.userSid )
     },
     methods: {
diff --git a/demo-web-ui/src/views/region/region.vue b/demo-web-ui/src/views/region/region.vue
index 103088b..2f7a678 100644
--- a/demo-web-ui/src/views/region/region.vue
+++ b/demo-web-ui/src/views/region/region.vue
@@ -9,10 +9,10 @@
               </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 :disabled=' scope.row.state!= 0' type="primary" size="mini" @click="editRow(scope.row)">
                     编辑
                   </el-button>
-                  <el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
+                  <el-button :disabled=' scope.row.state!= 0' type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
                     删除
                   </el-button>
                   <!-- <el-button type="primary" size="mini" @click="detail(scope.row)">
@@ -23,7 +23,7 @@
               <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="stateChinese" label="数据状态" align="center" />
               <el-table-column prop="plan0pinion" label="反馈意见" align="center" />
             </el-table>
           </div>
@@ -89,7 +89,8 @@
             </tr>
           </table>
           <div style="margin-top: 20px; text-align: center">
-            <el-button type="primary" @click="save()">保存</el-button>
+            <el-button type="primary" @click="save()">保存</el-button>
+            <el-button type="primary" @click="submit()">提交</el-button>
           </div>
         </el-dialog>
       </el-tabs>
@@ -158,6 +159,17 @@
         }
           this.reset();
       },
+      submit(){
+        req.upSysPlan(this.form).then((res) => {
+            this.getPageList();
+             this.editDialog = false;
+            this.$message({
+              message: res.msg,
+              type: "success",
+            });
+          });
+          this.reset();
+      },
       reset() {
         this.form = {};
       },