From 71e8709a556ec8782e4da4bcae52fa050ef2066f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 26 三月 2024 15:34:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/meeting/approve.vue | 40 ++
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 14
ruoyi-ui/src/views/meeting/replay.vue | 40 ++
ruoyi-ui/src/views/meeting/webcastInfo.vue | 233 ++++++++++++++++
ruoyi-ui/src/views/meeting/webcast.vue | 6
ruoyi-ui/src/assets/images/测试.mp4 | 0
ruoyi-ui/src/views/meeting/approveInfo.vue | 330 +++++++++++++++++++++++
ruoyi-ui/src/views/pet/index.vue | 29 +
ruoyi-ui/src/router/index.js | 18 +
ruoyi-ui/src/views/meeting/meetingInfo.vue | 4
ruoyi-ui/src/views/meeting/index.vue | 65 ++++
ruoyi-ui/src/views/pet/noteInfo.vue | 10
12 files changed, 754 insertions(+), 35 deletions(-)
diff --git "a/ruoyi-ui/src/assets/images/\346\265\213\350\257\225.mp4" "b/ruoyi-ui/src/assets/images/\346\265\213\350\257\225.mp4"
new file mode 100644
index 0000000..c214d09
--- /dev/null
+++ "b/ruoyi-ui/src/assets/images/\346\265\213\350\257\225.mp4"
Binary files differ
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 3a13ea4..b8f75d4 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -170,6 +170,15 @@
// permissions: [],
hidden: true,
permissions: ['meetingModel:approve:list'],
+ children: [
+ {
+ // path: 'meetingInfo/',
+ path: 'approveInfo/:id(\\d+)',
+ component: () => import('@/views/meeting/approveInfo'),
+ name: 'approveInfo',
+ meta: { title: '瀹℃壒璇︽儏',activeMenu: '/meeting/approveInfo'}
+ }
+ ]
},
//浼氳缁熻
{
@@ -186,6 +195,15 @@
// permissions: [],
hidden: true,
permissions: ['meetingModel:webcast:list'],
+ children: [
+ {
+ path: 'webcastInfo/',
+ // path: 'webcastInfo/:id(\\d+)',
+ component: () => import('@/views/meeting/webcastInfo'),
+ name: 'webcastInfo',
+ meta: { title: '鐩存挱璇︽儏',activeMenu: '/meeting/webcastInfo'}
+ }
+ ]
},
//鐩存挱鍥炴斁
{
diff --git a/ruoyi-ui/src/views/meeting/approve.vue b/ruoyi-ui/src/views/meeting/approve.vue
index 01ffa4c..c67d6c1 100644
--- a/ruoyi-ui/src/views/meeting/approve.vue
+++ b/ruoyi-ui/src/views/meeting/approve.vue
@@ -10,12 +10,6 @@
<span>浼氳瀹℃壒</span>
<div class="button-container"></div>
<div style="display: flex; align-items: center;">
-<!-- <el-button size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
- <div class="form"><el-icon style="padding-right:100px;"></el-icon>
- <span class="text" style="width: 69px;height: 26px;font-size: 16px;
- font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">鏂扮敵璇�</span>
- </div>
- </el-button> -->
</div>
</h1>
@@ -100,9 +94,10 @@
<el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
- <el-button size="mini" type="text">鍚屾剰</el-button>
- <el-button size="mini" type="text" icon="el-icon-delete">鎷掔粷</el-button>
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏌ョ湅璇︽儏</el-button>
+ <el-button v-show="agree" size="mini" type="text" @click="agree(scope.row)">鍚屾剰</el-button>
+ <el-button v-show="agree" size="mini" type="text" icon="el-icon-delete">鎷掔粷</el-button>
+ <el-button v-show="agree1" size="mini" type="text" icon="el-icon-delete">閲嶆柊瀹℃壒</el-button>
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</div>
</template>
</el-table-column>
@@ -131,13 +126,17 @@
people: undefined,
address: undefined,
title: undefined,
- remark: undefined
+ remark: undefined,
+ status: undefined,
+ agree1: false,
+ agree: true,
}
}
},
methods: {
tableRowClassName({ row, rowIndex }) {
+
if (rowIndex % 2 == 0) {
return "statistics-warning-row1";
} else {
@@ -148,6 +147,27 @@
return row.id
},
+ agree(row){
+ this.agree1 = true
+ this.agree = false
+ row.status = '鍚屾剰'
+
+
+ alert(row.status)
+ },
+ // 鏌ョ湅璇︾粏淇℃伅
+ handleCheck(row){
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/meeting/approve/approveInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+
}
}
</script>
diff --git a/ruoyi-ui/src/views/meeting/approveInfo.vue b/ruoyi-ui/src/views/meeting/approveInfo.vue
new file mode 100644
index 0000000..e42de92
--- /dev/null
+++ b/ruoyi-ui/src/views/meeting/approveInfo.vue
@@ -0,0 +1,330 @@
+<template>
+ <div class="app-container" id="printable-content">
+ <div class="form-header mt">
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
+ <span>瀹℃壒璇︽儏</span>
+ </h1>
+ </div>
+ <div style="padding-left:15px">
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-position="left" label-width="160px">
+
+ <el-container>
+
+ <el-row :span="12">
+
+ <el-cow>
+ <el-form-item label="浼氳鏍囬" prop="meetingTitle" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.meetingTitle" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="寮�濮嬫椂闂�" prop="happenTime" label-width="80px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-date-picker v-model="formDat.happenTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}">
+ </el-date-picker>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="缁撴潫鏃堕棿" prop="endTime" label-width="80px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions" :style="{width: '100%'}">
+ </el-date-picker>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="浼氳鍦扮偣" prop="address" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ヤ細璁湴鐐�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+
+ <!-- <el-cow>
+ <el-form-item label="浼氳瀹や唬鐮�" prop="meetingID" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.meetingID" placeholder="璇疯緭鍏ヤ細璁浠ｇ爜" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow> -->
+ <el-cow>
+ <el-form-item label="鍙绾充汉鏁�" prop="capacity" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.capacity" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鍙備笌浜烘暟" prop="attendance" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.attendance" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鐢宠浜�" prop="applicant" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="瀹跺涵鎴栭儴闂�" prop="familyName" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.familyName" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鏄惁鎷滆姘寸墝" prop="status" label-width="120px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-select v-model="formDat.status" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
+ :disabled="dsb">
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鑱旂郴浜�" prop="name" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.name" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone" label-width="90px"
+ style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}"></el-input>
+ </el-form-item>
+ </el-cow>
+ </el-row>
+ </el-container>
+
+ <h4 class="form-header"> </h4>
+ <el-form-item size="large">
+ <el-button type="primary" @click="submitForm" :disabled="dsb">鍚屾剰</el-button>
+ <el-button type="primary" @click="submitForm" :disabled="dsb">鎷掔粷</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+
+
+ </div>
+</template>
+
+<script>
+ export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ cdi: "涓汉璐骇璇︾粏淇℃伅",
+ udi: "涓汉璐骇淇℃伅璇︽儏",
+ // 鏁版嵁鑼冨洿閫夐」
+ fot: ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.gif', '.pcx', '.tga', '.exif', '.fpx',
+ '.svg', '.psd', '.cdr', '.pcd', '.dxf', '.ufo', '.eps', '.ai', '.aw', '.WMF', '.webp', '.apng'
+ ],
+
+ fileList: [],
+ fileList1: [],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther: [],
+ dsb: false,
+ btn: false,
+ uploading: false,
+
+ formDat: {
+ id: undefined,
+ happenTime: undefined,
+ endTime: undefined,
+ timeSpan: undefined,
+ meetingTitle: undefined,
+ address: undefined,
+ meetingID: undefined,
+ capacity: undefined,
+ attendance: undefined,
+ applicant: undefined,
+ familyName: undefined,
+ name: undefined,
+ phone: undefined,
+ url: "",
+ status: undefined
+
+
+ },
+ dialogImageUrl: '',
+ dialogVisible: false,
+ disabled: false,
+ rules: {
+ meetingTitle: [{
+ required: true,
+ message: '璇疯緭鍏ヤ細璁爣棰�',
+ trigger: 'blur'
+ }],
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨寮�濮嬫椂闂�',
+ trigger: 'blur'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇烽�夋嫨缁撴潫鏃堕棿',
+ trigger: 'blur'
+ }],
+ status: [{
+ required: true,
+ message: '璇疯緭鍏ユ槸鍚︽敞閿�',
+ trigger: 'blur'
+ }],
+ isChange: [{
+ required: true,
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ trigger: 'blur'
+ }],
+ price: [{
+ required: true,
+ message: '璇疯緭鍏ラ噾棰�',
+ trigger: 'blur'
+ }],
+ incomeName: [{
+ required: true,
+ message: '璇疯緭鍏ユ敹鏀被鍒�',
+ trigger: 'blur'
+ }],
+ timeLimit: [{
+ required: true,
+ message: '璇疯緭鍏ユ湡闄�',
+ trigger: 'blur'
+ }],
+ location: [{
+ required: true,
+ message: '璇疯緭鍏ュ瓨鏀句綅缃�',
+ trigger: 'blur'
+ }],
+ propertyRight: [{
+ required: true,
+ message: '璇疯緭鍏ュ疄鐜伴毦搴�',
+ trigger: 'blur'
+ }],
+
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
+ trigger: 'blur'
+ }],
+ },
+ typeOptions: [{
+ value: 1,
+ label: '鏄�',
+ },
+ {
+ value: 0,
+ label: '鍚�',
+ }
+ ],
+ typeOptions1: [{
+ value: '鍙樻洿',
+ label: '鍙樻洿',
+ },
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
+ }
+ ],
+ }
+ },
+ created() {
+ const id = this.$route.params && this.$route.params.id;
+ let jd;
+ if (this.$route.query.detail == 'true') {
+ jd = this.$route.query.detail
+ this.btn = jd
+ // document.title = "淇敼涓汉璐骇璇︾粏淇℃伅";
+ this.$route.meta.title = "瀹℃壒璇︽儏"; //鍒楄〃鐨勫悕绉�
+ } else {
+ // document.title = "涓汉璐骇璇︾粏淇℃伅";
+ this.$route.meta.title = "瀹℃壒璇︽儏"; //鍒楄〃鐨勫悕绉�
+ this.btn = false;
+ }
+
+ let _this = this
+ },
+ mounted() {},
+ methods: {
+ submitForm() {
+ let ul = this.fileList.map(function(elem) {
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
+ }).join(",")
+ let uls = this.fileListOther.map(function(elem) {
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
+ }).join(",")
+ this.formDat.url = ul + "," + uls
+
+ this.$refs['elForm'].validate(valid => {
+ alert(this.formDat.status)
+ if (valid) {
+ if (this.formDat.id != undefined) {
+ updateSelfEconomy(this.formDat).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ if (this.formDat.status == 1)
+ this.formDat.status = '鏄�'
+ else
+ this.formDat.status = '鍚�'
+ this.btn = false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+ if (this.formDat.status == '鏄�')
+ this.formDat.status = 1
+ else
+ this.formDat.status = 0
+ }
+ }
+ })
+ },
+ }
+ }
+</script>
+
+<style scoped>
+ .app-container {
+ background-color: #FEF7FC;
+ }
+
+ .mt {
+ position: relative;
+ }
+
+ .dt {
+ display: block;
+
+ }
+
+ .pt {
+ right: 10px;
+ top: -3px;
+ display: block;
+ position: absolute;
+ }
+
+ .form {
+ background: center/11% no-repeat url('../../assets/icons/form.png');
+ }
+
+ .hide /deep/ .el-upload--picture-card {
+ display: none;
+ }
+
+ .form_item {
+ font-size: 12px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ color: #000000;
+ }
+</style>
diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue
index d30da34..22a36d5 100644
--- a/ruoyi-ui/src/views/meeting/index.vue
+++ b/ruoyi-ui/src/views/meeting/index.vue
@@ -112,13 +112,55 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<el-form-item label="鏃堕棿" prop="timeSpan">
- <el-date-picker v-model="formData.timeSpan" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
+ <el-date-picker v-model="formDat.timeSpan" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
+ <el-form-item label="鏍囬" prop="meetingTitle">
+ <el-input v-model="formDat.meetingTitle" placeholder="璇疯緭鍏ヤ細璁爣棰�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鍦扮偣" prop="address">
+ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ヤ細璁湴鐐�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鍙绾充汉鏁�" prop="capacity">
+ <el-input v-model="formDat.capacity" placeholder="璇疯緭鍏ュ彲瀹圭撼浜烘暟" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+
+
+ <el-form-item label="鍙備笌浜烘暟" prop="attendance">
+ <el-input v-model="formDat.attendance" placeholder="璇疯緭鍏ュ弬涓庝汉鏁�" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鐢宠浜�" prop="applicant">
+ <el-input v-model="formDat.applicant" placeholder="璇疯緭鍏ョ敵璇蜂汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鐢宠瀹跺涵鎴栭儴闂�" prop="familyName">
+ <el-input v-model="formDat.familyName" placeholder="璇疯緭鍏ョ敵璇峰搴垨閮ㄩ棬" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏄惁鎷滆姘寸墝" prop="status">
+ <el-select v-model="formDat.status" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
+ :disabled="dsb">
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鑱旂郴浜�" prop="name">
+ <el-input v-model="formDat.name" placeholder="璇疯緭鍏ヨ仈绯讳汉" clearable :style="{width: '100%'}">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="formDat.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable :style="{width: '100%'}"></el-input>
+ </el-form-item>
+
+ </el-form>
</el-upload>
</el-form>
@@ -186,8 +228,23 @@
age: '30'
},
],
- formData:{
+ formDat:{
timeSpan: undefined,
+ id: undefined,
+ happenTime: undefined,
+ endTime: undefined,
+ timeSpan: undefined,
+ meetingTitle: undefined,
+ address: undefined,
+ meetingID: undefined,
+ capacity: undefined,
+ attendance: undefined,
+ applicant: undefined,
+ familyName: undefined,
+ name: undefined,
+ phone: undefined,
+ url: "",
+ status: undefined
},
queryParams1: {
pageNum: 1,
@@ -211,7 +268,7 @@
// this.reset();
},
submitDataScope() {
- console.log(this.formData.timeSpan)
+ console.log(this.formDat.timeSpan)
},
tableRowClassName({
diff --git a/ruoyi-ui/src/views/meeting/meetingInfo.vue b/ruoyi-ui/src/views/meeting/meetingInfo.vue
index 6fce73d..c3ef2f9 100644
--- a/ruoyi-ui/src/views/meeting/meetingInfo.vue
+++ b/ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -43,13 +43,13 @@
</el-form-item>
</el-cow>
- <el-cow>
+ <!-- <el-cow>
<el-form-item label="浼氳瀹や唬鐮�" prop="meetingID" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-input v-model="formDat.meetingID" placeholder="璇疯緭鍏ヤ細璁浠ｇ爜" clearable :style="{width: '100%'}">
</el-input>
</el-form-item>
- </el-cow>
+ </el-cow> -->
<el-cow>
<el-form-item label="鍙绾充汉鏁�" prop="capacity" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
diff --git a/ruoyi-ui/src/views/meeting/replay.vue b/ruoyi-ui/src/views/meeting/replay.vue
index 439b303..a0110e7 100644
--- a/ruoyi-ui/src/views/meeting/replay.vue
+++ b/ruoyi-ui/src/views/meeting/replay.vue
@@ -33,7 +33,7 @@
<div class="module">
<span class="span1">涓瀹跺涵浼氳</span>
<span class="span2">2010-8-26 12:00</span>
- <el-button class="huifang" type="primary" plain >鍥炴斁</el-button>
+ <el-button class="huifang" type="primary" plain @click="show">鍥炴斁</el-button>
<div class="tubiao"><i class="el-icon-view">10000</i></div>
<p class="author">鍙戣捣鑰�</p>
</div>
@@ -42,7 +42,7 @@
<div class="module">
<span class="span1">涓瀹跺涵浼氳</span>
<span class="span2">2010-8-26 12:00</span>
- <el-button class="huifang" type="primary" plain >鍥炴斁</el-button>
+ <el-button class="huifang" type="primary" plain @click="show">鍥炴斁</el-button>
<div class="tubiao"><i class="el-icon-view">10000</i></div>
<p class="author">鍙戣捣鑰�</p>
</div>
@@ -51,7 +51,7 @@
<div class="module">
<span class="span1">涓瀹跺涵浼氳</span>
<span class="span2">2010-8-26 12:00</span>
- <el-button class="huifang" type="primary" plain >鍥炴斁</el-button>
+ <el-button class="huifang" type="primary" plain @click="show">鍥炴斁</el-button>
<div class="tubiao"><i class="el-icon-view">10000</i></div>
<p class="author">鍙戣捣鑰�</p>
</div>
@@ -60,13 +60,32 @@
<div class="module">
<span class="span1">涓瀹跺涵浼氳</span>
<span class="span2">2010-8-26 12:00</span>
- <el-button class="huifang" type="primary" plain >鍥炴斁</el-button>
+ <el-button class="huifang" type="primary" plain @click="show">鍥炴斁</el-button>
<div class="tubiao"><i class="el-icon-view">10000</i></div>
<p class="author">鍙戣捣鑰�</p>
</div>
</el-col>
</el-row>
<!-- </el-form> -->
+
+ <!-- 鍥炶瑙嗛寮圭獥 -->
+ <el-dialog
+ :visible.sync="dialogVisible"
+ width="50%"
+ height="100%"
+ :before-close="handleClose"
+ >
+
+ <h4>涓瀹跺涵浼氳</h4>
+ <el-divider />
+ <video id="video" class="video" controls width="100%%" height="480" >
+ <source src="../../assets/images/娴嬭瘯.mp4" type="video/mp4">
+ </video>
+<!-- <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ </span> -->
+ </el-dialog>
+
</div>
</template>
<script>
@@ -75,11 +94,19 @@
return {
queryParams1: [],
vList: [],
+ dialogVisible: false,
}
},
methods: {
-
+ show(){
+ this.dialogVisible = true
+ },
+ handleClose(){
+ this.dialogVisible = false;
+ const video = document.getElementById("video")
+ video.pause()
+ }
}
}
</script>
@@ -157,4 +184,7 @@
bottom: 5px;
left: 100px;
}
+.video{
+ object-fit: cover;
+}
</style>
diff --git a/ruoyi-ui/src/views/meeting/webcast.vue b/ruoyi-ui/src/views/meeting/webcast.vue
index abd3eb6..1bbf291 100644
--- a/ruoyi-ui/src/views/meeting/webcast.vue
+++ b/ruoyi-ui/src/views/meeting/webcast.vue
@@ -38,7 +38,7 @@
<el-row :gutter="0">
<el-col :span="4">
- <div class="module">
+ <div class="module" @click="toLook">
<div class="video">
66666666
</div>
@@ -231,6 +231,9 @@
},
submitDataScope() {
console.log(this.formDat.timeSpan)
+ },
+ toLook(){
+ this.$router.push('/meeting/webcast/webcastInfo/')
}
}
@@ -279,6 +282,7 @@
/* margin-left: 5px;
margin-right: 5px; */
position: relative;
+ cursor: pointer;
}
.grid-content {
diff --git a/ruoyi-ui/src/views/meeting/webcastInfo.vue b/ruoyi-ui/src/views/meeting/webcastInfo.vue
new file mode 100644
index 0000000..5d059f6
--- /dev/null
+++ b/ruoyi-ui/src/views/meeting/webcastInfo.vue
@@ -0,0 +1,233 @@
+<template>
+ <div class="app-container" id="printable-content">
+ <div class="form-header mt">
+ <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
+ <span>鐩存挱鍚嶅瓧</span>
+ </h1>
+ </div>
+
+ <el-container class="homeContainer">
+ <!-- <el-header>Header</el-header> -->
+ <el-container class="chirldContainer">
+ <el-aside width="400px">
+ <div class="one">1</div>
+ <div class="two">2</div>
+ <div class="three">3</div>
+ </el-aside>
+
+ <el-main>
+ <div></div>
+ </el-main>
+ </el-container>
+ <el-footer>Footer</el-footer>
+ </el-container>
+
+
+
+ </div>
+</template>
+
+<script>
+ export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ // 鏁版嵁鑼冨洿閫夐」
+ fot: ['.bmp', '.jpg', '.jpeg', '.png', '.tif', '.gif', '.pcx', '.tga', '.exif', '.fpx',
+ '.svg', '.psd', '.cdr', '.pcd', '.dxf', '.ufo', '.eps', '.ai', '.aw', '.WMF', '.webp', '.apng'
+ ],
+
+ fileList: [],
+ fileList1: [],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther: [],
+ dsb: true,
+ btn: false,
+ isShow: true,
+ uploading: false,
+
+ formDat: {
+ id: undefined,
+ happenTime: undefined,
+ endTime: undefined,
+ timeSpan: undefined,
+ meetingTitle: undefined,
+ address: undefined,
+ meetingID: undefined,
+ capacity: undefined,
+ attendance: undefined,
+ applicant: undefined,
+ familyName: undefined,
+ name: undefined,
+ phone: undefined,
+ url: "",
+ status: undefined
+
+
+ },
+ dialogImageUrl: '',
+ dialogVisible: false,
+ disabled: false,
+ rules: {
+ meetingTitle: [{
+ required: true,
+ message: '璇疯緭鍏ヤ細璁爣棰�',
+ trigger: 'blur'
+ }],
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨寮�濮嬫椂闂�',
+ trigger: 'blur'
+ }],
+ endTime: [{
+ required: true,
+ message: '璇烽�夋嫨缁撴潫鏃堕棿',
+ trigger: 'blur'
+ }],
+ status: [{
+ required: true,
+ message: '璇疯緭鍏ユ槸鍚︽敞閿�',
+ trigger: 'blur'
+ }],
+ isChange: [{
+ required: true,
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ trigger: 'blur'
+ }],
+ price: [{
+ required: true,
+ message: '璇疯緭鍏ラ噾棰�',
+ trigger: 'blur'
+ }],
+ incomeName: [{
+ required: true,
+ message: '璇疯緭鍏ユ敹鏀被鍒�',
+ trigger: 'blur'
+ }],
+ timeLimit: [{
+ required: true,
+ message: '璇疯緭鍏ユ湡闄�',
+ trigger: 'blur'
+ }],
+ location: [{
+ required: true,
+ message: '璇疯緭鍏ュ瓨鏀句綅缃�',
+ trigger: 'blur'
+ }],
+ propertyRight: [{
+ required: true,
+ message: '璇疯緭鍏ュ疄鐜伴毦搴�',
+ trigger: 'blur'
+ }],
+
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
+ trigger: 'blur'
+ }],
+ },
+ typeOptions: [{
+ value: 1,
+ label: '鏄�',
+ },
+ {
+ value: 0,
+ label: '鍚�',
+ }
+ ],
+ typeOptions1: [{
+ value: '鍙樻洿',
+ label: '鍙樻洿',
+ },
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
+ }
+ ],
+ }
+ },
+
+ mounted() {},
+ methods: {
+
+ }
+ }
+</script>
+
+<style scoped>
+ .one,.two,.three{
+ background-color: aqua;
+ margin-bottom: 20px;
+ height: 25%;
+ }
+ .homeContainer {
+ height: 100%;
+ }
+
+ .chirldContainer {
+ direction: rtl;
+ }
+
+ .el-header,
+ .el-footer {
+ background-color: #B3C0D1;
+ color: #333;
+ text-align: center;
+ line-height: 200px;
+ }
+
+ .el-main {
+ background-color: #E9EEF3;
+ color: #333;
+ text-align: center;
+ line-height: 400px;
+ width: 60%;
+ }
+
+ .el-aside {
+ /* background-color: #D3DCE6; */
+ /* color: #333; */
+ text-align: center;
+ line-height: 120px;
+ flex-direction: column;
+ }
+
+ .app-container {
+ background-color: #FEF7FC;
+ height: 100%;
+ width: 100%;
+ }
+
+ .mt {
+ position: relative;
+ }
+
+ .dt {
+ display: block;
+
+ }
+
+ .pt {
+ right: 10px;
+ top: -3px;
+ display: block;
+ position: absolute;
+ }
+
+ .form {
+ background: center/11% no-repeat url('../../assets/icons/form.png');
+ }
+
+ .hide /deep/ .el-upload--picture-card {
+ display: none;
+ }
+
+ .form_item {
+ font-size: 12px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ color: #000000;
+ }
+</style>
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 862bf55..547de62 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -322,6 +322,10 @@
</el-dialog>
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" style="width: 100%; height: 100%" alt="Preview Image" />
+ </el-dialog>
+
</div>
</template>
@@ -363,13 +367,16 @@
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
+
+ dialogImageUrl: '',
+ dialogVisible: false,
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList1:[ ],
fileList2:[ ],
fileListOther:[ ],
@@ -713,16 +720,24 @@
addPet(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList1.length; i++)
+ {
+ this.handleRemove(this.fileList1[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
+ // this.handleRemove(this.fileList[0]);
+ // this.handleRemoveFile(this.fileListOther[0]);
this.getList();
});
}
});
- // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
- Object.keys(this.formDat).forEach(key => {
- this.formDat[key] = '';
- });
- this.handleRemove(this.fileList[0]);
- this.handleRemoveFile(this.fileListOther[0]);
+
},
requestUpload(params)
{
diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 832b643..36114ef 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -272,7 +272,7 @@
for(let i = 0; i < paths.length; i++)
{
if(paths[i]!="") {
-
+
let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
// alert(pth)
if (_this.fot.includes(pth) === true)
@@ -291,7 +291,7 @@
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
else
_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-
+
}
}
// _this.fileList1 = _this.fileList
@@ -341,7 +341,7 @@
const Base64 = require('js-base64').Base64
this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
- let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+ let myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
@@ -507,11 +507,11 @@
let _this = this
this.uploading = true;
- alert(234)
+ // alert(234)
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
_this.formData.url = _this.formData.url+","+response.fileNames
- alert(2346)
+ // alert(2346)
updatenotePet(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index b15a352..e5315f9 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -649,6 +649,11 @@
console.log(this.uploadFileList1)
let _this = this
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
@@ -656,9 +661,14 @@
updateSelfEconomy(_this.formData).then(response => {
this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
// this.open = false;
+ if(this.formData.status=='鏄�')
+ this.formData.status = 1
+ else
+ this.formData.status = 0
+
});
})
-
+ this.uploading = false;
},
picUpload()
{
@@ -711,12 +721,14 @@
else
_this.formData.status = '鍚�'
});
+
// }
// else{
// _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
// }
});
+ this.uploading = false;
},
requestUpload(params)
{
--
Gitblit v1.9.1