Bug54：苏电院交控仿真线路切换到车站一显示调整成员角色失败& 浙大网新部分实训调整

src/api/company.js

@@ -143,3 +143,32 @@ export function addPositionInfo(data) {
     });
 }
 /** 查询部门信息 */
+export function getDeptInfo(deptId) {
+    return request({
+        url: `/api/company/dept/${deptId}`,
+        method: 'get'
+    });
+}
+/** 更新部门信息 */
+export function updateDeptInfo(deptId, data) {
+    return request({
+        url: `/api/company/dept/${deptId}`,
+        method: 'put',
+        data
+    });
+}
+/** 添加部门信息 */
+export function addDeptInfo(data) {
+    return request({
+        url: `/api/company/dept`,
+        method: 'post',
+        data
+    });
+}
+/** 删除部门信息 */
+export function deleteDeptInfo(deptId) {
+    return request({
+        url: `/api/company/dept/${deptId}`,
+        method: 'delete'
+    });
+}

src/jmapNew/shape/Line/index.js

@@ -49,7 +49,7 @@ export default class Line2 extends Group {
         switch (type) {
         case '01': break;
         case '02':
-            this.segment.setStyle('lineDash', this.style.lineDash || [4]);
+            this.segment && this.segment.setStyle('lineDash', this.style.lineDash || [4]);
             break;
         }
     }

src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue

@@ -98,15 +98,27 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
+            const operate = {
+                operation: OperationEvent.Section.unlock.confirm.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                operation: { code: OperationEvent.Section.unlock.menu.operation, name: '区段解锁'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '区段解锁'},
                         cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
                         param: {
                             sectionCode: this.selected.code
                         }
                     });
                     this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+
         },
         cancel() {
             const operate = {

src/jmapNew/theme/xian_02/menus/menuRequest.vue

@@ -154,7 +154,7 @@ export default {
                 } else {
                     this.$refs.noticeInfo.doShow();
                 }
-            }).catch(() => {
+            }).catch((e) => {
                 this.loading = false;
                 this.$refs.noticeInfo.doShow();
             });

src/jmapNew/theme/xian_02/menus/menuSection.vue

@@ -276,7 +276,7 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Section.lock.menu.operation, name: '区段封锁'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '区段封锁'},
                         cmdType: CMD.Section.CMD_SECTION_BLOCK,
                         param: operate.param
                     });

src/jmapNew/theme/xian_02/menus/menuSignal.vue

@@ -329,6 +329,7 @@ export default {
                 this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList});
                 this.$store.dispatch('training/updateMapState', updateDeviceList);
             }
+            console.log(step, '===11', this.selected);
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });

src/jmapNew/theme/xian_02/operationConfig.js

@@ -316,7 +316,7 @@ export default {
             productTypes: ['01', '02'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【始端/终端选择】', codeType:'START_SIGNAL' },
-                { deviceType: '04', orderNum: 2, operateCode: '301', tip: '鼠标左键选择进路名称【{3}】', val: '{4}', codeType:'END_SIGNAL' },
+                { deviceType: '04', orderNum: 2, operateCode: '301', tip: '鼠标左键选择进路【{3}】的终端信号机', val: '{4}', codeType:'END_BUTTON_SIGNAL' },
                 { deviceType: '04', orderNum: 3, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
             ]
         },

src/layout/components/Logout.vue

@@ -18,20 +18,17 @@
       </el-dropdown-item>
     </el-dropdown-menu>
     <user-info ref="userInfo" />
-    <organization ref="organization" />
   </el-dropdown>
 </template>
 
 <script>
 import userInfo from './userInfo';
-import organization from './organization';
 import { UrlConfig } from '@/scripts/ConstDic';
 
 export default {
     name: 'Logout',
     components: {
-        userInfo,
-        organization
+        userInfo
     },
     data() {
         return {
@@ -57,7 +54,7 @@ export default {
             this.$refs.userInfo.doShow();
         },
         handleOrganization() {
-            this.$refs.organization.doShow();
+            this.$router.push({ path: `/trainingPlatform/organization` });
         }
     }
 };

src/router/index_Common.js

@@ -138,6 +138,7 @@ const PreTheoryImport = () => import('@/views/competitionManage/bankList/preImpo
 const PlanScheduleWicket = () => import('@/views/newMap/displayNew/demon/planSchedule');
 const MessageBoard = () => import('@/views/messageBoard/index');
 const BoardManage = () => import('@/views/messageBoard/manage');
+const OrganizationManage = () => import('@/views/organization/index');
 
 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
@@ -596,6 +597,11 @@ export const asyncRouter = [
                         hidden: true
                     }
                 ]
+            },
+            {	// 单位组织管理
+                path: 'organization',
+                component: OrganizationManage,
+                hidden: true
             }
         ]
     },

src/views/organization/deptManage.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <div>
+      <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" />
+    </div>
+    <div>
+      <div />
+    </div>
+  </div>
+</template>
+
+<script>
+import { updateDeptInfo, getAllDeptTree } from '@/api/company';
+export default {
+    name: 'DeptManage',
+    data() {
+        return {
+            defaultProps: {
+                children: 'children',
+                label: 'label'
+            },
+            data: []
+        };
+    },
+    computed:{
+        companyId() {
+            return '';
+        }
+    },
+    mounted() {
+        getAllDeptTree(this.companyId).then((resp) => {
+            this.data = resp.data;
+        });
+    },
+    methods: {
+        handleNodeClick(data) {
+            console.log(data);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>

src/views/organization/index.vue

@@ -1,20 +1,15 @@
 <template>
-  <el-dialog
-    title="单位组织"
-    :visible.sync="dialogVisible"
-    width="30%"
-    :before-close="handleClose"
-  >
+  <div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="部门管理" name="first">部门管理</el-tab-pane>
-      <el-tab-pane label="职位管理" name="second">职位管理</el-tab-pane>
-      <el-tab-pane label="成员管理" name="third">成员管理</el-tab-pane>
+      <!--<el-tab-pane label="职位管理" name="second">职位管理</el-tab-pane>-->
+      <el-tab-pane label="成员管理" name="second">成员管理</el-tab-pane>
     </el-tabs>
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
     </span>
-  </el-dialog>
+  </div>
 </template>
 
 <script>

src/views/organization/memberManage.vue

@@ -0,0 +1,28 @@
+<template>
+  <div>
+    <el-table :data="tableData" style="width: 100%">
+      <el-table-column prop="name" label="姓名" />
+      <el-table-column prop="class" label="班级" />
+      <el-table-column prop="role" label="角色" />
+      <el-table-column label="操作" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'MemberManage',
+    data() {
+        return {
+            tableData: []
+        };
+    },
+    methods: {
+
+    }
+};
+</script>
+
+<style scoped>
+
+</style>