Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

2019-11-11 15:54:15 +08:00 · 2019-11-11 15:54:15 +08:00 · 4c0f965a47
commit 4c0f965a47
parent e8c8e491f5 6ca155617f
10 changed files with 14 additions and 36 deletions
--- a/src/i18n/langs/zh/permission.js
+++ b/src/i18n/langs/zh/permission.js
@ -12,7 +12,7 @@ export default {
    permissionTotal: '权限总数',
    permissionRemains: '剩余数量',
    isForever: '是否永久',
-    startTime: '开始时间',
+    startTime: '获得时间',
    endTime: '到期时间',
    belonger: '归属人',
    userList: '用户列表',
--- a/src/i18n/langs/zh/scriptRecord.js
+++ b/src/i18n/langs/zh/scriptRecord.js
@ -108,7 +108,7 @@ export default {
    publishScriptFailed: '发布失败',
    releaseScriptTip: '此操作将申请发布剧本, 是否继续?',
    revokeScriptTip: '此操作将撤销发布剧本申请, 是否继续?',
-    inputScriptName: '请输入剧本',
+    inputScriptName: '请输入剧本名称',
    selectMap: '请选择地图',
    inputScriptDescription: '请输入剧本描述'
 };
--- a/src/layout/components/userInfo.vue
+++ b/src/layout/components/userInfo.vue
@ -189,7 +189,6 @@ export default {
            this.visible = true;
            const token = getToken() || getDesignToken();
            getInfo(token).then(response => {
-                debugger;
                const user = response.data;
                this.userInfo = {
                    name: user.name,
--- a/src/views/components/limits/index.vue
+++ b/src/views/components/limits/index.vue
@ -8,18 +8,17 @@
      style="width: 100%; margin-top: 20px"
    >
      <el-table-column prop="index" :label="`${$t('global.index')}`" />
-      <el-table-column prop="startTime" :label="`${$t('global.startTime')}`" />
-      <el-table-column prop="endTime" :label="`${$t('global.endTime')}`" />
-      <el-table-column prop="forever" :label="`${$t('global.isForever')}`">
+      <el-table-column prop="startTime" :label="`${$t('permission.startTime')}`" />
+      <el-table-column prop="endTime" :label="`${$t('permission.endTime')}`">
        <template slot-scope="scope">
-          <el-tag :type="scope.row.forever? 'success': 'primary'" disable-transitions>{{ $ConstSelect.translate(scope.row.forever, 'Whether') }}</el-tag>
+          <span>{{ scope.row.endTime? scope.row.endTime: '永久' }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="amount" :label="$t('global.total')" />
      <el-table-column prop="remains" :label="$t('global.remains')" />
      <el-table-column prop="canDistribute" :label="$t('global.status')" width="100">
        <template slot-scope="scope">
-          <el-tag :type="scope.row.canDistribute == true ? 'success':'primary'" disable-transitions>
+          <el-tag :type="scope.row.canDistribute == true ? 'success':'danger'" disable-transitions>
            {{ computedName(scope.row.canDistribute, 'PermissionUseList') }}</el-tag>
        </template>
      </el-table-column>
--- a/src/views/lesson/taskmanage/list.vue
+++ b/src/views/lesson/taskmanage/list.vue
@ -1,6 +1,6 @@
 <template>
  <div style="height: 100%; overflow-y: auto;">
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;"  />
    <create-task ref="CreateTask" @reloadTable="reloadTable" />
    <div class="draft">
      <el-button-group>
--- a/src/views/lesson/trainingRule/list.vue
+++ b/src/views/lesson/trainingRule/list.vue
@ -1,6 +1,6 @@
 <template>
  <div style="height: 100%; overflow-y: auto;">
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;"  />
    <training-edit ref="create" type="ADD" @reloadTable="reloadTable" />
    <training-edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
    <add-batch ref="addBatch" @reloadTable="reloadTable" />
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@ -1,6 +1,6 @@
 <template>
  <div style="height: 100%; overflow-y: auto;">
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;" />
    <training-draft
      ref="draftTrain"
      :map-id-list="mapIdList"
@ -67,13 +67,6 @@ export default {
                            data: []
                        }
                    },
-                    /* generateType: {
-						type: 'select',
-						label: this.$t('lesson.automaticOrManual'),
-						config: {
-							data: [{ value: '02', label: this.$t('lesson.manual') }, { value: '01', label: this.$t('lesson.automatic') }]
-						}
-					},*/
                    name: {
                        type: 'text',
                        label: this.$t('lesson.trainingName')
@ -144,7 +137,6 @@ export default {
                    { text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging },
                    { text: this.$t('lesson.updateTraining'), btnCode: 'employee_edit', handler: this.editTrainingByType, type: 'warning'},
                    { text: this.$t('lesson.deleteTraining'), btnCode: 'employee_delete', handler: this.delAutoMaticTrainging, type: 'danger'}
-                    /* { text: this.$t('lesson.addTraining'), btnCode: 'employee_add', handler: this.addingTraining, type: 'primary' }*/
                ]
            },

@ -174,8 +166,6 @@ export default {
                            this.queryForm.queryObject.prdId.config.data.push({ value: elem.id, label: elem.name });
                        }
                    });
-                    // debugger;
-                    // this.typeChoose({type:this.queryForm.queryObject.type.config.data[0].value});
                }
            });

@ -237,9 +227,6 @@ export default {
        delAutoMaticTrainging() {
            this.$refs.draftTrain.show({ event: '03', title: this.$t('lesson.deleteAutoGeneratedTraining') });
        },
-        // addingTraining() {
-        // 	this.$refs.draftTrain.show({ event: '04', title: this.$t('lesson.addTraining') });
-        // },
        demoDisplay(index, node) {
            trainingNotify({ trainingId: node.id }).then(resp => {
                /** 区分演示和正式，需要在演示时设置lessonId为0*/
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@ -143,19 +143,18 @@ export default {
        loadInitData() {
            this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
            this.$Dictionary.permissionType().then(list => {
-                console.log(LangStorage.getLang() == 'en');
-                if (LangStorage.getLang() == 'en') {
+                if (LangStorage.getLang() === 'en') {
                    list.forEach(elem => {
                        elem.value = elem.code;
                        switch (elem.value) {
                        case '01':
-                            elem.label = 'Teaching permissions';
+                            elem.label = 'Teaching system';
                            break;
                        case '02':
-                            elem.label = 'Exam permissions';
+                            elem.label = 'Exam system';
                            break;
                        case '03':
-                            elem.label = 'Simulation permissions';
+                            elem.label = 'Simulation system';
                            break;
                        case '04':
                            elem.label = elem.name;
@ -170,11 +169,7 @@ export default {
                    });
                    list.push({value: '', label: '万能权限'});
                }
-                console.log(list, 111);
                this.PermissionTypeList = list;
-                // this.$convertList(list, this.PermissionTypeList, elem => {
-                //     return true;
-                // });
            });
        },
        formatterDate(row, porpInfo) {
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@ -1,6 +1,6 @@
 <template>
  <div class="joylink-card">
-    <div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
+    <div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:40px;display: inline-block;">
      <div class="runPlanList">{{ $t('planMonitor.openRunPlan.runPlanList') }}</div>
      <el-button v-if="isCreate" size="mini" type="primary" class="createRunPlan" @click="handleCreate">{{ $t('planMonitor.createRunningDiagram') }}</el-button>
    </div>
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@ -202,8 +202,6 @@ export default {
                });
            }
            return lastData.status;
-            // let explanation=lastData.explanation?'{ 说明：'+lastData.explanation+'}':'';
-            // return lastData.status+explanation;
        },
        handleConfirmPublish(data) {
            publishQuest(data.id, {'scriptName':data.scriptName}).then(resp => {