Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

.env.development

@@ -7,7 +7,7 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.3.4:9000'
 VUE_APP_BASE_API = 'http://192.168.3.6:9000'
 VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile'
+VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile'
 # VUE_APP_VOICE_API = 'http://192.168.8.110:9008'
 
 

.env.heb

@@ -5,4 +5,4 @@ VUE_APP_PRO = 'local'
 # base api
 VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
 VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile'
+VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile'

.env.ntyl

@@ -5,4 +5,4 @@ VUE_APP_PRO = 'ntyl'
 # base api
 VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
 VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile'
+VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile'

.env.production

@@ -4,4 +4,4 @@ NODE_ENV = 'production'
 # base api
 VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
 VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile'
+VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile'

.env.staging

@@ -4,4 +4,4 @@ NODE_ENV = 'test'
 # base api
 VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
 VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
-VUE_APP_UPLOAD_API = 'https://oss.joylink.club/jlfile'
+VUE_APP_UPLOAD_API = 'https://upload.joylink.club/jlfile'

src/api/iscs.js

@@ -15,3 +15,29 @@ export function getIscsData(params) {
         params
     });
 }
+
+// 分页获取ISCS数据
+export function getIscsDataByPage(params) {
+    return request({
+        url: '/api/v1/iscs/pagedQuery',
+        method: 'get',
+        params
+    });
+}
+
+// 复制iscs数据
+export function copyIscsData(data) {
+    return request({
+        url: '/api/v1/iscs/copy',
+        method: 'post',
+        data
+    });
+}
+
+// 删除iscs数据绘图数据(发布的)
+export function deleteIscs(id) {
+    return request({
+        url: `/api/v1/iscs/${id}`,
+        method: 'delete'
+    });
+}

src/i18n/langs/en/router.js

@@ -88,5 +88,6 @@ export default {
     questionsRuleManage: 'Question rule  manage',
     preTheoryData: 'Pre Theory Data',
     boardManage: 'Message Board Manage',
-    publishIBPManage:'publish IBP Manage'
+    publishIBPManage:'publish IBP Manage',
+    publishISCSManage:'publish ISCS Manage'
 };

src/i18n/langs/zh/router.js

@@ -93,5 +93,6 @@ export default {
     questionsRuleManage: '出题规则管理',
     preTheoryData: '理论导入预处理',
     boardManage: '留言板管理',
-    publishIBPManage:'发布IBP盘管理'
+    publishIBPManage:'发布IBP盘管理',
+    publishISCSManage:'发布ISCS管理'
 };

src/jmapNew/config/skinCode/chengdu_01.js

@@ -234,6 +234,7 @@ class SkinCode extends defaultStyle {
             // 站台紧急关闭
             emergentRhombus:{
                 z:1,
+                flicker: true, // 闪烁
                 mergentR: 4,										// 站台紧急关闭半径
                 mergentN: 4, 										// 站台紧急关闭边数
                 insideOffset: { x: 0, y: 25 }, 				// 内站台紧急关闭偏移量

src/jmapNew/config/skinCode/chengdu_03.js

@@ -264,8 +264,8 @@ class SkinCode extends defaultStyle {
                 flicker: true, // 闪烁
                 mergentR: 5,										// 站台紧急关闭半径
                 mergentN: 4, 										// 站台紧急关闭边数
-                insideOffset: { x: 0, y: 30 }, 				// 内站台紧急关闭偏移量
+                insideOffset: { x: 0, y: -30 }, 				// 内站台紧急关闭偏移量
-                outsideOffset: { x: 0, y: -30}, 			// 外站台紧急关闭偏移量
+                outsideOffset: { x: 0, y: 30}, 			// 外站台紧急关闭偏移量
                 closeColor: '#F61107' 							// 站台紧急关闭颜色
             },
             // 扣车元素 普通扣车

src/jmapNew/shape/StationStand/emergent/EEmergentRhombus.js

@@ -57,10 +57,9 @@ class EEmergentRhombus extends Group {
         this.create();
         this.emergent.show();
         if (this.model.style.StationStand.emergentRhombus.flicker) {
-            this.emergent.getElement().animateStyle(true)
+            this.emergent.animateStyle(true)
-                .when(0, { fill: this.style.backgroundColor })
+                .when(0, { fill: this.model.style.backgroundColor })
-                .when(1000, { fill: this.style.StationStand.emergentRhombus.closeColor })
+                .when(1000, { fill: this.model.style.StationStand.emergentRhombus.closeColor })
-                .when(2000, { fill: this.style.backgroundColor })
                 .start();
         }
     }

src/router/index_Common.js

@@ -108,6 +108,7 @@ const RunplanView = () => import('@/views/publish/runPlanEveryDay/runPlanView');
 const PublishExamRule = () => import('@/views/publish/examRule/index');
 const PublishExamRuleDraft = () => import('@/views/publish/examRule/draft/index');
 const PublishIBP = () => import('@/views/publish/publishIBP/index');
+const PublishISCS = () => import('@/views/publish/publishISCS/index');
 
 const TrainingPlatform = () => import('@/views/trainingPlatform/index');
 
@@ -673,6 +674,13 @@ export const asyncRouter = [
                 meta: {
                     i18n: 'router.publishIBPManage'
                 }
+            },
+            { // 发布ibp盘
+                path: 'iscs',
+                component: PublishISCS,
+                meta: {
+                    i18n: 'router.publishISCSManage'
+                }
             }
         ]
     },

src/views/iscs/iscsSystem/config/canvas/iscsCanvas.vue

@@ -80,7 +80,8 @@ export default {
     methods: {
         async getDetail(mode, system, part) {
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId:this.$route.query.mapId,
                 totalSystem: mode,
                 system: system,
                 userInterface : part

src/views/iscs/iscsSystem/index.vue

@@ -8,7 +8,8 @@
         <router-view />
       </div>
     </div>
-    <div v-if="lineCode=='02'" style="height:100%">
+    <!-- if="lineCode=='02'" -->
+    <div v-else style="height:100%">
       <station-nav v-if="$route.query.group" />
       <div class="content-box-station iscs_content_box" :class="{'displayStationIscs': $route.query.group}">
         <router-view />

src/views/iscs/iscsSystem/stationConfig/environment/index.vue

@@ -144,7 +144,8 @@ export default {
         },
         getDetail() {
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
                 system: this.system,
                 totalSystem :'environment02',
                 userInterface : this.mode

src/views/iscs/iscsSystem/stationConfig/powerMonitor/substation.vue

@@ -51,7 +51,8 @@ export default {
     methods:{
         getInitData() {
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
                 system: 'powerMonitoring',
                 totalSystem :'powerMonitoring02'
             };

src/views/iscs/iscsSystem/stationConfig/psdSystem/index.vue

@@ -37,7 +37,8 @@ export default {
     },
     mounted() {
         const params = {
-            lineCode: this.$route.query.lineCode,
+            // lineCode: this.$route.query.lineCode,
+            mapId: this.$route.query.mapId,
             totalSystem: 'psdSystem02',
             system: 'psdSystem',
             userInterface: 'psdOne'

src/views/iscs/iscsSystem/stationNav.vue

@@ -328,10 +328,18 @@ export default {
             this.stationList = [];
             res.data.forEach(station => {
                 if (!station.depot && station.visible) {
-                    const param = {
+                    let param = {};
+                    if (station.runPlanName.includes('站')) {
+                        param = {
+                            name: station.runPlanName,
+                            id: station.code
+                        };
+                    } else {
+                        param = {
                             name: station.runPlanName + '站',
                             id: station.code
                         };
+                    }
                     this.stationList.push(param);
                 }
             });

src/views/iscsSystem/index.vue

@@ -115,7 +115,8 @@ export default {
             });
             Vue.prototype.$iscs = this.$iscs;
             const params = {
-                lineCode: this.$route.query.lineCode,
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
                 totalSystem: mode,
                 system: system,
                 userInterface: part

src/views/publish/publishISCS/index.vue

@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <el-dialog title="复制iscs数据" :visible.sync="dialogVisible" width="400px" center>
+      <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+      <span slot="footer" class="dialog-footer">
+        <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+        <el-button @click="close">{{ $t('global.cancel') }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getIscsDataByPage, copyIscsData, deleteIscs} from '@/api/iscs';
+import {getPublishMapListOnline } from '@/api/jmap/map';
+export default {
+    name: 'PublishISCS',
+    data() {
+        return {
+            mapListMap:{},
+            mapList:[],
+            dialogVisible:false,
+            loading:false,
+            formModel:{
+                fromId: '',
+                toMapId: ''
+            },
+            rules: {
+                toMapId: [
+                    { required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
+                ]
+            },
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '80px',
+                reset: true,
+                queryObject: {
+                    mapId: {
+                        type: 'select',
+                        label: '地图名称',
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+
+            },
+            queryList: {
+                query: getIscsDataByPage,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '所属地图',
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.covertMap(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: '父系统',
+                        prop: 'totalSystem'
+                    },
+                    {
+                        title: '子系统',
+                        prop: 'system'
+                    },
+                    {
+                        title: '子图',
+                        prop: 'userInterface'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '300',
+                        buttons: [
+                            {
+                                name: this.$t('publish.copy'),
+                                handleClick: this.handleCopy
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger',
+                                showControl: () => { return this.isShow != -1; }
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        isShow() {
+            return this.$store.getters['roles'].indexOf('05');
+        },
+        form() {
+            return {
+                labelWidth: '100px',
+                items: [
+                    { prop: 'fromId', label: '数据来源', type: 'select', required: true, options: this.mapList, disabled:true},
+                    { prop: 'toMapId', label: '复制到', type: 'select', required: true, options: this.covertData()}
+                ]
+            };
+        }
+    },
+    created() {
+        this.loadInitData();
+    },
+    methods:{
+        async loadInitData() {
+            const res = await getPublishMapListOnline();
+            res.data.forEach(elem=>{
+                this.mapList.push({label:elem.name, value:parseInt(elem.id)});
+                this.queryForm.queryObject.mapId.config.data.push({label:elem.name, value:elem.id});
+                this.mapListMap[elem.id] = elem.name;
+            });
+        },
+        covertData() {
+            return this.mapList.filter(data=>{ return data.value != this.formModel.fromId; });
+        },
+        covertMap(row) {
+            if (row.mapId) {
+                return this.mapListMap[row.mapId];
+            } else {
+                return '';
+            }
+        },
+        handleDelete(index, row) {
+            this.$confirm('此操作将删除iscs数据，是否继续?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteIscs(row.id).then(res=>{
+                    this.$message.success(this.$t('publish.deleteSuccess'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        reloadTable() {
+            this.queryList.reload();
+        },
+        handleCopy(index, row) {
+            this.formModel.fromId = row.mapId;
+            this.$nextTick(()=>{
+                this.dialogVisible = true;
+            });
+
+        },
+        doSave() {
+            this.$refs.dataform.validateForm(() => {
+                copyIscsData(this.formModel).then(res=>{
+                    this.$message.success('复制ISCS数据成功');
+                    this.close();
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox('复制ISCS数据失败');
+                });
+            });
+        },
+        close() {
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>