From 1669c6b39c36f0a7bd6c62f60cb9198513a84c28 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 20 三月 2023 11:07:18 +0800
Subject: [PATCH] 系统用户，单位，目录翻译；综合展示取消默认加载高德改成在线
---
src/views/datamanage/metadataManage.vue | 2
src/views/Archive/index.vue | 9
src/views/maintenance/tokentool.vue | 328 +++++++------
src/views/userManage/templateManage.vue | 229 +++++----
src/views/userManage/authorityManage.vue | 257 ++++++----
src/components/mapsdk.vue | 16
src/views/userManage/roleManage.vue | 479 ++++++++++----------
src/views/datamanage/styleManage.vue | 5
src/views/Tools/AddOnlineMap.vue | 8
9 files changed, 718 insertions(+), 615 deletions(-)
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 2e1e1f6..81e2456 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -783,15 +783,13 @@
},
init3DMap() {
var webKey = "94a34772eb88317fcbf8428e10448561";
-
//鍦板浘鍒濆鍖�
window.sgworld = new SmartEarth.SGWorld("mapdiv", {
- url: SmartEarthRootUrl + "Workers/image/earth.jpg",
+
licenseServer: window.sceneConfig.licenseServer,
});
-
window.Viewer = window.sgworld._Viewer;
- Viewer.imageryLayers._layers[0].show = false;
+
//瀹氫綅
// sgworld.Navigate.jumpTo({
// //璺宠浆瑙嗚
@@ -805,11 +803,11 @@
destination: Cesium.Cartesian3.fromDegrees(110, 33, 8000000),
});
- window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
- new Cesium.UrlTemplateImageryProvider({
- url: gaoDeBaseUrl[1].url,
- })
- );
+ // window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
+ // new Cesium.UrlTemplateImageryProvider({
+ // url: gaoDeBaseUrl[1].url,
+ // })
+ // );
Viewer._enableInfoOrSelection = false;
//鏄剧ずfps
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index 631c2a4..adadd70 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -1816,18 +1816,15 @@
}
}
for (var i in data.result) {
+
if (data.result[i].createtime) {
data.result[i].createtime = this.format(data.result[i].createtime)
}
if (data.result[i].updatetime) {
data.result[i].updatetime = this.format(data.result[i].updatetime)
}
- if (data.result[i].createName) {
- data.result[i].createuser = data.result[i].createName
- }
- if (data.result[i].updateName) {
- data.result[i].updateuser = data.result[i].updateName
- }
+ data.result[i].createuser = data.result[i].createName
+ data.result[i].updateuser = data.result[i].updateName
if (data.result[i].verName) {
data.result[i].verid = data.result[i].verName
}
diff --git a/src/views/Tools/AddOnlineMap.vue b/src/views/Tools/AddOnlineMap.vue
index d360cec..83d42a9 100644
--- a/src/views/Tools/AddOnlineMap.vue
+++ b/src/views/Tools/AddOnlineMap.vue
@@ -171,6 +171,7 @@
}, {
name: '鏈湴鏈嶅姟',
sourceType: 'localmap',
+ maximumLevel: 18,
id: 3,
isShow: true,
list: [
@@ -184,6 +185,11 @@
image: require("../../assets/img/imageLayer/gdmap_image.jpg"),
urls: "http://{host}/LFData/2d/tiles/img/{z}/{x}/{y}.png",
},
+ // {
+ // name: "鍦板舰",
+ // image: require("../../assets/img/imageLayer/tdmap_label.jpg"),
+ // urls: "http://{host}/LFData/2d/tiles/ter/{z}/{x}/{y}.png",
+ // },
],
}
@@ -280,7 +286,7 @@
} else if (mapCollection.sourceType === "localmap") {
var ulr = map.urls;
ulr = ulr.replace("{host}", iisHost)
- console.log(ulr)
+
window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: ulr,
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index e838928..4ed5ae6 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -1680,7 +1680,7 @@
this.dialog.isJpg = true
}
this.dialog.dialogVisible = true
- this.dialog.isPdf = true
+
var url =
BASE_URL +
"/inquiry/downloadForView?guid=" +
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 57164e7..dd64620 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -276,7 +276,7 @@
<el-divider></el-divider>
<p>
<label> {{ $t('dataManage.styleObj.createUser') }}:</label>
- <label class="boxlabel">{{ itemdetail.createUser }}</label>
+ <label class="boxlabel">{{ itemdetail.createName }}</label>
</p>
<el-divider></el-divider>
<p>
@@ -286,7 +286,7 @@
<el-divider></el-divider>
<p>
<label> {{ $t('dataManage.styleObj.updateUser') }}:</label>
- <label class="boxlabel">{{ itemdetail.updateUser }}</label>
+ <label class="boxlabel">{{ itemdetail.updateName }}</label>
</p>
<el-divider></el-divider>
<p>
@@ -1592,6 +1592,7 @@
this.showinfoBox = true;
this.itemdetail = row;
+
this.itemdetail.createTime = this.formomentTime(
this.itemdetail.createTime
);
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index 96b975e..104b54c 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -1,14 +1,19 @@
<template>
<div class="tokentool_box">
- <My-bread
- :list="[
+ <My-bread :list="[
`${$t('operatManage.operatManage')}`,
`${$t('operatManage.tokentool')}`,
- ]"
- ></My-bread>
+ ]"></My-bread>
<el-divider />
- <div class="inquire subpage_Div" ref="container">
- <el-form ref="formData" :model="ruleForm" :inline="true">
+ <div
+ class="inquire subpage_Div"
+ ref="container"
+ >
+ <el-form
+ ref="formData"
+ :model="ruleForm"
+ :inline="true"
+ >
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item
@@ -46,42 +51,41 @@
<!-- 鏌ヨ 娓呯┖ -->
<el-form-item>
<el-button
- icon="el-icon-search"
- size="small"
- type="primary"
- @click="onSubmit"
- >{{ $t("common.iquery") }}</el-button
- >
+ icon="el-icon-search"
+ size="small"
+ type="primary"
+ @click="onSubmit"
+ >{{ $t("common.iquery") }}</el-button>
<el-button
v-if="menuStatus.insert"
@click="InsertFormdialog = true"
icon="el-icon-edit"
type="success"
size="small"
- >{{ $t("common.append") }}</el-button
- >
+ >{{ $t("common.append") }}</el-button>
<el-button
v-if="menuStatus.delete"
@click="delTokenData"
icon="el-icon-delete"
type="danger"
size="small"
- >{{ $t("common.delete") }}</el-button
- >
+ >{{ $t("common.delete") }}</el-button>
<el-button
icon="el-icon-delete"
type="info"
size="small"
@click="onEmpty('formData1')"
- >{{ $t("common.empty") }}</el-button
- >
+ >{{ $t("common.empty") }}</el-button>
</el-form-item>
</div>
</div>
</el-form>
</div>
<div class="dividing-line"></div>
- <div class="table_box" :style="styleVar">
+ <div
+ class="table_box"
+ :style="styleVar"
+ >
<el-table
ref="filterTable"
:data="tableData"
@@ -89,10 +93,12 @@
border
height="calc(100% - 45px)"
>
- <el-table-column type="selection" width="55" />
+ <el-table-column
+ type="selection"
+ width="55"
+ />
<el-table-column
width="70"
-
type="index"
:label="$t('operatManage.tokentoolObj.index')"
/>
@@ -107,13 +113,11 @@
/>
<el-table-column
prop="expire"
-
:label="$t('operatManage.tokentoolObj.expire')"
:formatter="formatTime"
/>
<el-table-column
prop="type"
-
:label="$t('operatManage.tokentoolObj.type')"
>
<template slot-scope="scope">
@@ -123,28 +127,23 @@
</el-table-column>
<el-table-column
prop="ip"
-
:label="$t('operatManage.tokentoolObj.ip')"
/>
<el-table-column
- prop="createUser"
-
+ prop="createName"
:label="$t('operatManage.tokentoolObj.createUser')"
/>
<el-table-column
prop="createTime"
-
:label="$t('operatManage.tokentoolObj.createTime')"
:formatter="formatTime"
/>
<el-table-column
- prop="updateUser"
-
+ prop="updateName"
:label="$t('operatManage.tokentoolObj.updateUser')"
/>
<el-table-column
prop="updateTime"
-
:label="$t('operatManage.tokentoolObj.updateTime')"
:formatter="formatTime"
/>
@@ -152,13 +151,20 @@
fixed="right"
:label="$t('operatManage.tokentoolObj.operation')"
width="220"
-
>
<template slot-scope="scope">
- <el-button type="danger" size="small" plain>{{
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ >{{
$t("operatManage.tokentoolObj.invalid")
}}</el-button>
- <el-button type="info" size="small" plain>{{
+ <el-button
+ type="info"
+ size="small"
+ plain
+ >{{
$t("operatManage.tokentoolObj.renewal")
}}</el-button>
<el-button
@@ -167,8 +173,7 @@
type="warning"
plain
size="small"
- >{{ $t("common.update") }}</el-button
- >
+ >{{ $t("common.update") }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -192,65 +197,79 @@
:visible.sync="InsertFormdialog"
:before-close="handleClose"
>
- <div style="height: 500px; overflow: auto">
- <el-form ref="formData1" :model="insertform" label-position="top">
- <el-form-item
- :label="$t('operatManage.tokentoolObj.token')"
- :label-width="formLabelWidth"
+ <div style="height: 500px; overflow: auto">
+ <el-form
+ ref="formData1"
+ :model="insertform"
+ label-position="top"
>
- <el-input
- v-model="insertform.token"
- :placeholder="$t('common.pleaseInput')"
- style="width:85%"
- />
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.tokentoolObj.duration')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="insertform.duration"
- :placeholder="$t('common.pleaseInput')"
- style="width:85%"
- />
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.tokentoolObj.type')"
- :label-width="formLabelWidth"
- >
- <el-select
- :popper-append-to-body="false"
- style="width:85%"
- v-model="insertform.type"
- :placeholder="$t('common.choose')"
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.token')"
+ :label-width="formLabelWidth"
>
- <el-option
- value="0"
- :label="$t('operatManage.tokentoolObj.temporary')"
- ></el-option>
- <el-option
- value="1"
- :label="$t('operatManage.tokentoolObj.fixed')"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.tokentoolObj.ip')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="insertform.ip"
- :placeholder="$t('common.pleaseInput')"
- style="width:85%"
- />
- </el-form-item>
- </el-form>
- </div>
- <div slot="footer" class="dialog-footer">
- <el-button size="small" @click="insertFromDataClose">{{
+ <el-input
+ v-model="insertform.token"
+ :placeholder="$t('common.pleaseInput')"
+ style="width:85%"
+ />
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.duration')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="insertform.duration"
+ :placeholder="$t('common.pleaseInput')"
+ style="width:85%"
+ />
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.type')"
+ :label-width="formLabelWidth"
+ >
+ <el-select
+ :popper-append-to-body="false"
+ style="width:85%"
+ v-model="insertform.type"
+ :placeholder="$t('common.choose')"
+ >
+ <el-option
+ value="0"
+ :label="$t('operatManage.tokentoolObj.temporary')"
+ ></el-option>
+ <el-option
+ value="1"
+ :label="$t('operatManage.tokentoolObj.fixed')"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.ip')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="insertform.ip"
+ :placeholder="$t('common.pleaseInput')"
+ style="width:85%"
+ />
+ </el-form-item>
+ </el-form>
+ </div>
+ <div
+ slot="footer"
+ class="dialog-footer"
+ >
+ <el-button
+ size="small"
+ @click="insertFromDataClose"
+ >{{
$t("common.close")
}}</el-button>
- <el-button size="small" type="primary" @click="insertFromData">{{
+ <el-button
+ size="small"
+ type="primary"
+ @click="insertFromData"
+ >{{
$t("common.confirm")
}}</el-button>
</div>
@@ -261,67 +280,81 @@
:visible.sync="EditFormdialog"
:before-close="handleCloseEdit"
>
- <div style="height: 500px; overflow: auto">
- <el-form ref="formData1" :model="insertform" label-position="top">
- <el-form-item
- :label="$t('operatManage.tokentoolObj.token')"
- :label-width="formLabelWidth"
+ <div style="height: 500px; overflow: auto">
+ <el-form
+ ref="formData1"
+ :model="insertform"
+ label-position="top"
>
- <el-input
- v-model="upform.token"
- :placeholder="$t('common.pleaseInput')"
- style="width:85%"
- />
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.tokentoolObj.duration')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="upform.duration"
- :placeholder="$t('common.pleaseInput')"
- style="width:85%"
- />
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.tokentoolObj.type')"
- :label-width="formLabelWidth"
- >
- <el-select
- :popper-append-to-body="false"
- style="width:85%"
- v-model="upform.edit"
- @change="changeGame"
- :placeholder="$t('common.choose')"
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.token')"
+ :label-width="formLabelWidth"
>
- <el-option
- value="0"
- :label="$t('operatManage.tokentoolObj.temporary')"
- ></el-option>
- <el-option
- value="1"
- :label="$t('operatManage.tokentoolObj.fixed')"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item
- :label="$t('operatManage.tokentoolObj.ip')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="upform.ip"
- :placeholder="$t('common.pleaseInput')"
- style="width:85%"
- />
- </el-form-item>
- </el-form>
- </div>
+ <el-input
+ v-model="upform.token"
+ :placeholder="$t('common.pleaseInput')"
+ style="width:85%"
+ />
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.duration')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="upform.duration"
+ :placeholder="$t('common.pleaseInput')"
+ style="width:85%"
+ />
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.type')"
+ :label-width="formLabelWidth"
+ >
+ <el-select
+ :popper-append-to-body="false"
+ style="width:85%"
+ v-model="upform.edit"
+ @change="changeGame"
+ :placeholder="$t('common.choose')"
+ >
+ <el-option
+ value="0"
+ :label="$t('operatManage.tokentoolObj.temporary')"
+ ></el-option>
+ <el-option
+ value="1"
+ :label="$t('operatManage.tokentoolObj.fixed')"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ :label="$t('operatManage.tokentoolObj.ip')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="upform.ip"
+ :placeholder="$t('common.pleaseInput')"
+ style="width:85%"
+ />
+ </el-form-item>
+ </el-form>
+ </div>
- <div slot="footer" class="dialog-footer">
- <el-button size="small" @click="editFromDataClose">{{
+ <div
+ slot="footer"
+ class="dialog-footer"
+ >
+ <el-button
+ size="small"
+ @click="editFromDataClose"
+ >{{
$t("common.close")
}}</el-button>
- <el-button type="primary" size="small" @click="editFromData">{{
+ <el-button
+ type="primary"
+ size="small"
+ @click="editFromData"
+ >{{
$t("common.confirm")
}}</el-button>
</div>
@@ -618,10 +651,11 @@
this.listData.type = parseInt(this.ruleForm.value);
}
const data = await select_Token_ByPageAndCount(this.listData);
- console.log("Token鑾峰彇", data);
+
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触");
}
+
this.tableData = data.result;
this.count = data.count;
},
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index b169c0c..47d79c4 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -5,56 +5,72 @@
`${$t('userManage.authorityManage')}`,
]"></My-bread>
<el-divider />
- <div class="power_quire subpage_Div" ref="container">
+ <div
+ class="power_quire subpage_Div"
+ ref="container"
+ >
<el-form
ref="form"
:model="ruleForm"
:inline="true"
>
- <div class="flex_box">
- <div style="margin-right: auto">
- <el-form-item :label="$t('userManage.authorityM.name')">
- <el-input v-model="ruleForm.name" style="width:200px" size="small" :placeholder="$t('userManage.authorityM.nameHolder')">
- <i slot="suffix" class="el-icon-search" @click="submitForm"></i>
- </el-input>
- </el-form-item>
+ <div class="flex_box">
+ <div style="margin-right: auto">
+ <el-form-item :label="$t('userManage.authorityM.name')">
+ <el-input
+ v-model="ruleForm.name"
+ style="width:200px"
+ size="small"
+ :placeholder="$t('userManage.authorityM.nameHolder')"
+ >
+ <i
+ slot="suffix"
+ class="el-icon-search"
+ @click="submitForm"
+ ></i>
+ </el-input>
+ </el-form-item>
+ </div>
+ <div>
+ <el-form-item>
+ <el-button
+ v-if="menuStatus.insert"
+ @click="InsertFormdialog = true"
+ icon="el-icon-edit"
+ type="success"
+ size="small"
+ >{{ $t('common.append') }}</el-button>
+ <el-button
+ v-if="menuStatus.delete"
+ @click="DelFromData"
+ icon="el-icon-delete"
+ type="danger"
+ size="small"
+ >{{ $t('common.delete') }}</el-button>
+ <!-- <el-button-->
+ <!-- @click="submitForm('ruleForm')"-->
+ <!-- icon="el-icon-search" size="small"-->
+ <!-- type="primary"-->
+ <!-- >{{-->
+ <!-- $t('common.iquery')-->
+ <!-- }}</el-button>-->
+ <el-button
+ @click="resetForm('ruleForm')"
+ icon="el-icon-refresh"
+ type="info"
+ size="small"
+ >{{ $t('common.empty') }}</el-button>
+ </el-form-item>
+ </div>
</div>
- <div>
- <el-form-item>
- <el-button
- v-if="menuStatus.insert"
- @click="InsertFormdialog = true"
- icon="el-icon-edit"
- type="success" size="small"
- >{{ $t('common.append') }}</el-button>
- <el-button
- v-if="menuStatus.delete"
- @click="DelFromData"
- icon="el-icon-delete"
- type="danger" size="small"
- >{{ $t('common.delete') }}</el-button>
-<!-- <el-button-->
-<!-- @click="submitForm('ruleForm')"-->
-<!-- icon="el-icon-search" size="small"-->
-<!-- type="primary"-->
-<!-- >{{-->
-<!-- $t('common.iquery')-->
-<!-- }}</el-button>-->
- <el-button
- @click="resetForm('ruleForm')"
- icon="el-icon-refresh"
- type="info" size="small"
- >{{ $t('common.empty') }}</el-button>
- </el-form-item>
- </div>
- </div>
-
-
</el-form>
</div>
<div class="dividing-line"></div>
- <div class="table_box subpage_Div" :style="styleVar">
+ <div
+ class="table_box subpage_Div"
+ :style="styleVar"
+ >
<el-table
:data="tableData"
style="width: 100%"
@@ -86,7 +102,7 @@
>
</el-table-column>
<el-table-column
- prop="createUser"
+ prop="createName"
align="center"
:label="$t('userManage.userInfoObj.createUser')"
>
@@ -99,7 +115,7 @@
>
</el-table-column>
<el-table-column
- prop="updateUser"
+ prop="updateName"
align="center"
:label="$t('userManage.userInfoObj.updateUser')"
>
@@ -118,7 +134,6 @@
>
</el-table-column>
<el-table-column
-
:label="$t('common.operate')"
width="170px"
>
@@ -139,7 +154,10 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box" style="margin-top: 10px">
+ <div
+ class="pagination_box"
+ style="margin-top: 10px"
+ >
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -152,66 +170,66 @@
</el-pagination>
</div>
</div>
-<div class="infoBox_box" v-show="showinfoBox">
<div
- class="infoBox subpage_Div box_div"
-
+ class="infoBox_box"
+ v-show="showinfoBox"
>
- <el-card class="box-card">
- <div
- slot="header"
- class="clearfix"
- >
- <span>{{ $t('dataManage.styleObj.deInformation') }}</span>
+ <div class="infoBox subpage_Div box_div">
+ <el-card class="box-card">
<div
- style="float: right; cursor: pointer"
- @click="closeDetial"
+ slot="header"
+ class="clearfix"
>
- <i class="el-icon-close"></i>
+ <span>{{ $t('dataManage.styleObj.deInformation') }}</span>
+ <div
+ style="float: right; cursor: pointer"
+ @click="closeDetial"
+ >
+ <i class="el-icon-close"></i>
+ </div>
</div>
- </div>
- <div class="contentBox">
- <p>
- <label> {{ $t('userManage.userInfoObj.name') }}:</label>
- <label class="boxlabel">{{ itemdetail.name }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <p>
- <label> {{ $t('userManage.userInfoObj.tag') }}:</label>
- <label class="boxlabel">{{ itemdetail.tag }}</label>
- </p>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('userManage.userInfoObj.createUser') }}:</label>
- <label class="boxlabel">{{ itemdetail.createUser }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('userManage.userInfoObj.createTime') }}:</label>
- <label class="boxlabel">{{ itemdetail.createTime }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('userManage.userInfoObj.updateUser') }}:</label>
- <label class="boxlabel">{{ itemdetail.updateUser }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('userManage.userInfoObj.updateTime') }}:</label>
- <label class="boxlabel">{{ itemdetail.updateTime }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('userManage.userInfoObj.bak') }}:</label>
- <label class="boxlabel">{{ itemdetail.bak }}</label>
- </p>
- <el-divider></el-divider>
- </div>
- </el-card>
+ <div class="contentBox">
+ <p>
+ <label> {{ $t('userManage.userInfoObj.name') }}:</label>
+ <label class="boxlabel">{{ itemdetail.name }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <p>
+ <label> {{ $t('userManage.userInfoObj.tag') }}:</label>
+ <label class="boxlabel">{{ itemdetail.tag }}</label>
+ </p>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('userManage.userInfoObj.createUser') }}:</label>
+ <label class="boxlabel">{{ itemdetail.createName }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('userManage.userInfoObj.createTime') }}:</label>
+ <label class="boxlabel">{{ itemdetail.createTime }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('userManage.userInfoObj.updateUser') }}:</label>
+ <label class="boxlabel">{{ itemdetail.updateName }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('userManage.userInfoObj.updateTime') }}:</label>
+ <label class="boxlabel">{{ itemdetail.updateTime }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('userManage.userInfoObj.bak') }}:</label>
+ <label class="boxlabel">{{ itemdetail.bak }}</label>
+ </p>
+ <el-divider></el-divider>
+ </div>
+ </el-card>
+ </div>
</div>
-</div>
<el-dialog
:title="dialogTitle"
:visible.sync="isTransfer"
@@ -245,7 +263,10 @@
:before-close="handleClose"
>
- <el-form :model="insertform" label-position="top">
+ <el-form
+ :model="insertform"
+ label-position="top"
+ >
<el-form-item
:label="$t('userManage.userInfoObj.name')"
:label-width="formLabelWidth"
@@ -282,11 +303,15 @@
slot="footer"
class="dialog-footer"
>
- <el-button size="small" @click="insertFromDataClose">{{
+ <el-button
+ size="small"
+ @click="insertFromDataClose"
+ >{{
$t('common.close')
}}</el-button>
<el-button
- size="small" type="primary"
+ size="small"
+ type="primary"
@click="insertFromData"
>{{
$t('common.confirm')
@@ -298,36 +323,52 @@
:visible.sync="EditFormdialog"
:before-close="EditFromDataClose"
>
- <el-form :model="upform" label-position="top">
+ <el-form
+ :model="upform"
+ label-position="top"
+ >
<el-form-item
:label="$t('userManage.userInfoObj.name')"
:label-width="formLabelWidth"
>
- <el-input v-model="upform.name" style="width:85%"></el-input>
+ <el-input
+ v-model="upform.name"
+ style="width:85%"
+ ></el-input>
</el-form-item>
<el-form-item
:label="$t('userManage.userInfoObj.tag')"
:label-width="formLabelWidth"
>
- <el-input v-model="upform.tag" style="width:85%"></el-input>
+ <el-input
+ v-model="upform.tag"
+ style="width:85%"
+ ></el-input>
</el-form-item>
<el-form-item
:label="$t('userManage.userInfoObj.bak')"
:label-width="formLabelWidth"
>
- <el-input v-model="upform.bak" style="width:85%"></el-input>
+ <el-input
+ v-model="upform.bak"
+ style="width:85%"
+ ></el-input>
</el-form-item>
</el-form>
<div
slot="footer"
class="dialog-footer"
>
- <el-button size="small" @click="EditFromDataClose">{{
+ <el-button
+ size="small"
+ @click="EditFromDataClose"
+ >{{
$t('common.close')
}}</el-button>
<el-button
@click="EditFromData"
- size="small" type="primary"
+ size="small"
+ type="primary"
>{{
$t('common.confirm')
}}</el-button>
@@ -569,7 +610,7 @@
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触");
}
- console.log(data.result);
+
this.tableData = data.result;
this.count = data.count;
},
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 270015c..9409ec5 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -48,35 +48,39 @@
/> -->
</el-form-item>
<el-form-item
- :label="$t('userManage.RM.roleName')"
- prop="username"
+ :label="$t('userManage.RM.roleName')"
+ prop="username"
>
<el-input
- v-model="roleForm.username"
- :placeholder="$t('userManage.RM.roleNameHolder')"
- size="small"
- style="width: 200px"
+ v-model="roleForm.username"
+ :placeholder="$t('userManage.RM.roleNameHolder')"
+ size="small"
+ style="width: 200px"
>
- <i slot="suffix" class="el-icon-search" @click="onSubmit"></i>
+ <i
+ slot="suffix"
+ class="el-icon-search"
+ @click="onSubmit"
+ ></i>
</el-input>
</el-form-item>
</div>
<div>
-<!-- <el-form-item>-->
-<!-- <el-button-->
-<!-- size="small"-->
-<!-- type="primary"-->
-<!-- @click="onSubmit('ruleForm')"-->
-<!-- ><i class="el-icon-search"></i> {{-->
-<!-- $t("userManage.RM.query")-->
-<!-- }}</el-button>-->
-<!-- </el-form-item>-->
+ <!-- <el-form-item>-->
+ <!-- <el-button-->
+ <!-- size="small"-->
+ <!-- type="primary"-->
+ <!-- @click="onSubmit('ruleForm')"-->
+ <!-- ><i class="el-icon-search"></i> {{-->
+ <!-- $t("userManage.RM.query")-->
+ <!-- }}</el-button>-->
+ <!-- </el-form-item>-->
<el-form-item>
<el-button
- type="success"
- size="small"
- @click="setInsertFormdialog"
- v-if="menuStatus.insert"
+ type="success"
+ size="small"
+ @click="setInsertFormdialog"
+ v-if="menuStatus.insert"
><i class="el-icon-circle-plus-outline"></i> {{
$t("userManage.RM.add")
}}</el-button>
@@ -93,9 +97,9 @@
</el-form-item>
<el-form-item>
<el-button
- type="info"
- size="small"
- @click="resetForm('ruleForm')"
+ type="info"
+ size="small"
+ @click="resetForm('ruleForm')"
><i class="el-icon-delete"></i> {{
$t("userManage.RM.reset")
}}</el-button>
@@ -238,8 +242,8 @@
width="200"
>
<template slot-scope="scope">
- <el-button
- type="primary"
+ <el-button
+ type="primary"
@click="showDetail(scope.$index, scope.row)"
size="small"
plain
@@ -278,45 +282,48 @@
style="overflow: hidden"
:visible.sync="InsertFormdialog"
>
- <div style="height: 500px; overflow: auto">
- <el-form :model="insertform" label-position="top">
- <el-form-item
- :label="$t('userManage.RM.roleName')"
- :label-width="formLabelWidth"
+ <div style="height: 500px; overflow: auto">
+ <el-form
+ :model="insertform"
+ label-position="top"
>
- <el-input
- style="width:85%"
- v-model="insertform.name"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('userManage.RM.ownedSystem')"
- :label-width="formLabelWidth"
- :prop="insertform.depValue"
- :rules="[{ required: true, message: '涓嶈兘涓虹┖' }]"
- >
- <el-select
- :popper-append-to-body="false"
- v-model="insertform.depValue"
- placeholder="璇烽�夋嫨"
- style="width:85%"
+ <el-form-item
+ :label="$t('userManage.RM.roleName')"
+ :label-width="formLabelWidth"
>
- <el-option
- :value="insertform.depid"
- :label="insertform.depValue"
- style="height: auto"
+ <el-input
+ style="width:85%"
+ v-model="insertform.name"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.ownedSystem')"
+ :label-width="formLabelWidth"
+ :prop="insertform.depValue"
+ :rules="[{ required: true, message: '涓嶈兘涓虹┖' }]"
+ >
+ <el-select
+ :popper-append-to-body="false"
+ v-model="insertform.depValue"
+ placeholder="璇烽�夋嫨"
+ style="width:85%"
>
- <el-tree
- ref="tree"
- :data="depList"
- node-key="id"
- :props="props"
- @node-click="handleDepList"
- />
- </el-option>
- </el-select>
- <!-- <el-input
+ <el-option
+ :value="insertform.depid"
+ :label="insertform.depValue"
+ style="height: auto"
+ >
+ <el-tree
+ ref="tree"
+ :data="depList"
+ node-key="id"
+ :props="props"
+ @node-click="handleDepList"
+ />
+ </el-option>
+ </el-select>
+ <!-- <el-input
v-model="insertform.depValue"
:disabled="true"
:placeholder="$t('common.pleaseInput')"
@@ -327,42 +334,42 @@
style="margin-left:10px"
@click="showDepTree(2)"
>{{ $t('common.choose') }}</el-button> -->
- </el-form-item>
- <el-form-item
- :label="$t('userManage.RM.describe')"
- :label-width="formLabelWidth"
- >
- <el-input
- style="width:85%"
- v-model="insertform.descr"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('userManage.RM.isAdmin')"
- :label-width="formLabelWidth"
- >
- <el-radio
- v-model="insertform.isAdmin"
- label="1"
- >鏄�</el-radio>
- <el-radio
- v-model="insertform.isAdmin"
- label="0"
- >鍚�</el-radio>
- </el-form-item>
- <el-form-item
- :label="$t('userManage.RM.remarks')"
- :label-width="formLabelWidth"
- >
- <el-input
- style="width:85%"
- v-model="insertform.bak"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-form>
- </div>
+ </el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.describe')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ style="width:85%"
+ v-model="insertform.descr"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.isAdmin')"
+ :label-width="formLabelWidth"
+ >
+ <el-radio
+ v-model="insertform.isAdmin"
+ label="1"
+ >鏄�</el-radio>
+ <el-radio
+ v-model="insertform.isAdmin"
+ label="0"
+ >鍚�</el-radio>
+ </el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.remarks')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ style="width:85%"
+ v-model="insertform.bak"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
<div
slot="footer"
class="dialog-footer"
@@ -387,46 +394,49 @@
:visible.sync="UpdateFormdialog"
:before-close="handleCloseEdit"
>
- <div style="height: 500px; overflow: auto">
- <el-form :model="updateform" label-position="top">
- <el-form-item
- :label="$t('userManage.RM.roleName')"
- :label-width="formLabelWidth"
+ <div style="height: 500px; overflow: auto">
+ <el-form
+ :model="updateform"
+ label-position="top"
>
- <el-input
- v-model="updateform.name"
- autocomplete="off"
- style="width:85%"
- ></el-input>
- </el-form-item>
-
- <el-form-item
- :label="$t('userManage.RM.ownedSystem')"
- :label-width="formLabelWidth"
- :prop="updateform.depValue"
- >
- <el-select
- :popper-append-to-body="false"
- v-model="updateform.depValue"
- placeholder="璇烽�夋嫨"
- style="width:85%"
+ <el-form-item
+ :label="$t('userManage.RM.roleName')"
+ :label-width="formLabelWidth"
>
- <el-option
- :value="updateform.depid"
- :label="updateform.depValue"
- style="height: auto"
- >
- <el-tree
- ref="tree"
- :data="depList"
- node-key="id"
- :props="props"
- @node-click="handleUpdataDepList"
- />
- </el-option>
- </el-select>
+ <el-input
+ v-model="updateform.name"
+ autocomplete="off"
+ style="width:85%"
+ ></el-input>
+ </el-form-item>
- <!-- <el-input
+ <el-form-item
+ :label="$t('userManage.RM.ownedSystem')"
+ :label-width="formLabelWidth"
+ :prop="updateform.depValue"
+ >
+ <el-select
+ :popper-append-to-body="false"
+ v-model="updateform.depValue"
+ placeholder="璇烽�夋嫨"
+ style="width:85%"
+ >
+ <el-option
+ :value="updateform.depid"
+ :label="updateform.depValue"
+ style="height: auto"
+ >
+ <el-tree
+ ref="tree"
+ :data="depList"
+ node-key="id"
+ :props="props"
+ @node-click="handleUpdataDepList"
+ />
+ </el-option>
+ </el-select>
+
+ <!-- <el-input
v-model="updateform.depValue"
:disabled="true"
:placeholder="$t('common.pleaseInput')"
@@ -437,42 +447,42 @@
style="margin-left:10px"
@click="showDepTree(3)"
>{{ $t('common.choose') }}</el-button> -->
- </el-form-item>
- <el-form-item
- :label="$t('userManage.RM.isAdmin')"
- :label-width="formLabelWidth"
- >
- <el-radio
- v-model="updateform.isAdmin"
- label="1"
- >鏄�</el-radio>
- <el-radio
- v-model="updateform.isAdmin"
- label="0"
- >鍚�</el-radio>
- </el-form-item>
- <el-form-item
- :label="$t('userManage.RM.describe')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="updateform.descr"
- autocomplete="off"
- style="width:85%"
- ></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('userManage.RM.remarks')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="updateform.bak"
- autocomplete="off"
- style="width:85%"
- ></el-input>
- </el-form-item>
- </el-form>
- </div>
+ </el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.isAdmin')"
+ :label-width="formLabelWidth"
+ >
+ <el-radio
+ v-model="updateform.isAdmin"
+ label="1"
+ >鏄�</el-radio>
+ <el-radio
+ v-model="updateform.isAdmin"
+ label="0"
+ >鍚�</el-radio>
+ </el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.describe')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="updateform.descr"
+ autocomplete="off"
+ style="width:85%"
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.remarks')"
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="updateform.bak"
+ autocomplete="off"
+ style="width:85%"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+ </div>
<div
slot="footer"
class="dialog-footer"
@@ -512,76 +522,76 @@
>鍙栨秷</el-button>
</div>
</div>
-<div class="infoBox_box" v-show="showinfoBox">
<div
- class="infoBox box_div subpage_Div"
-
+ class="infoBox_box"
+ v-show="showinfoBox"
>
- <div
- slot="header"
- class="clearfix"
- >
- <span>{{ $t("dataManage.styleObj.deInformation") }}</span>
+ <div class="infoBox box_div subpage_Div">
<div
- style="float: right; cursor: pointer"
- @click="closeDetial"
+ slot="header"
+ class="clearfix"
>
- <i class="el-icon-close"></i>
+ <span>{{ $t("dataManage.styleObj.deInformation") }}</span>
+ <div
+ style="float: right; cursor: pointer"
+ @click="closeDetial"
+ >
+ <i class="el-icon-close"></i>
+ </div>
+ </div>
+ <el-divider></el-divider>
+ <div class="contentBox">
+ <p>
+ <label> {{ $t("userManage.RM.roleName") }}:</label>
+ <label class="boxlabel">{{ itemdetail.name }}</label>
+ </p>
+ <el-divider></el-divider>
+
+ <p>
+ <label> {{ $t("userManage.RM.ownedSystem") }}:</label>
+ <label class="boxlabel">{{ itemdetail.depName }}</label>
+ </p>
+ <el-divider></el-divider>
+
+ <p>
+ <label> {{ $t("userManage.RM.isAdmin") }}:</label>
+ <label class="boxlabel">{{ itemdetail.admin }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t("userManage.RM.describe") }}:</label>
+ <label class="boxlabel">{{ itemdetail.descr }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t("userManage.RM.creationuser") }}:</label>
+ <label class="boxlabel">{{ itemdetail.createUser }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t("userManage.RM.creationtime") }}:</label>
+ <label class="boxlabel">{{ itemdetail.createTime }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t("userManage.RM.updateonuser") }}:</label>
+ <label class="boxlabel">{{ itemdetail.updateUser }}</label>
+ </p>
+ <el-divider></el-divider>
+
+ <p>
+ <label> {{ $t("userManage.RM.updateontime") }}:</label>
+ <label class="boxlabel">{{ itemdetail.updateTime }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t("userManage.RM.remarks") }}:</label>
+ <label class="boxlabel">{{ itemdetail.bak }}</label>
+ </p>
+ <el-divider></el-divider>
</div>
</div>
- <el-divider></el-divider>
- <div class="contentBox">
- <p>
- <label> {{ $t("userManage.RM.roleName") }}:</label>
- <label class="boxlabel">{{ itemdetail.name }}</label>
- </p>
- <el-divider></el-divider>
-
- <p>
- <label> {{ $t("userManage.RM.ownedSystem") }}:</label>
- <label class="boxlabel">{{ itemdetail.depName }}</label>
- </p>
- <el-divider></el-divider>
-
- <p>
- <label> {{ $t("userManage.RM.isAdmin") }}:</label>
- <label class="boxlabel">{{ itemdetail.admin }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t("userManage.RM.describe") }}:</label>
- <label class="boxlabel">{{ itemdetail.descr }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t("userManage.RM.creationuser") }}:</label>
- <label class="boxlabel">{{ itemdetail.createUser }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t("userManage.RM.creationtime") }}:</label>
- <label class="boxlabel">{{ itemdetail.createTime }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t("userManage.RM.updateonuser") }}:</label>
- <label class="boxlabel">{{ itemdetail.UpdateUser }}</label>
- </p>
- <el-divider></el-divider>
-
- <p>
- <label> {{ $t("userManage.RM.updateontime") }}:</label>
- <label class="boxlabel">{{ itemdetail.updateTime }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t("userManage.RM.remarks") }}:</label>
- <label class="boxlabel">{{ itemdetail.bak }}</label>
- </p>
- <el-divider></el-divider>
- </div>
</div>
-</div>
</div>
</template>
@@ -716,6 +726,9 @@
this.itemdetail.updateTime = this.formomentTime(
this.itemdetail.updateTime
);
+ this.itemdetail.createUser = this.itemdetail.createName;
+
+ this.itemdetail.updateUser = this.itemdetail.updateName;
this.itemdetail.admin =
parseInt(this.itemdetail.isAdmin) === 0 ? "鍚�" : "鏄�";
},
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index e513c3e..8fb2db0 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -5,45 +5,52 @@
`${$t('dataManage.templateManage')}`,
]"></My-bread>
<el-divider />
- <div class="searchComp subpage_Div" ref="container">
+ <div
+ class="searchComp subpage_Div"
+ ref="container"
+ >
<el-form
ref="ruleForm"
:model="ruleForm"
:inline="true"
>
- <div class="flex_box">
+ <div class="flex_box">
<div style="margin-right: auto">
- <el-form-item :label="$t('userManage.authorityM.name')">
- <el-input
- style="width:200px"
- size="small"
- v-model="ruleForm.name"
- :placeholder="$t('userManage.authorityM.nameHolder')"
- >
- <i slot="suffix" class="el-icon-search" @click="setRefreshTable"></i>
- </el-input>
+ <el-form-item :label="$t('userManage.authorityM.name')">
+ <el-input
+ style="width:200px"
+ size="small"
+ v-model="ruleForm.name"
+ :placeholder="$t('userManage.authorityM.nameHolder')"
+ >
+ <i
+ slot="suffix"
+ class="el-icon-search"
+ @click="setRefreshTable"
+ ></i>
+ </el-input>
</el-form-item>
</div>
- <div>
+ <div>
-<!-- <el-form-item>-->
-<!-- <el-button-->
-<!-- icon="el-icon-search"-->
-<!-- @click="setRefreshTable"-->
-<!-- type="primary"-->
-<!-- size="small"-->
-<!-- >{{ $t('common.iquery') }}</el-button>-->
-<!-- </el-form-item>-->
- <el-form-item>
- <el-button
- v-if="btnStatus.insert"
- @click="setTableInsert"
- icon="el-icon-edit"
- type="success"
- size="small"
- >{{ $t('common.append') }}</el-button>
- </el-form-item>
- <el-form-item>
+ <!-- <el-form-item>-->
+ <!-- <el-button-->
+ <!-- icon="el-icon-search"-->
+ <!-- @click="setRefreshTable"-->
+ <!-- type="primary"-->
+ <!-- size="small"-->
+ <!-- >{{ $t('common.iquery') }}</el-button>-->
+ <!-- </el-form-item>-->
+ <el-form-item>
+ <el-button
+ v-if="btnStatus.insert"
+ @click="setTableInsert"
+ icon="el-icon-edit"
+ type="success"
+ size="small"
+ >{{ $t('common.append') }}</el-button>
+ </el-form-item>
+ <el-form-item>
<el-button
v-if="btnStatus.delete"
icon="el-icon-delete"
@@ -52,23 +59,24 @@
size="small"
>{{ $t('common.delete') }}</el-button>
</el-form-item>
- <el-form-item>
- <el-button
- icon="el-icon-refresh"
- @click="restRefreshTable"
- type="info"
- size="small"
- >{{ $t('common.empty') }}</el-button>
- </el-form-item>
- </div>
- </div>
-
-
+ <el-form-item>
+ <el-button
+ icon="el-icon-refresh"
+ @click="restRefreshTable"
+ type="info"
+ size="small"
+ >{{ $t('common.empty') }}</el-button>
+ </el-form-item>
+ </div>
+ </div>
</el-form>
</div>
<div class="dividing-line"></div>
- <div class="table_box" :style="styleVar">
+ <div
+ class="table_box"
+ :style="styleVar"
+ >
<el-table
:data="tableData"
style="width: 100%"
@@ -306,77 +314,77 @@
>纭� 瀹�</el-button>
</div>
</el-dialog>
- <div class="infoBox_box" v-show="showinfoBox">
<div
- class="infoBox subpage_Div box_div"
-
+ class="infoBox_box"
+ v-show="showinfoBox"
>
+ <div class="infoBox subpage_Div box_div">
- <div
- slot="header"
- class="clearfix"
- >
- <span>{{ $t('dataManage.styleObj.deInformation') }}</span>
<div
- style="float: right; cursor: pointer"
- @click="closeDetial"
+ slot="header"
+ class="clearfix"
>
- <i class="el-icon-close"></i>
+ <span>{{ $t('dataManage.styleObj.deInformation') }}</span>
+ <div
+ style="float: right; cursor: pointer"
+ @click="closeDetial"
+ >
+ <i class="el-icon-close"></i>
+ </div>
</div>
- </div>
- <el-divider></el-divider>
- <div class="contentBox">
- <p>
- <label> {{ $t('dataManage.styleObj.name') }}:</label>
- <label class="boxlabel">{{ itemdetail.name }}</label>
- </p>
<el-divider></el-divider>
- <p>
- <p>
- <label> {{ $t('common.fileType') }}:</label>
- <label class="boxlabel">{{ itemdetail.fileType }}</label>
- </p>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('common.domCode') }}:</label>
- <label class="boxlabel">{{ itemdetail.code }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('common.filePath') }}:</label>
- <label class="boxlabel">{{ itemdetail.fname }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('common.bak') }}:</label>
- <label class="boxlabel">{{ itemdetail.bak }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('dataManage.vmobj.createonuser') }}:</label>
- <label class="boxlabel">{{ itemdetail.createName }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('dataManage.vmobj.createontime') }}:</label>
- <label class="boxlabel">{{ itemdetail.cTime }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('dataManage.vmobj.updateonuser') }}:</label>
- <label class="boxlabel">{{ itemdetail.updateName }}</label>
- </p>
- <el-divider></el-divider>
- <p>
- <label> {{ $t('dataManage.vmobj.updateontime') }}:</label>
- <label class="boxlabel">{{ itemdetail.uTime }}</label>
- </p>
- <el-divider></el-divider>
- </div>
+ <div class="contentBox">
+ <p>
+ <label> {{ $t('dataManage.styleObj.name') }}:</label>
+ <label class="boxlabel">{{ itemdetail.name }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <p>
+ <label> {{ $t('common.fileType') }}:</label>
+ <label class="boxlabel">{{ itemdetail.fileType }}</label>
+ </p>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('common.domCode') }}:</label>
+ <label class="boxlabel">{{ itemdetail.code }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('common.filePath') }}:</label>
+ <label class="boxlabel">{{ itemdetail.fname }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('common.bak') }}:</label>
+ <label class="boxlabel">{{ itemdetail.bak }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('dataManage.vmobj.createonuser') }}:</label>
+ <label class="boxlabel">{{ itemdetail.createName }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('dataManage.vmobj.createontime') }}:</label>
+ <label class="boxlabel">{{ itemdetail.cTime }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('dataManage.vmobj.updateonuser') }}:</label>
+ <label class="boxlabel">{{ itemdetail.updateName }}</label>
+ </p>
+ <el-divider></el-divider>
+ <p>
+ <label> {{ $t('dataManage.vmobj.updateontime') }}:</label>
+ <label class="boxlabel">{{ itemdetail.uTime }}</label>
+ </p>
+ <el-divider></el-divider>
+ </div>
- </div>
</div>
+ </div>
<iframe
id="downFrame"
src=""
@@ -496,7 +504,7 @@
.then((_) => {
this.closeInsertData();
})
- .catch((_) => {});
+ .catch((_) => { });
},
codeData(row, column) {
let data = row[column.property];
@@ -530,7 +538,12 @@
this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻";
}
- this.itemdetail.uTime = this.format(row.updateTime);
+ this.itemdetail.cTime = this.format(row.createTime);
+ if (row.updateTime) {
+
+ this.itemdetail.uTime = this.format(row.updateTime);
+ }
+ // this.itemdetail.uTime = this.format(row.updateTime);
this.showinfoBox = true;
},
//鍏抽棴鏌ョ湅
@@ -744,6 +757,7 @@
if (data.code != 200) {
return this.$message.error("鍒楄〃璋冪敤澶辫触");
}
+
this.tableData = data.result;
this.listData.count = data.count;
},
@@ -816,7 +830,6 @@
}
}
}
-
}
</style>
--
Gitblit v1.9.3