From d5efa1b1cdbab10b034357ae3e7b65c21754a123 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期六, 11 二月 2023 11:47:01 +0800
Subject: [PATCH] 样式管理界面修改，数据上传添加附件
---
src/views/PackageTwo/WareInspection.vue | 4
src/api/api.js | 5
src/assets/css/config.css | 3
src/views/datamanage/dataController.vue | 21 ++
src/views/userManage/templateManage.vue | 43 +++++
src/assets/css/configure.css | 3
src/views/maintenance/mochaitmo.vue | 30 +++-
src/components/navMenu.vue | 17 ++
src/views/userManage/roleManage.vue | 63 ++++----
src/App.vue | 2
src/views/datamanage/dataUpdata.vue | 157 ++++++++++++++++++++++
src/views/datamanage/styleManage.vue | 53 +++++--
12 files changed, 325 insertions(+), 76 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index cb0be87..3fe4336 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,9 +22,11 @@
window.addEventListener('beforeunload', e => {
sessionStorage.setItem('beforeunload', 1);
});
+
// 鐩戝惉椤甸潰鍒锋柊
if (sessionStorage.getItem('beforeunload') == 1) {
let name = sessionStorage.getItem("routerName");
+
if (name) {
this.$nextTick(function () {
this.$router.push({ path: name }); //濡傛灉sessionStorage瀛樺湪璺敱锛屽幓缂撳瓨鐨勮矾鐢�
diff --git a/src/api/api.js b/src/api/api.js
index 31496b1..3a8f37d 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -807,7 +807,10 @@
export function report_update(params) {
return request.post('/report/update', params);
}
-
+//绛惧悕绠＄悊=>鎻掑叆鎿嶄綔鏃ュ織
+export function sign_insertOpLog(params) {
+ return request.get('/sign/insertOpLog',{ params: params });
+}
//璇锋眰绔欏満鐐瑰唴瀹�
export function querySitePoint(size, index, name) {
diff --git a/src/assets/css/config.css b/src/assets/css/config.css
index b66a80d..a7e6407 100644
--- a/src/assets/css/config.css
+++ b/src/assets/css/config.css
@@ -248,4 +248,7 @@
}
.Black_theme .contentBox{
color: #FFF;
+}
+.Black_theme .scopeRowColor{
+ color: #FFF;
}
\ No newline at end of file
diff --git a/src/assets/css/configure.css b/src/assets/css/configure.css
index fae88b4..0611b23 100644
--- a/src/assets/css/configure.css
+++ b/src/assets/css/configure.css
@@ -73,4 +73,7 @@
.el-dialog__wrapper {
z-index: 999;
+}
+.scopeRowColor{
+ color: #606266;
}
\ No newline at end of file
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 6f43705..846341c 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -76,7 +76,7 @@
</template>
<script>
-import { logout, selectMenuRecursive } from '@/api/api';
+import { logout, selectMenuRecursive, sign_insertOpLog } from '@/api/api';
import { removeToken, getToken } from '@/utils/auth';
import customElMenu from '../components/customElMenu.vue';
import { queryMenuTree, getPerms } from '../api/api';
@@ -195,9 +195,16 @@
return true;
}
},
- //涓婚鍒囨崲
+
+ //涓婚鍒囨崲
setThemeColors() { },
-
+ async signInsertOpLog(m1, m2) {
+ var obj = {
+ m1: m1,
+ m2: m2,
+ }
+ const data = await sign_insertOpLog(obj);
+ },
//榧犳爣绉诲叆鑿滃崟浜嬩欢
setMenuMove(index, item) {
if (item.perms != null) {
@@ -206,6 +213,9 @@
this.changeliSelect = '%%';
this.showFlag = null;
+ }
+ if (item.url == "Thematic") {
+ this.signInsertOpLog("缁煎悎灞曠ず", item.cnName)
}
} else {
if (this.showFlag != index) {
@@ -243,6 +253,7 @@
}
},
setLiClick(res, index) {
+ this.signInsertOpLog(this.listMenu[index].cnName, res.cnName)
setTimeout(() => {
this.changeliSelect = res.cnName;
diff --git a/src/views/PackageTwo/WareInspection.vue b/src/views/PackageTwo/WareInspection.vue
index 69c06cc..32d3b85 100644
--- a/src/views/PackageTwo/WareInspection.vue
+++ b/src/views/PackageTwo/WareInspection.vue
@@ -49,7 +49,7 @@
},
showChangeIfream(res) {
- // debugger
+ //
console.log(res)
if (this.$store.state.themeflag == true) {
if (res.indexOf('theme=white') != -1) {
@@ -115,7 +115,7 @@
},
mounted() {
// console.log(sessionStorage.getItem('iframehttpurl'))
- // debugger
+ //
if (sessionStorage.getItem('routerName') === '/WareInspection') {
this.showChangeIfream(sessionStorage.getItem('iframehttpurl'))
diff --git a/src/views/datamanage/dataController.vue b/src/views/datamanage/dataController.vue
index 7e07958..e8a9134 100644
--- a/src/views/datamanage/dataController.vue
+++ b/src/views/datamanage/dataController.vue
@@ -1,6 +1,6 @@
<template>
<div class="contentBox">
-
+
<div
class="box"
ref="box"
@@ -41,7 +41,7 @@
</template>
<script>
-import { selectMenuRecursive, queryMenuTree } from '../../api/api';
+import { selectMenuRecursive, queryMenuTree, sign_insertOpLog } from '../../api/api';
import customElMenu from '../../components/customElMenu.vue';
import dataUpdata from '@/views/datamanage/dataUpdata.vue'; //鏁版嵁绠＄悊-鏁版嵁涓婁紶
import catalogueManage from '@/views/datamanage/catalogueManage.vue'; //鏁版嵁绠＄悊-鐩綍绠＄悊
@@ -158,14 +158,14 @@
return value.type == 1;
});
this.menuList = this.treeData(menuList);
-
+ this.m1 = this.menuList[0].cnName;
this.setViewController(this.menuList[0]);
-
+
const hanleselectindex = sessionStorage.getItem('hanleselectindex')
if (hanleselectindex) {
- this.$nextTick(function (){
+ this.$nextTick(function () {
this.handleselecttwo(JSON.parse(hanleselectindex).url, JSON.parse(hanleselectindex))
- this.setViewController(JSON.parse(hanleselectindex))
+ this.setViewController(JSON.parse(hanleselectindex))
})
}
} else {
@@ -182,10 +182,18 @@
if (res.children != null) {
this.setViewController(res.children[0]);
} else {
+ this.signInsertOpLog(this.m1, res.cnName)
this.$store.state.currentPerms = res.perms;
this.setMenuFlag = res.url;
this.activeIndex = res.url;
}
+ },
+ async signInsertOpLog(m1, m2) {
+ var obj = {
+ m1: m1,
+ m2: m2,
+ }
+ const data = await sign_insertOpLog(obj);
},
treeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
@@ -207,6 +215,7 @@
handleselect(index, indexPath, e) {
const a = JSON.stringify(e.$attrs.perms)
+ this.signInsertOpLog(this.m1, e.$attrs.perms.cnName)
sessionStorage.setItem('hanleselectindex', a)
var data = e.$attrs.perms;
this.$store.state.currentPerms = data.perms;
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 599e1d0..19556e1 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -115,7 +115,6 @@
<el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
<el-select
:popper-append-to-body="false"
-
:disabled="tableData.length == 0 ? false : true"
v-model="formInline.specialtyId"
:placeholder="$t('common.choose')"
@@ -393,6 +392,16 @@
size="small"
>{{ $t('common.delete') }}</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button
+ v-if="menuStatus.upload"
+ :disabled="multipleDelete.length == 0 ? true : false"
+ @click="setEnclosure"
+ icon="el-icon-folder-opened"
+ type="warning"
+ size="small"
+ >{{ $t('common.enclosure') }}</el-button>
+ </el-form-item>
</el-form>
</div>
<div
@@ -457,7 +466,10 @@
:label="$t('dataManage.dataUpObj.tableName')"
>
<template slot-scope="scope">
- <a @click="detail(scope.row)">{{ scope.row.tab }}</a>
+ <a
+ class="scopeRowColor"
+ @click="detail(scope.row)"
+ >{{ scope.row.tab }}</a>
</template>
</el-table-column>
<el-table-column
@@ -990,6 +1002,35 @@
</div>
</el-dialog>
+ <el-dialog
+ :title="$t('common.details')"
+ :visible.sync="enclosureVisible"
+ :show-close="false"
+ >
+ <span
+ style="font-size:20px"
+ class="scopeRowColor"
+ >{{enclosureTitle}}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
+ <span
+ slot="footer"
+ class="dialog-footer"
+ >
+ <el-button @click="enclosureVisible = false">鍙� 娑�</el-button>
+ <el-button
+ type="primary"
+ @click="uploadAnFiles"
+ >缁х画</el-button>
+ </span>
+ </el-dialog>
+ <input
+ name="file1"
+ :accept="'.zip'"
+ type="file"
+ id="editimageFile"
+ multiple="multiple"
+ style="display: none"
+ @change="uploadAnFilesChange"
+ />
</div>
</template>
@@ -1022,6 +1063,7 @@
},
data() {
return {
+
coordinateOption: [],
disOptions: [{
name: '宕╁娌荤悊',
@@ -1175,7 +1217,10 @@
},
jindutiao: 0,
jindudialogVisible: false,
- jindutiaoname: []
+ jindutiaoname: [],
+ enclosureData: [],
+ enclosureVisible: false,
+ enclosureTitle: '',
}
},
@@ -1195,6 +1240,109 @@
},
methods: {
+ //闄勪欢鍙樺寲
+ uploadAnFilesChange() {
+ var formData = new FormData();
+ var fs = document.getElementById("editimageFile");
+ if (fs.files.length == 0) {
+ this.$message.error('璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢');
+ return;
+ }
+ for (var i = 0, c = fs.files.length; i < c; i++) {
+ formData.append("file", fs.files[i]); // fs.files[i].name,file
+ }
+ for (var i in this.enclosureData) {
+ formData.append('ids', this.enclosureData[i])
+ }
+ const that = this
+ that.jindudialogVisible = true
+ that.$set(this, 'jindutiaoname', "闄勪欢涓婁紶")
+ that.$set(this, 'jindutiao', 0)
+ this.loading = true;
+ $.ajax(BASE_URL + "/dataUpload/uploadXlsAnnex?token=" + getToken() + "&path=" + this.formInline.path, {
+ type: "post",
+ data: formData,
+ async: true,
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: (rs) => {
+ this.loading = false;
+ if (rs.code != 200) {
+ return this.$message.error('闄勪欢涓婁紶澶辫触');
+ }
+
+ this.$set(this, 'jindutiao', 100)
+ this.$message({
+ message: '闄勪欢涓婁紶鎴愬姛',
+ type: 'success'
+ });
+
+ },
+ error: (rs) => {
+ this.loading = false;
+ this.$message.error('闄勪欢涓婁紶澶辫触');
+ },
+ xhr: function () {
+ var myXhr = $.ajaxSettings.xhr();
+ if (myXhr.upload) { //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
+ myXhr.upload.addEventListener('progress', that.progressHandlingFunction, false); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
+ }
+ return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
+ }
+ });
+
+
+
+
+
+
+
+
+
+ },
+ //閫夋嫨涓婁紶闄勪欢鐨勬枃浠�
+ uploadAnFiles() {
+ $('#editimageFile').click();
+ },
+ //涓婁紶闄勪欢
+ uploadAnnex() {
+
+ },
+ //闄勪欢涓婁紶
+ setEnclosure() {
+ var enclosureData = [
+ 'bd.b_pac_hydrogeology',
+ 'bd.b_pac_frozensoil',
+ 'bd.b_pac_geologic_hazard',
+ 'bd.b_pac_marine_meteorological',
+ 'bd.b_pac_meteorological',
+ 'bs.m_equipment_nameplate',
+ 'bs.m_hydraulic_protection',
+ 'bs.m_marker',
+ 'bs.s_borehole'
+ ];
+ var std = [];
+ this.enclosureData = [];
+ this.enclosureTitle = "";
+ for (var i in this.multipleDelete) {
+ var row = this.multipleDelete[i];
+
+ if (row.tab && row.rows && enclosureData.indexOf(row.tab) > -1) {
+
+ this.enclosureData.push(row.id)
+ } else {
+ std.push(row.name)
+ }
+ }
+ if (std.length != 0) {
+ this.enclosureTitle = std.toString()
+ this.enclosureVisible = true;
+ } else {
+ this.uploadAnFiles();
+ }
+ },
+ //鏉冮檺閰嶇疆
showPermsMenu(res) {
switch (res.tag) {
@@ -1837,6 +1985,7 @@
},
xhr: function () {
var myXhr = $.ajaxSettings.xhr();
+ debugger
if (myXhr.upload) { //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
myXhr.upload.addEventListener('progress', that.progressHandlingFunction, false); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
}
@@ -1884,6 +2033,7 @@
this.entryOption = data.result;
this.formInline.entryId = this.entryOption[0].name;
this.formInline.dirid = this.entryOption[0].id;
+
this.getselectVerByDirid();
},
//鑾峰彇鎵�鏈夊潗鏍囩郴
@@ -2192,6 +2342,7 @@
return;
}
this.catalogOption = this.treeData(res.result);
+ this.formInline.dirName = this.catalogOption[0].name
this.getStartDirChecked(this.catalogOption);
this.getselectVerByDirid()
},
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 7c1d8f5..786a6f0 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -216,7 +216,7 @@
<el-divider></el-divider>
<p>
<label> {{ $t('dataManage.styleObj.fileguid') }}:</label>
- <label class="boxlabel">{{ itemdetail.fileGuid }}</label>
+ <label class="boxlabel">{{ itemdetail.fname }}</label>
</p>
<el-divider></el-divider>
<p>
@@ -729,7 +729,7 @@
<div class="BoxFlex">
<div class="BoxFlexinput">
<el-input
- v-model="insertform.fileGuid"
+ v-model="insertFileGuid"
disabled
autocomplete="off"
style="width:100%"
@@ -742,7 +742,7 @@
id="insertFile"
multiple="multiple"
style="display: none"
- @change="insertFile(0)"
+ @change="insertFileData(0)"
/>
<el-button
style="margin-left: 6px;"
@@ -780,7 +780,7 @@
<div class="BoxFlex">
<div class="BoxFlexinput">
<el-input
- v-model="insertform.viewGuid"
+ v-model="insertViewGuid"
disabled
autocomplete="off"
style="width:100%"
@@ -793,7 +793,7 @@
id="insertimageFile"
multiple="multiple"
style="display: none"
- @change="insertFile(1)"
+ @change="insertFileData(1)"
/>
<el-button
style="margin-left: 6px;"
@@ -922,6 +922,14 @@
components: { MyBread, styleDirTree, styleDepTree },
data() {
return {
+ insertFileGuid: "",
+ insertViewGuid: "",
+ insertFileName: "",
+ insertViewName: "",
+
+ insertform: {
+
+ },
dialogFormVisible: false,
InsertFormdialog: false,
showCata: false,
@@ -940,10 +948,7 @@
showDirCata: false,
showDepCata: false,
tableData: [],
- insertform: {
- fileGuid: null,
- viewGuid: null,
- },
+
dirFlag: null,
depFlag: null,
guidFile: null,
@@ -1012,15 +1017,19 @@
$("#insertimageFile").click();
}
},
- insertFile(res) {
+ insertFileData: function (res) {
+
+
if (res == 0) {
- var val = document.getElementById("insertFile").files;
- if (!val || !val.length) return;
- this.insertform.fileGuid = val[0].name;
+ let val = document.getElementById("insertFile").files;
+
+ this.insertFileGuid = val[0].name;
+ this.insertFileName = val[0].name;
} else if (res == 1) {
- var val = document.getElementById("insertimageFile").files;
- if (!val || !val.length) return;
- this.insertform.viewGuid = val[0].name;
+ let val = document.getElementById("insertimageFile").files;
+
+ this.insertViewGuid = val[0].name;
+ this.insertViewName = val[0].name;
}
},
async setinsertFile(res) {
@@ -1208,9 +1217,10 @@
insertFromDataClose() {
this.InsertFormdialog = false;
this.insertform = {
- fileGuid: null,
- viewGuid: null,
+
}
+ this.insertFileGuid = "";
+ this.insertViewGuid = ""
this.filesReset();
},
handleClose() {
@@ -1231,10 +1241,13 @@
}
if (this.guidFile != null) {
this.insertform.fileGuid = this.guidFile;
+ this.insertform.fname = this.insertFileName;
}
if (this.viewFile != null) {
this.insertform.viewGuid = this.viewFile;
+ this.insertform.vname = this.insertViewName;
}
+
const data = await insertStyle(this.insertform);
if (data.code == 200) {
this.InsertFormdialog = false;
@@ -1242,6 +1255,8 @@
fileGuid: null,
viewGuid: null,
}
+ this.insertFileGuid = "";
+ this.insertViewGuid = ""
this.filesReset();
this.$message({
message: "娣诲姞鎴愬姛锛�",
@@ -1261,6 +1276,7 @@
}
this.listData.name = this.ruleForm.name;
const data = await select_Style_ByPageAndCount(this.listData);
+ debugger
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触");
}
@@ -1466,6 +1482,7 @@
showDetail(index, row) {
var token = getToken();
this.showinfoBox = true;
+
this.itemdetail = row;
this.itemdetail.createTime = this.formomentTime(
this.itemdetail.createTime
diff --git a/src/views/maintenance/mochaitmo.vue b/src/views/maintenance/mochaitmo.vue
index 64af125..4db2e0e 100644
--- a/src/views/maintenance/mochaitmo.vue
+++ b/src/views/maintenance/mochaitmo.vue
@@ -41,7 +41,7 @@
<system-monitoring v-if="setMenuFlag == 'systemMonitoring'"></system-monitoring>
<parameter-configuration v-if="setMenuFlag == 'parameterConfiguration'"></parameter-configuration>
<downlog v-if="setMenuFlag == 'downlog'"></downlog>
- <template-manage v-if="setMenuFlag == 'templateManage'"></template-manage>
+ <template-manage v-if="setMenuFlag == 'templateManage'"></template-manage>
</div>
</div>
@@ -70,7 +70,7 @@
import parameterConfiguration from '@/views/maintenance/parameterConfiguration.vue'; //绯荤粺閰嶇疆
import downlog from '@/views/maintenance/downlog.vue'; //涓嬭浇鏃ュ織
import templateManage from '@/views/userManage/templateManage.vue'//妯℃澘绠＄悊
-import { selectMenuRecursive, queryMenuTree, getPerms } from '../../api/api';
+import { selectMenuRecursive, queryMenuTree, getPerms, sign_insertOpLog } from '../../api/api';
import customElMenu from '../../components/customElMenu.vue';
export default {
@@ -95,7 +95,8 @@
parameterConfiguration,
customElMenu,
downlog,
- templateManage
+ templateManage,
+
},
data() {
return {
@@ -116,6 +117,7 @@
editUnit: false,
itemdetail: {},
formLabelWidth: '70px',
+ m1: null,
};
},
created() { },
@@ -179,6 +181,7 @@
this.$store.state.permsEntity = data.result;
}
var store = this.menuList[0];
+ this.m1 = store.cnName;
this.setViewController(store);
},
getTimeCookies() {
@@ -209,9 +212,9 @@
this.getCookies();
const hanleselectmochaitmo = sessionStorage.getItem('hanleselectmochaitmo')
if (hanleselectmochaitmo) {
- this.$nextTick(function (){
+ this.$nextTick(function () {
this.handleselecttwo(JSON.parse(hanleselectmochaitmo).url, JSON.parse(hanleselectmochaitmo))
- this.setViewController(JSON.parse(hanleselectmochaitmo))
+ this.setViewController(JSON.parse(hanleselectmochaitmo))
})
}
//
@@ -224,16 +227,28 @@
// this.treeList = this.treeData(data.result);
},
+ async signInsertOpLog(m1, m2) {
+ var obj = {
+ m1: m1,
+ m2: m2,
+ }
+ const data = await sign_insertOpLog(obj);
+
+
+ },
setViewController(res) {
if (res == null) {
return;
}
+
if (res.children != null) {
+
+
this.setViewController(res.children[0]);
} else {
this.$store.state.currentPerms = res.perms;
-
+ this.signInsertOpLog(this.m1, res.cnName)
this.setMenuFlag = res.url;
this.activeIndex = res.url;
}
@@ -258,6 +273,7 @@
handleselect(index, indexPath, e) {
this.getTimeCookies();
+ this.signInsertOpLog(this.m1, e.$attrs.perms.cnName)
const a = JSON.stringify(e.$attrs.perms)
sessionStorage.setItem('hanleselectmochaitmo', a)
@@ -270,7 +286,7 @@
index = 'dataIfream';
}
}
-
+
this.setMenuFlag = index;
},
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 50c4e25..b4e80e0 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -21,7 +21,7 @@
:label="$t('userManage.RM.ownedSystem')"
prop="ownedSystem"
>
- <el-select
+ <el-select
:popper-append-to-body="false"
v-model="roleForm.depValue"
placeholder="璇烽�夋嫨"
@@ -221,6 +221,7 @@
:label-width="formLabelWidth"
>
<el-input
+ style="width:95%"
v-model="insertform.name"
autocomplete="off"
></el-input>
@@ -268,6 +269,7 @@
:label-width="formLabelWidth"
>
<el-input
+ style="width:95%"
v-model="insertform.descr"
autocomplete="off"
></el-input>
@@ -290,6 +292,7 @@
:label-width="formLabelWidth"
>
<el-input
+ style="width:95%"
v-model="insertform.bak"
autocomplete="off"
></el-input>
@@ -333,7 +336,7 @@
:label-width="formLabelWidth"
:prop="updateform.depValue"
>
- <el-select
+ <el-select
:popper-append-to-body="false"
v-model="updateform.depValue"
placeholder="璇烽�夋嫨"
@@ -353,7 +356,7 @@
/>
</el-option>
</el-select>
-
+
<!-- <el-input
v-model="updateform.depValue"
:disabled="true"
@@ -542,8 +545,8 @@
InsertFormdialog: false,
UpdateFormdialog: false,
roleForm: {
- depid:'',
- depValue:'',
+ depid: '',
+ depValue: '',
},
cataName: '',
depValue: '',
@@ -574,8 +577,8 @@
};
},
methods: {
- handleRouleDepList(data, node, nodeData){
- this.roleForm.depid = data.id
+ handleRouleDepList(data, node, nodeData) {
+ this.roleForm.depid = data.id
this.roleForm.depValue = data.name;
},
handleDepList(data, node, nodeData) {
@@ -761,31 +764,31 @@
std.push(this.multipleSelection[i].id);
}
this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(async () => {
- const data = await deleteRoles({ ids: std.toString() });
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(async () => {
+ const data = await deleteRoles({ ids: std.toString() });
- if (data.code == 200) {
- this.InsertFormdialog = false;
- this.$message({
- message: '鍒犻櫎鎴愬姛锛�',
- type: 'success',
- });
- this.getRoleTabelData();
- } else {
- this.$message({
- message: '鍒犻櫎澶辫触锛�',
- type: 'warning',
- });
- }
- }).catch(() => {
+ if (data.code == 200) {
+ this.InsertFormdialog = false;
this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- });
+ message: '鍒犻櫎鎴愬姛锛�',
+ type: 'success',
+ });
+ this.getRoleTabelData();
+ } else {
+ this.$message({
+ message: '鍒犻櫎澶辫触锛�',
+ type: 'warning',
+ });
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
});
+ });
},
handleSizeChange(val) {
this.listData.pageSize = val;
@@ -867,7 +870,7 @@
}
.inquire {
height: auto;
-
+
padding: 10px;
margin-top: 10px;
margin-top: 10px;
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index 39a1a06..b46d4fb 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -196,10 +196,24 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('common.domCode')">
- <el-input
+ <!-- <el-input
style="width:100%"
v-model=" editForm.code"
- ></el-input>
+ ></el-input> -->
+ <el-select
+ :popper-append-to-body="false"
+ style="width:100%"
+ v-model="editForm.code"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item :label="$t('common.filePath')">
<div class="BoxFlex">
@@ -369,6 +383,16 @@
components: { MyBread, },
data() {
return {
+ options: [{
+ value: 'countSizes',
+ label: '鏁版嵁閲忕粺璁�'
+ }, {
+ value: 'countServices',
+ label: '鏈嶅姟璋冪敤閲忕粺璁�'
+ }, {
+ value: 'countOperates ',
+ label: '鐢ㄦ埛娴侀噺缁熻'
+ }],
itemdetail: {},
showinfoBox: false,
behavior: '鏂板',
@@ -437,6 +461,13 @@
} else if (parseInt(row.type) == 2) {
this.itemdetail.fileType = "Excel妯℃澘"
}
+ if (row.code == 'countSizes') {
+ this.itemdetail.code = "鏁版嵁閲忕粺璁�"
+ } else if (row.code == 'countServices') {
+ this.itemdetail.code = "鏈嶅姟璋冪敤閲忕粺璁�"
+ }else if (row.code == 'countOperates') {
+ this.itemdetail.code = "鐢ㄦ埛娴侀噺缁熻"
+ }
this.itemdetail.uTime = this.format(row.updateTime);
this.showinfoBox = true
@@ -466,9 +497,9 @@
//鏂囦欢绫诲瀷鍒囨崲
selFileTypeChange(val) {
if (parseInt(val) == 1) {
- this.selectFileType = ".doc,.docx"
+ this.selectFileType = ".docx"
} else if (parseInt(val) == 2) {
- this.selectFileType = ".xls,.xlsx"
+ this.selectFileType = ".xlsx"
}
},
//淇敼
@@ -476,9 +507,9 @@
this.behavior = "淇敼"
this.editForm = row;
if (parseInt(row.type) == 1) {
- this.selectFileType = ".doc,.docx"
+ this.selectFileType = ".docx"
} else if (parseInt(row.type) == 2) {
- this.selectFileType = ".xls,.xlsx"
+ this.selectFileType = ".xlsx"
}
this.dialogVisible = true;
},
--
Gitblit v1.9.3