Browse Source

接近冲突

shibei_master
dai 3 years ago
parent
commit
d3a71e8cb3
  1. 2
      src/router/index.js
  2. 6
      src/views/modules/base/community/communityTable.vue
  3. 132
      src/views/modules/communityService/dqfwzx/index.vue
  4. 6
      src/views/modules/secretaryLog/difficulty/difficultyForm.vue
  5. 6
      src/views/modules/secretaryLog/humanisticCare/careForm.vue
  6. 7
      src/views/modules/secretaryLog/workLog/form.vue

2
src/router/index.js

@ -348,7 +348,7 @@ router.beforeEach((to, from, next) => {
{
// url: "/visual/ai/yujing",
url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis",
name: "预警事件",
name: "预警分析",
id: "545345fdsfs",
},
],

6
src/views/modules/base/community/communityTable.vue

@ -103,7 +103,8 @@
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>
<el-button v-if="agencyObj.level == 'community'" style="margin-left:10px"
<el-button v-if="agencyObj.level == 'community'"
style="margin-left:10px"
class="diy-button--qrcode"
size="small"
@click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
@ -173,8 +174,7 @@
class="div-table-button--qr"
size="small"
@click="handleDownQr(scope.row, 'neighborHood')">二维码</el-button> -->
<el-button
type="text"
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>

132
src/views/modules/communityService/dqfwzx/index.vue

@ -2,26 +2,25 @@
<div>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd"
>新增</el-button
>
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
</div>
<div class="m-center" v-if="tableData.length > 0">
<div class="m-center"
v-if="tableData.length > 0">
<div class="center-left">
<div class="list">
<div
@click="currentIndex = index"
<div @click="currentIndex = index"
class="item"
:class="{ 'z-on': currentIndex == index }"
:key="'ct' + index"
v-for="(item, index) in tableData"
>
<div class="item-btns">
<a v-if="currentIndex == index" @click="handleEdit">修改</a>
<a v-if="currentIndex == index" @click="handleDel">删除</a>
v-for="(item, index) in tableData">
<div class="item-btn"
v-if="currentIndex == index"
@click="handleEdit">
修改
</div>
<div class="item-name">{{ item.centerName }}</div>
<div class="item-prop">
<div class="prop-field">社区地址</div>
@ -49,114 +48,95 @@
>
</div> -->
<div id="centerIndexApp" class="div_map"></div>
<div id="centerIndexApp"
class="div_map"></div>
<el-table
:data="tableData[currentIndex].matterList"
<el-table :data="tableData[currentIndex].matterList"
border
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column
label="序号"
:max-height="maxTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="matterName" label="事项名称">
width="50" />
<el-table-column prop="matterName"
label="事项名称">
</el-table-column>
<el-table-column prop="allowTime" label="可预约时间 ">
<el-table-column prop="allowTime"
label="可预约时间 ">
</el-table-column>
<el-table-column
fixed="right"
<el-table-column fixed="right"
label="操作"
align="center"
width="120"
>
width="120">
<template slot-scope="scope">
<el-button
@click="handleOrder(scope.$index)"
<el-button @click="handleOrder(scope.$index)"
type="text"
size="small"
style="color: #1c6afd"
>预约</el-button
>
style="color: #1c6afd">预约</el-button>
<el-button
@click="handleOrderList(scope.$index)"
<el-button @click="handleOrderList(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #1c6afd"
>预约记录</el-button
>
style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div class="m-hint" v-else>
<el-empty description="暂无内容" :image-size="200"></el-empty>
<div class="m-hint"
v-else>
<el-empty description="暂无内容"
:image-size="200"></el-empty>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
<edit-form
ref="eleEditForm"
@closed="handleClose">
<edit-form ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
@dialogOk="handleEditSuccess"></edit-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="form2Show"
<el-dialog :visible.sync="form2Show"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseForm2"
>
<order-form
ref="eleOrderForm"
@closed="handleCloseForm2">
<order-form ref="eleOrderForm"
@dialogCancle="handleCloseForm2"
@dialogOk="handleOrderSuccess"
></order-form>
@dialogOk="handleOrderSuccess"></order-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="orderListShow"
<el-dialog :visible.sync="orderListShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约记录"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseOrderList"
>
<order-list
ref="eleOrderList"
@dialogCancle="handleCloseOrderList"
></order-list>
@closed="handleCloseOrderList">
<order-list ref="eleOrderList"
@dialogCancle="handleCloseOrderList"></order-list>
</el-dialog>
</div>
</template>
<script>
import { requestPost } from "@/js/dai/request2";
import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import editForm from "./cpts/edit";
@ -312,19 +292,21 @@ export default {
this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
},
async handleDel() {
if (!confirm("删除后不可恢复,确定删除?")) return;
async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex);
const url =
"/heart/iccommunityselforganization/delcommunityselforganization";
const { tableData } = this;
const item = this.tableData[this.currentIndex];
const url = "/gov/org/icpartyservicecenter/del";
const { data, code, msg } = await requestPost(url, [
item.partyServiceCenterId,
]);
const { data, code, msg } = await requestPost(url, {
orgId: tableData[rowIndex].orgId,
});
if (code === 0) {
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.success("操作失败!");
}
},
@ -357,6 +339,8 @@ export default {
if (code === 0) {
this.agencyId = data.agencyId;
} else {
this.$message.error(msg);
}
},
},
@ -410,8 +394,7 @@ export default {
background-color: #ffffff;
box-shadow: 0 0 10px #6aa;
}
.item-btns {
.item-btn {
position: absolute;
top: 5px;
right: 5px;
@ -440,7 +423,6 @@ export default {
}
}
}
.item-name {
font-size: 16px;
font-weight: bold;

6
src/views/modules/secretaryLog/difficulty/difficultyForm.vue

@ -276,7 +276,7 @@ export default {
beforeUpload (file) {
const array = file.name.split('.')
const extension = array[array.length - 1]
const isLt1M = (file.size / 1024 / 1024) < 5
if (extension !== 'xls'
&& extension !== 'xlsx'
&& extension !== 'doc'
@ -285,6 +285,10 @@ export default {
this.$message.error('只能上传word、excel、pdf文件!')
return false
}
if (!isLt1M) {
this.$message.error('上传文件大小不能超过 5MB!')
}
return isLt1M
},

6
src/views/modules/secretaryLog/humanisticCare/careForm.vue

@ -331,7 +331,7 @@ export default {
beforeUpload (file) {
const array = file.name.split('.')
const extension = array[array.length - 1]
const isLt1M = (file.size / 1024 / 1024) < 5
if (extension !== 'xls'
&& extension !== 'xlsx'
&& extension !== 'doc'
@ -340,6 +340,10 @@ export default {
this.$message.error('只能上传word、excel、pdf文件!')
return false
}
if (!isLt1M) {
this.$message.error('上传文件大小不能超过 5MB!')
}
return isLt1M
},

7
src/views/modules/secretaryLog/workLog/form.vue

@ -252,7 +252,7 @@ export default {
beforeUpload (file) {
const array = file.name.split('.')
const extension = array[array.length - 1]
const isLt1M = (file.size / 1024 / 1024) < 5
if (extension !== 'xls'
&& extension !== 'xlsx'
&& extension !== 'doc'
@ -261,7 +261,10 @@ export default {
this.$message.error('只能上传word、excel、pdf文件!')
return false
}
if (!isLt1M) {
this.$message.error('上传文件大小不能超过 5MB!')
}
return isLt1M
},
handleFileRemove (file) {

Loading…
Cancel
Save