From 41a2ddabb399c51821ccd606736d4e4c403c4238 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期四, 24 十一月 2022 17:12:25 +0800
Subject: [PATCH] 上传处置结果处理
---
src/components/edit/index.vue | 7
src/api/users.js | 4
src/views/systemSetting/device/grid/index.vue | 1
src/views/operate/fivepack/threepack/components/aside/index.vue | 23 +
src/views/operate/message/myIndex/index.vue | 31 +
src/router/index.js | 18
src/views/operate/message/mycontrol/index.vue | 7
src/views/layout/components/Menu/index.vue | 32 -
src/views/operate/images/updateUser/index.vue | 22 +
src/views/operate/video/updateInterface/index.vue | 139 ++++-------
src/components/detail/index.vue | 5
src/views/operate/images/index.vue | 7
src/views/operate/sms/smsTemplate/index.vue | 6
src/views/operate/message/myIndex/update/index.vue | 8
src/views/video/index.vue | 18
src/api/system/department.js | 7
src/components/filePictrue/index.vue | 5
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue | 1
src/views/systemSetting/device/grid/components/main/index.vue | 311 ++++++++-----------------
src/views/systemSetting/platform/mySetting/index.vue | 3
src/views/operate/sms/smsTemplate/createTemplate/index.vue | 21 +
21 files changed, 274 insertions(+), 402 deletions(-)
diff --git a/src/api/system/department.js b/src/api/system/department.js
new file mode 100644
index 0000000..2e02049
--- /dev/null
+++ b/src/api/system/department.js
@@ -0,0 +1,7 @@
+import http from "@/http";
+
+export default {
+ getDepartmentList: () => {
+ return http.get('/sccg/sccg_region/getTree');
+ }
+}
\ No newline at end of file
diff --git a/src/api/users.js b/src/api/users.js
index e8ee262..0aa85ac 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -6,5 +6,9 @@
getMessageAuditList: (params) => {
return http.get('/sccg/message_column_set/getUserColumnSet', params);
+ },
+
+ getMenu: (params) => {
+ return http.get('/sccg/admin/info', params);
}
};
\ No newline at end of file
diff --git a/src/components/detail/index.vue b/src/components/detail/index.vue
index 33cd86a..46df99b 100644
--- a/src/components/detail/index.vue
+++ b/src/components/detail/index.vue
@@ -169,18 +169,15 @@
baseCase:{},
handlePassVo:{},
currentSitVo:{},
- // problemProVo:{},
filesPictureVo:{}
}
},
created() {
- console.log('created');
- const {info} = this;
+ const {info} = this;
this.baseCase = info.baseCase;
this.handlePassVo = info.handlePassVo;
this.currentSitVo = info.currentSitVo;
- // this.problemProVo = info.problemProVo;
this.filesPictureVo = info.filesPictureVo;
console.log(info);
},
diff --git a/src/components/edit/index.vue b/src/components/edit/index.vue
index 9be350b..176a870 100644
--- a/src/components/edit/index.vue
+++ b/src/components/edit/index.vue
@@ -7,6 +7,12 @@
import wangEditor from 'wangeditor'
export default {
+ props: {
+ readOnly: {
+ type: Boolean,
+ default: () => false
+ }
+ },
data() {
return {
editor: null
@@ -19,6 +25,7 @@
this.editor.customConfig.colors = ['#4b9bb7', '#09152f'];
this.editor.customConfig.placeholder = '璇疯緭鍏�';
this.editor.customConfig.onchangeTimeout = 500;
+ this.editor.customConfig.readOnly = this.readOnly;
this.editor.customConfig.onfocus = () => {
this.editor.customConfig.placeholder = '';
}
diff --git a/src/components/filePictrue/index.vue b/src/components/filePictrue/index.vue
index ce10e5d..dc2885d 100644
--- a/src/components/filePictrue/index.vue
+++ b/src/components/filePictrue/index.vue
@@ -26,8 +26,6 @@
</div>
</div>
</div>
- <!-- <img src="https://axure-file.lanhuapp.com/90466432-c999-4bf0-80b8-ee3f96a2099e__ef98ada722c616eccb097d1352880862.svg"
- alt=""> -->
</div>
</div>
</div>
@@ -42,10 +40,7 @@
},
props: ['filesPictureVo', 'mycode'],
created() {
- // this.imgSource =this.filesPictureVo
const { filesPictureVo: { imageResources: imgList } } = this
- // this.createTime=this.filesPictureVo.imageResources[0].createTime;
- // console.log(this.imgSource);
this.getEventInfo(this.mycode);
},
methods: {
diff --git a/src/router/index.js b/src/router/index.js
index 6e8f25d..669edef 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -220,8 +220,7 @@
path: 'managementMessage',
name: 'managementMessage',
component: () => import('@/views/operate/management/message'),
- },
- ]
+ }]
},
{
path: 'car',
@@ -298,19 +297,20 @@
component: () => import('@/views/operate/images'),
},
{
- path: 'writManager',
- name: 'writManager',
+ path: 'writManagement',
+ name: 'writManagement',
component: () => import('@/views/operate/writManager/writ'),
+ redirect: '/home/operate/writManager/writ',
children: [
- {
- path: 'writ',
- name: 'writ',
- component: () => import('@/views/operate/writManager/writ'),
- },
{
path: 'writTemplate',
name: 'writTemplate',
component: () => import('@/views/operate/writManager/writTemplate'),
+ },
+ {
+ path: 'writ',
+ name: 'writ',
+ component: () => import('@/views/operate/writManager/writ'),
}
]
}]
diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index df82b94..680d186 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -64,7 +64,8 @@
</template>
<script>
-let timer = null;
+import users from "@/api/users";
+
export default {
data() {
return {
@@ -72,32 +73,17 @@
};
},
created() {
- // this.getMenuList();
this.loadMenu();
},
methods: {
loadMenu() {
- const info = JSON.parse(sessionStorage.getItem("user"));
-
- if (info && info.menus) {
- window.clearInterval(timer);
- this.menuList = info.menus;
- } else {
- if (!timer) {
- timer = window.setInterval(() => {
- this.loadMenu();
- }, 1000);
- }
- }
- },
- // 鑾峰彇鑿滃崟鍒楄〃
- getMenuList() {
- let arr;
- this.$axios({
- method: "get",
- url: "sccg/system/portal/menu/search_myself",
- }).then((res) => {
- });
+ const userName = sessionStorage.getItem('name');
+ users.getMenu({ name: userName })
+ .then(res => {
+ this.menuList = res.menus;
+ sessionStorage.setItem('user', JSON.stringify(res));
+ })
+ .catch(err => this.$message.error(err))
},
},
};
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
index 957a25a..c105120 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
@@ -303,7 +303,6 @@
},
// 妫�楠寀ser
checkUser() {
- debugger;
this.$refs.userForm.validate((valid) => {
if (valid) {
this.userFlag = false;
diff --git a/src/views/operate/fivepack/threepack/components/aside/index.vue b/src/views/operate/fivepack/threepack/components/aside/index.vue
index f5ab6f7..bb4d5a6 100644
--- a/src/views/operate/fivepack/threepack/components/aside/index.vue
+++ b/src/views/operate/fivepack/threepack/components/aside/index.vue
@@ -2,34 +2,47 @@
<div class="aside">
<div class="title">缁勭粐鏈烘瀯</div>
<div class="input">
- <el-input placeholder="杈撳叆缁勭粐鏈烘瀯鍚嶇О" v-model="searchArea"></el-input>
+ <el-input placeholder="杈撳叆缁勭粐鏈烘瀯鍚嶇О, 鎸変笅enter閿悳绱�" v-model="searchArea" @change="filterTreeNode"></el-input>
</div>
<div class="menu">
- <el-tree :data="areaData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+ <el-tree ref="department" :filter-node-method="filterNode" :data="areaData" :props="defaultProps"></el-tree>
</div>
</div>
</template>
<script>
+import department from "@/api/system/department";
export default {
+ name: 'departmentAside',
data() {
return {
searchArea: null,
areaData: [],
defaultProps: {
children: 'children',
- label: 'label'
+ label: 'regionName'
}
};
},
created() {
+ department.getDepartmentList()
+ .then(res => {
+ this.areaData = res;
+ })
+ .catch(err => this.$message.error(err))
},
methods: {
- handleNodeClick(data) {
- }
+ filterTreeNode() {
+ this.$refs.department.filter(this.searchArea);
+ },
+
+ filterNode(value, data) {
+ if (!value) return true;
+ return data.regionName.indexOf(value) !== -1;
}
+ }
};
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index c7b5f36..75f17e9 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -43,12 +43,12 @@
<el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="8">
- <template slot-scope="scope">
+ <template v-if="scope.row.category" slot-scope="scope">
<span>{{ getCategory(scope.row.category).label }}</span>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="浜嬩欢鏉ユ簮" min-width="8">
- <template slot-scope="scope">
+ <template v-if="scope.row.eventSource" slot-scope="scope">
<span>{{ getEventSource(scope.row.eventSource).label }}</span>
</template>
</el-table-column>
@@ -261,7 +261,7 @@
dateParams.startTime = dateParams[0];
dateParams.endTime = dateParams[1]
}
- imageManagement.getImageResources({ current: this.currentPage, size: this.size, type: this.type, ...dateParams })
+ imageManagement.getImageResources({ current: this.currentPage, size: this.pageSize, type: this.type, ...dateParams })
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
@@ -298,6 +298,7 @@
closeDialog() {
this.isShowUploadDialog = false;
+ this.getImageResourceList();
},
getCategory(value) {
diff --git a/src/views/operate/images/updateUser/index.vue b/src/views/operate/images/updateUser/index.vue
index 7cf2e92..f326791 100644
--- a/src/views/operate/images/updateUser/index.vue
+++ b/src/views/operate/images/updateUser/index.vue
@@ -2,9 +2,9 @@
<div class="updateUser">
<main>
<div class="mainContent">
- <el-form :model="imagedata" :rules="rules" :disabled="isDisabled" ref="user" style="width: 100%;">
- <el-form-item prop="baseId" label="鎵�灞炰簨浠剁紪鍙�">
- <el-input v-model="imagedata.baseId"></el-input>
+ <el-form label-position="right" label-width="150px" :model="imagedata" :rules="rules" :disabled="isDisabled" ref="user" style="width: 100%;">
+ <el-form-item prop="belongToId" label="鎵�灞炰簨浠剁紪鍙�">
+ <el-input v-model="imagedata.belongToId"></el-input>
</el-form-item>
<el-form-item prop="eventSource" label="浜嬩欢鏉ユ簮">
<el-input v-model="imagedata.eventSource"></el-input>
@@ -31,7 +31,7 @@
:show-file-list="false"
:auto-upload="true"
:http-request="imageUpload">
- <img v-if="imagedata.url" :src="imagedata.url" class="avatar">
+ <img v-if="imagedata.url" :src="imagedata.url" class="avatar" width="100px" height="100px">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
@@ -59,7 +59,7 @@
};
return {
imagedata: {
- baseId: '',
+ belongToId: '',
eventSource: '',
regionName: '',
category: '',
@@ -68,7 +68,7 @@
type: ''
},
rules: {
- baseId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ墍灞炰簨浠剁紪鍙�' }],
+ belongToId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ墍灞炰簨浠剁紪鍙�' }],
eventSource: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ヤ簨浠舵潵婧�' }],
regionName: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ョぞ鍖哄悕绉�' }],
id: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ュ浘鐗嘔d' }],
@@ -91,15 +91,21 @@
onSubmit() {
this.$refs.user.validate(valid => {
if (valid) {
+ const params = Object.assign({}, this.imagedata);
+ delete params.regionName;
+ delete params.category;
+ delete params.eventSource;
+ delete params.id;
+ params.belongToId = +params.belongToId;
if (this.dialogType === 'create') {
- imageManagement.addImageResource(this.imagedata)
+ imageManagement.addImageResource(params)
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛');
this.$emit('closeDialog');
})
.catch(err => this.$message.error(`${err}`))
} else {
- imageManagement.updateImageResource(this.imagedata)
+ imageManagement.updateImageResource(params)
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛');
this.$emit('closeDialog');
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index d5b811c..5c5e69b 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -10,19 +10,23 @@
<span>杈撳叆鏌ヨ:</span>
<el-input placeholder="娑堟伅鏍囬" v-model="context"></el-input>
</div>
- <div class="message-status">
+ <div class="search">
<span>娑堟伅鐘舵��:</span>
<el-select v-model="messageStatus" placeholder="璇烽�夋嫨娑堟伅鐘舵��">
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
- <div class="message-kind">
+ <div class="search">
<span>娑堟伅鍒嗙被:</span>
<el-select v-model="messageType" placeholder="璇烽�夋嫨娑堟伅鍒嗙被">
<el-option v-for="item in typeList" :key="item.id" :label="item.columnName" :value="item.id">
</el-option>
</el-select>
+ </div>
+ <div class="search">
+ <span>淇敼鏃堕棿:</span>
+ <el-date-picker style="width: 200px" type="datetimerange" v-model="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</div>
<div class="find">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">鏌ヨ</el-button>
@@ -144,6 +148,7 @@
unsame: false,
myIdx: 0,
preMyIdx: 0,
+ datetime: null,
options: [
{
value: 0,
@@ -190,11 +195,11 @@
columnName:'绔欏唴淇�',
},
{
- id:'02',
+ id:'03',
columnName:'閭欢',
},
{
- id:'03',
+ id:'02',
columnName:'鐭俊',
}
]
@@ -243,9 +248,11 @@
const messageParam = {
current: this.currentPage,
size: this.pageSize,
- channelCode: this.messageType,
- status: this.messageStatus,
- head: this.context
+ channelCode: this.messageType === '00' ? null : this.messageType,
+ status: this.messageStatus === 2 ? null : this.messageStatus,
+ head: this.context,
+ startTime: this.datetime ? this.datetime[0] : null,
+ endTime: this.datetime ? this.datetime[1] : null
}
getMessageList(messageParam)
.then(({ records, total }) => {
@@ -375,11 +382,10 @@
justify-content: space-between;
align-items: center;
- .search,
- .message-status,
- .message-kind {
+ .search {
display: flex;
- justify-content: flex-start;
+ justify-content: space-between;
+ align-items: center;
span {
flex: 1;
@@ -595,5 +601,8 @@
&::v-deep .el-dialog__body {
padding: 0;
}
+ :deep(.el-range-input) {
+ background-color: #09152f;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 2b674af..f8a1f91 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -13,8 +13,8 @@
<!-- 鎻愰啋鏂瑰紡 -->
<el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode">
<el-radio-group v-model="role.channelCode">
- <el-radio value="01">绔欏唴淇�</el-radio>
- <el-radio value="03">閭欢</el-radio>
+ <el-radio label="01">绔欏唴淇�</el-radio>
+ <el-radio label="03">閭欢</el-radio>
</el-radio-group>
<span class="message-tip">(鐭俊鍙敤鏁�: 1000鏉�)</span>
</el-form-item>
@@ -148,11 +148,11 @@
};
return {
role: {
- messageType: "",
+ messageType: null,
head: "",
targetTo: "",
body: "",
- channelCode: "01",
+ channelCode: null,
},
createRoleRules: {
messageType: [
diff --git a/src/views/operate/message/mycontrol/index.vue b/src/views/operate/message/mycontrol/index.vue
index 1a15265..7df41b8 100644
--- a/src/views/operate/message/mycontrol/index.vue
+++ b/src/views/operate/message/mycontrol/index.vue
@@ -69,7 +69,6 @@
tableData: [],
dialogCreate: false,
dialogEdit:false,
- totalNum: null,
pageSize: 10,
currentPage: 1,
all: false,
@@ -130,13 +129,12 @@
})
},
// 淇敼鏍忕洰鐘舵��
- handleChangeStatus({ id, status }) {
- status === true ? status = 1 : status = 0;
+ handleChangeStatus({ id, isShow }) {
this.$axios({
method: 'post',
url: `sccg/message_column/update/${id}`,
data: {
- isShow: status,
+ isShow: Number(isShow),
}
})
.then(res => {
@@ -163,7 +161,6 @@
// 璁剧疆琛ㄦ牸鏁版嵁
async setTableData() {
this.tableData = await this.getColumnList();
- this.totalNum = this.tableData.length;
},
// 涓嬫媺妗嗙洃鍚�
async selectChange(list) {
diff --git a/src/views/operate/sms/smsTemplate/createTemplate/index.vue b/src/views/operate/sms/smsTemplate/createTemplate/index.vue
index db35460..bbf7f60 100644
--- a/src/views/operate/sms/smsTemplate/createTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/createTemplate/index.vue
@@ -2,7 +2,7 @@
<div class="createUser">
<main>
<div class="mainContent">
- <el-form ref="user" label-width="140px" autoComplete="on" :model="role" :rules="createRoleRules"
+ <el-form ref="user" :disabled="formDisabled" label-width="140px" autoComplete="on" :model="role" :rules="createRoleRules"
label-position="right">
<!-- 娑堟伅鏍忕洰 -->
<el-form-item class="optionItem" label="妯℃澘绫诲瀷:" prop="type">
@@ -17,16 +17,16 @@
</div>
</el-form-item>
<!-- 娑堟伅鏍囬 -->
- <el-form-item class="optionItems" label="娑堟伅鏍囬:" prop="title" :disabled="disabled">
+ <el-form-item class="optionItems" label="娑堟伅鏍囬:" prop="title">
<div class="message-item__left">
<el-input v-model="role.title" placeholder="璇烽�夋嫨娑堟伅鏍囬"></el-input>
</div>
</el-form-item>
<!-- 娑堟伅鍐呭 -->
- <el-form-item class="optionItem" label="娑堟伅鍐呭:" prop="body" :disabled="disabled">
- <MyEditor ref="edit" @getMyBody="getMyBody" ></MyEditor>
+ <el-form-item class="optionItem" label="娑堟伅鍐呭:" prop="body">
+ <MyEditor ref="edit" :readOnly="formDisabled" @getMyBody="getMyBody"></MyEditor>
</el-form-item>
- <el-form-item>
+ <el-form-item v-if="!formDisabled">
<div class="optionBtn">
<el-button type="primary" @click.native.prevent="handleSubmit(0)" class="btn save">淇濆瓨
</el-button>
@@ -71,7 +71,6 @@
]
},
colList: [{ id: "1", columnName: "楠岃瘉鐮佹ā鏉�"}, {id: "2",columnName: "娲诲姩妯℃澘"}],
- disabled: this.dialogType === 'view'
}
},
created() {
@@ -79,12 +78,18 @@
this.role = deepClone(this.tableRowData);
}
},
+
+ computed: {
+ formDisabled() {
+ return this.dialogType !== 'create';
+ }
+ },
methods: {
// 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅)
handleSubmit() {
this.$refs.user.validate((valid) => {
if (valid) {
- if (this.dialogType === 'created') {
+ if (this.dialogType === 'create') {
SMS.addNewSMSTemplate(this.role)
.then(() => {
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
@@ -114,7 +119,7 @@
handleReset() {
this.$refs.edit.editor.txt.clear();
this.$refs.user.resetFields();
- }
+ },
},
props: ['tableRowData', 'dialogType']
}
diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue
index 9a41d57..e750f1b 100644
--- a/src/views/operate/sms/smsTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/index.vue
@@ -27,7 +27,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="isShowDialog = true; dialogType = 'created'">娣诲姞</el-button>
+ <el-button type="primary" icon="el-icon-plus" @click="isShowDialog = true; dialogType = 'create'">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
@@ -63,9 +63,9 @@
</el-table-column>
</el-table>
<!-- 鏂板缓娑堟伅 -->
- <el-dialog title="鏂板缓鐭俊妯℃澘" :visible.sync="isShowDialog" v-if="isShowDialog" width="80%"
+ <el-dialog :title="dialogType === 'create' ? '鏂板缓鐭俊妯℃澘' : '鏌ョ湅鐭俊妯℃澘'" :visible.sync="isShowDialog" width="80%"
:before-close="handleConfirmClose">
- <MyCreate @closeMyDialog="handleConfirmClose" :dialogType="dialogType" :tableRowData="messageTemplateData"></MyCreate>
+ <MyCreate v-if="isShowDialog" @closeMyDialog="handleConfirmClose" :dialogType="dialogType" :tableRowData="messageTemplateData"></MyCreate>
</el-dialog>
<div class="tools">
<div class="funs">
diff --git a/src/views/operate/video/updateInterface/index.vue b/src/views/operate/video/updateInterface/index.vue
index 438d666..9135a69 100644
--- a/src/views/operate/video/updateInterface/index.vue
+++ b/src/views/operate/video/updateInterface/index.vue
@@ -1,46 +1,40 @@
<template>
<div class="updateUser">
- <main>
- <div class="mainContent">
- <el-form :model="videoData" :rules="rules" :disabled="isDisabled" ref="user" style="width: 100%;">
- <el-form-item prop="baseId" label="鎵�灞炰簨浠剁紪鍙�">
- <el-input v-model="videoData.baseId"></el-input>
- </el-form-item>
- <el-form-item prop="eventSource" label="浜嬩欢鏉ユ簮">
- <el-input v-model="videoData.eventSource"></el-input>
- </el-form-item>
- <el-form-item prop="category" label="闂绫诲埆">
- <el-input v-model="videoData.category"></el-input>
- </el-form-item>
- <el-form-item prop="type" label="绫诲瀷">
- <el-select v-model="videoData.type">
- <el-option v-for="item in getResourceType()" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item prop="regionName" label="绀惧尯鍚嶇О">
- <el-input v-model="videoData.regionName"></el-input>
- </el-form-item>
- <el-form-item prop="id" label="瑙嗛Id">
- <el-input v-model="videoData.id"></el-input>
- </el-form-item>
- <el-form-item prop="url" label="瑙嗛" min-width="8">
- <el-upload
- class="avatar-uploader"
- action=""
- ref="image"
- :show-file-list="false"
- :auto-upload="true"
- :http-request="videoUpload">
- <video controls v-if="videoData.url" :src="videoData.url" />
- <i v-else class="el-icon-plus avatar-uploader-icon"></i>
- </el-upload>
- </el-form-item>
- <div v-if="!isDisabled" class="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="onSubmit">鎻愪氦</el-button>
- </div>
- </el-form>
- </div>
- </main>
+ <el-form label-position="right" label-width="150px" :model="videoData" :rules="rules" :disabled="isDisabled" ref="user">
+ <el-form-item prop="belongToId" label="鎵�灞炰簨浠剁紪鍙�">
+ <el-input v-model="videoData.belongToId"></el-input>
+ </el-form-item>
+ <el-form-item prop="eventSource" label="浜嬩欢鏉ユ簮">
+ <el-input v-model="videoData.eventSource"></el-input>
+ </el-form-item>
+ <el-form-item prop="category" label="闂绫诲埆">
+ <el-input v-model="videoData.category"></el-input>
+ </el-form-item>
+ <el-form-item prop="type" label="绫诲瀷">
+ <el-select v-model="videoData.type">
+ <el-option v-for="item in getResourceType()" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="regionName" label="绀惧尯鍚嶇О">
+ <el-input v-model="videoData.regionName"></el-input>
+ </el-form-item>
+ <el-form-item prop="id" label="瑙嗛Id">
+ <el-input v-model="videoData.id"></el-input>
+ </el-form-item>
+ <el-form-item prop="url" label="瑙嗛" min-width="8">
+ <el-upload
+ class="avatar-uploader"
+ action=""
+ ref="image"
+ :show-file-list="false"
+ :auto-upload="true"
+ :http-request="videoUpload">
+ <video controls v-if="videoData.url" :src="videoData.url" width="300px" height="200px" />
+ <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+ </el-upload>
+ </el-form-item>
+ <el-button v-if="!isDisabled" class="submit-button" type="primary" @click.native.prevent="onSubmit">鎻愪氦</el-button>
+ </el-form>
</div>
</template>
<script>
@@ -48,7 +42,6 @@
import videoManagement from "@/api/operate/videoManagement";
import { FILE_ORIGINAL_URL } from "@/utils";
import imageManagement from "@/api/operate/imageManagement";
-
export default {
data() {
@@ -61,7 +54,7 @@
};
return {
videoData: {
- baseId: '',
+ belongToId: '',
eventSource: '',
regionName: '',
category: '',
@@ -70,7 +63,7 @@
type: ''
},
rules: {
- baseId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ墍灞炰簨浠剁紪鍙�' }],
+ belongToId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ墍灞炰簨浠剁紪鍙�' }],
eventSource: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ヤ簨浠舵潵婧�' }],
regionName: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ョぞ鍖哄悕绉�' }],
id: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ュ浘鐗嘔d' }],
@@ -91,15 +84,21 @@
onSubmit() {
this.$refs.user.validate(valid => {
if (valid) {
+ const params = Object.assign({}, this.videoData);
+ delete params.regionName;
+ delete params.category;
+ delete params.eventSource;
+ delete params.id;
+ params.belongToId = +params.belongToId;
if (this.isUpdate && !this.dialogData) {
- videoManagement.addVideoResource(this.videoData)
+ videoManagement.addVideoResource(params)
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛');
this.$emit('closeDialog');
})
.catch(err => this.$message.error(`${err}`))
} else {
- videoManagement.updateVideoResource(this.videoData)
+ videoManagement.updateVideoResource(params)
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛');
this.$emit('closeDialog');
@@ -145,50 +144,12 @@
.updateUser {
border-radius: 1px;
background-color: #09152f;
+ display: flex;
+ justify-content: center;
+ align-items: center;
- main {
- // border: 1px solid #fff;
- text-align: left;
- padding: 0 55px;
- background-color: #09152f;
- padding-bottom: 50px;
-
- .mainContent {
- display: flex;
- justify-content: center;
- padding-top: 50px;
-
- .el-form-item__content {
- width: 400px;
-
- .el-select {
- width: 100%;
- }
- }
-
- .optionHandleSp {
- display: flex;
-
- .areaNumber,
- .moreNumber {
- flex: 1;
- }
-
- .telNumber {
- flex: 2;
- }
- }
-
- .optionBtn {
- display: flex;
- margin-top: 20px;
- justify-content: center;
-
- .btn {
- padding: 12px 50px;
- }
- }
- }
+ .submit-button {
+ margin-left: 200px;
}
}
diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue
index 9f53242..48545d9 100644
--- a/src/views/systemSetting/device/grid/components/main/index.vue
+++ b/src/views/systemSetting/device/grid/components/main/index.vue
@@ -1,106 +1,87 @@
<template>
- <main>
- <div class="mainContent">
- <!-- 鏁版嵁灞曠ず -->
- <el-table ref="multipleTable"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
- :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
- @selection-change="tableChange">
- <el-table-column type="selection" min-width="5">
- </el-table-column>
- <el-table-column label="鐢ㄦ埛ID" min-width="6">
- <template slot-scope="scope">{{ scope.row.id }}</template>
- </el-table-column>
- <el-table-column prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="10">
- </el-table-column>
- <el-table-column prop="username" label="鎵�灞炲鍚�" min-width="8">
- </el-table-column>
- <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
- </el-table-column>
- <el-table-column prop="note" label="鎵�灞炶鑹�" min-width="8">
- <template slot-scope="scope">
- <span>{{filterRole(scope.row.roles)}}</span>
- </template>
- </el-table-column>
- <!-- <el-table-column prop="departName" label="鎵�灞為儴闂�" min-width="8">
- </el-table-column> -->
- <el-table-column prop="jobTitle" label="鎵�灞炶亴鍔�" min-width="8">
- </el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
- <template slot-scope="scope">
- <span>{{changeTime(scope.row)}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="status" label="鍚敤" min-width="5">
- <template slot-scope="scope">
- <!-- @change="handleChangeStatus(scope.row)" -->
- <el-switch class="switchStyle" v-model="scope.row.status"
- active-color="#3fef9a" inactive-color="#000212" disabled>
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
- <!-- <template slot-scope="scope">
- <div class="operation">
- <span @click="handleChangeRole(scope.row,'role')">淇敼瑙掕壊</span>
- <span class="line">|</span>
- <span @click="handleFind(scope.row)">鏌ョ湅</span>
- <span class="line">|</span>
- <span @click="handleChangeRole(scope.row,'password')">淇敼瀵嗙爜</span>
- <span class="line">|</span>
- <span @click="handleDelete(scope.row)">鍒犻櫎</span>
- <span class="line">|</span>
- <span @click="handleChangeRole(scope.row,'depart')">淇敼閮ㄩ棬</span>
- </div>
- </template> -->
- </el-table-column>
- </el-table>
- <!-- 鏌ョ湅椤甸潰 -->
- <el-dialog :visible.sync="dialogView" width="45%" v-if="dialogView"
- title="鏌ョ湅鐢ㄦ埛淇℃伅">
- <MyView :userInfo=userInfo></MyView>
- </el-dialog>
- <!-- 淇敼椤甸潰 -->
- <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate"
- :title="updateFlag ? flag.role ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅' : flag.depart ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅': '淇敼鐢ㄦ埛瀵嗙爜' :''"
- :before-close="handleClose">
- <updateUser :updateFlag="updateFlag" :userInfo=userInfo :flag=flag @closeDialog="closeDialog"
- :getUserList="getUserList" v-if="!flag.password" />
- <MyPwd v-else :userInfo=userInfo @closeDialog="closeDialog"></MyPwd>
- </el-dialog>
- <!-- tools -->
- <div class="tools">
- <div class="funs">
- <div class="funsItem funs-sp">
- <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
- </div>
- <div class="funsItem funs-sp">
- <el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
- </div>
- <div class="funsItem">
- <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </div>
- </div>
- <div class="pagination">
- <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
- :page-size="pageSize" @current-change="changeCurrentPage" @prev-click="handlePrev"
- @next-click="handleNext">
- </el-pagination>
- </div>
- </div>
+ <div class="mainContent">
+ <div class="aside">
+ <department-aside />
+ </div>
+ <div class="grid-content">
+ <!-- 鏁版嵁灞曠ず -->
+ <el-table ref="multipleTable"
+ :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
+ @selection-change="tableChange">
+ <el-table-column type="selection" min-width="5">
+ </el-table-column>
+ <el-table-column label="鐢ㄦ埛ID" min-width="6">
+ <template slot-scope="scope">{{ scope.row.id }}</template>
+ </el-table-column>
+ <el-table-column prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="10">
+ </el-table-column>
+ <el-table-column prop="username" label="鎵�灞炲鍚�" min-width="8">
+ </el-table-column>
+ <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
+ </el-table-column>
+ <el-table-column prop="note" label="鎵�灞炶鑹�" min-width="8">
+ <template slot-scope="scope">
+ <span>{{filterRole(scope.row.roles)}}</span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="departName" label="鎵�灞為儴闂�" min-width="8">
+ </el-table-column> -->
+ <el-table-column prop="jobTitle" label="鎵�灞炶亴鍔�" min-width="8">
+ </el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
+ <template slot-scope="scope">
+ <span>{{changeTime(scope.row)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="status" label="鍚敤" min-width="5">
+ <template slot-scope="scope">
+ <!-- @change="handleChangeStatus(scope.row)" -->
+ <el-switch class="switchStyle" v-model="scope.row.status"
+ active-color="#3fef9a" inactive-color="#000212" disabled>
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+ </el-table-column>
+ </el-table>
+ <!-- 鏌ョ湅椤甸潰 -->
+ <el-dialog :visible.sync="dialogView" width="45%" v-if="dialogView"
+ title="鏌ョ湅鐢ㄦ埛淇℃伅">
+ <MyView :userInfo=userInfo></MyView>
+ </el-dialog>
+ <!-- 淇敼椤甸潰 -->
+ <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate"
+ :title="updateFlag ? flag.role ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅' : flag.depart ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅': '淇敼鐢ㄦ埛瀵嗙爜' :''"
+ :before-close="handleClose">
+ <updateUser :updateFlag="updateFlag" :userInfo=userInfo :flag=flag @closeDialog="closeDialog"
+ :getUserList="getUserList" v-if="!flag.password" />
+ <MyPwd v-else :userInfo=userInfo @closeDialog="closeDialog"></MyPwd>
+ </el-dialog>
+ <!-- tools -->
+ <div class="tools">
+ <div class="funs">
+ <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
+ <el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
+ <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
+ :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </div>
+ <el-pagination class="pagination" background :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
+ :page-size="pageSize" @current-change="changeCurrentPage" @prev-click="handlePrev"
+ @next-click="handleNext">
+ </el-pagination>
</div>
- </main>
+ </div>
+ </div>
</template>
<script>
import helper from '@/utils/mydate'
+import departmentAside from "@/views/operate/fivepack/threepack/components/aside";
export default {
- components: {
-
- },
+ components: { departmentAside },
data() {
return {
tableData: [],
@@ -377,125 +358,37 @@
}
</script>
<style lang="scss" scoped>
-main {
- background-color: #09152f;
- margin-top: 20px;
- padding-bottom: 50px;
- border: 1pox solid #fff;
+.mainContent {
+ display: flex;
+ justify-content: start;
+ flex-wrap: nowrap;
- .mainTitle {
- line-height:60px;
- }
-
+ .grid-content {
+ margin-left: 10px;
+ flex: 1;
.tools {
- display : flex;
- justify-content: space-between;
- align-items: center;
- padding: 0 20px;
+ display: flex;
+ justify-content: space-between;
+ flex-wrap: nowrap;
- .funs {
- display: flex;
- .funs-sp{
- border: 1px solid #17324c;
- }
- .funsItem {
- line-height: 28px;
- display: flex;
- align-items: center;
- border-radius: 4px;
- font-size: 12px;
- margin-left: 10px;
+ .pagination {
+ margin-top: 55px;
+ }
- .el-checkbox {
- width: 80px;
- padding: 0 10px;
- }
-
- .el-select {
- width: 120px;
- }
-
- &::v-deep .el-input__inner {
- border: none;
- background-color: #09152f;
- }
-
- &:hover {
- border: 1px solid #4b9bb7;
- }
-
- &:hover .el-checkbox {
- color: #4b9bb7;
- }
- }
-
+ .el-pagination {
+ &::v-deep li,
+ &::v-deep .btn-prev,
+ &::v-deep .btn-next {
+ background-color: #071f39;
+ color: #4b9bb7;
}
- .pagination {
- margin-top: 50px;
- display: flex;
- line-height: 50px;
- justify-content: center;
-
- .el-pagination {
-
- &::v-deep li,
- &::v-deep .btn-prev,
- &::v-deep .btn-next {
- background-color: #071f39;
- color: #4b9bb7;
- }
-
- &::v-deep .active {
- background-color: #409eff;
- color: #fff;
- }
- }
+ &::v-deep .active {
+ background-color: #409eff;
+ color: #fff;
}
+ }
}
-
- .el-table {
- color: #4b9bb7;
- font-size: 10px;
- .operation {
- display: flex;
- font-size: 10px;
- .line {
- padding: 0 1px;
- }
-
- span:hover {
- cursor: pointer;
- }
- }
- }
- // &::v-deep .switchStyle .el-switch__label {
- // position: absolute;
- // display: none;
- // color: #fff;
- // }
-
- // &::v-deep .el-switch__core {
- // background-color: rgba(166, 166, 166, 1);
- // }
-
- // &::v-deep .switchStyle .el-switch__label--left {
- // z-index: 9;
- // left: 20px;
- // }
-
- // &::v-deep .switchStyle .el-switch__label--right {
- // z-index: 9;
- // left: 4px;
- // }
-
- // &::v-deep .switchStyle .el-switch__label.is-active {
- // display: block;
- // }
-
- // &::v-deep .switchStyle.el-switch .el-switch__core,
- // &::v-deep .el-switch .el-switch__label {
- // width: 56px !important;
- // }
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/systemSetting/device/grid/index.vue b/src/views/systemSetting/device/grid/index.vue
index 4faf378..b63edc5 100644
--- a/src/views/systemSetting/device/grid/index.vue
+++ b/src/views/systemSetting/device/grid/index.vue
@@ -1,6 +1,5 @@
<template>
<div class="userList">
- <myHeader @setDialog="changeDialog" @getSearch="getSearch"></myHeader>
<myMain :refresh="isFresh" :keyword="keyword" @resetFresh="resetFresh" />
</div>
</template>
diff --git a/src/views/systemSetting/platform/mySetting/index.vue b/src/views/systemSetting/platform/mySetting/index.vue
index d95da03..51fec48 100644
--- a/src/views/systemSetting/platform/mySetting/index.vue
+++ b/src/views/systemSetting/platform/mySetting/index.vue
@@ -92,7 +92,6 @@
})
},
handleDelete(data) {
- console.log(data);
this.$confirm('鎮ㄧ‘璁よ鍒犻櫎璁㈠崟鍚�?')
.then(_ => {
this.$axios({
@@ -110,7 +109,6 @@
})
})
.catch(err => {
- console.log(err);
})
},
// 鑾峰彇鑿滃崟鍒楄〃
@@ -171,7 +169,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.main-content {
.my-container {
diff --git a/src/views/video/index.vue b/src/views/video/index.vue
index be892c9..d8df6dc 100644
--- a/src/views/video/index.vue
+++ b/src/views/video/index.vue
@@ -1,13 +1,7 @@
<template>
<el-container style="height: 100%;">
- <el-aside heigth="100%" width="200px ">
- <div style="line-height: 40px;text-align: left;padding: 0 20px 0 10px;">
- <span style="color:rgb(75, 155, 183);font-weight: 500; width: 196px;">缁勭粐鏈烘瀯</span>
- <el-input placeholder="璇疯緭鍏ユ満鏋�"></el-input>
- </div>
- <el-tree :data="treedata" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-
-
+ <el-aside heigth="100%" width="200px">
+ <department-aside />
</el-aside>
<el-container>
@@ -46,8 +40,8 @@
</el-main>
<el-footer>
<div style="margin-bottom:0;">
- <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
- :page-size="pageSize" @current-change="changeCurrentPage" @prev-click="handlePrev" @next-click="handleNext">
+ <el-pagination layout="prev, pager, next" :total="totalNum"
+ :page-size="pageSize">
</el-pagination>
</div>
</el-footer>
@@ -153,9 +147,11 @@
color: rgb(75, 155, 183);
}
</style>
-<script src="https://vjs.zencdn.net/7.20.3/video.min.js"></script>
<script>
+import departmentAside from "@/views/operate/fivepack/threepack/components/aside";
+
export default {
+ components: { departmentAside },
data() {
return {
totalNum:7,
--
Gitblit v1.8.0