From c0bbc152add7a7479e5453ff1310df810ecdd049 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 二月 2023 10:54:43 +0800
Subject: [PATCH] 2023/2/21 肖辉 修改店铺管理，案卷查询，我的代办
---
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 8 +-
src/views/operate/baseSetting/illegalBuild/index.vue | 19 ++--
src/views/operate/viewEvent/index.vue | 3
src/components/map/leafletMap.vue | 15 +++
src/views/operate/baseSetting/violation/index.vue | 6
src/components/dispatch/index.vue | 4
src/views/operate/fivepack/threepack/components/content.vue | 155 +++++++++++++++++++++++++++++++++++---
7 files changed, 179 insertions(+), 31 deletions(-)
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index bd209e2..844362f 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -107,7 +107,7 @@
</div>
</el-form>
<div class="map">
- <MyMap></MyMap>
+ <MyMap style="width: 600px; height: 400px"></MyMap>
</div>
<div class="footer">
<el-button type="primary" @click="handleDispatch">纭畾</el-button>
@@ -408,4 +408,4 @@
padding: 10px 20px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/map/leafletMap.vue b/src/components/map/leafletMap.vue
index eb74a74..d53bd34 100644
--- a/src/components/map/leafletMap.vue
+++ b/src/components/map/leafletMap.vue
@@ -42,6 +42,7 @@
};
},
mounted() {
+ console.log('/* 鍒涘缓鍦板浘瀹炰緥 */')
setTimeout(() => {
this.createrMap();
}, 100);
@@ -49,14 +50,28 @@
methods: {
/* 鍒涘缓鍦板浘瀹炰緥 */
createrMap() {
+
this.option.center = [eval(this.map_point.y), eval(this.map_point.x)];
this.option.zoom = this.map_zoom;
this.map = this.$map.createrMap("map-container", this.option);
// this.$map.createrLayers(this.map, this.mapUrls) //鍒囩墖鍦板浘
// this.$map.createrChinatm(this.map, this.mapUrl); // 鍥惧眰
+
this.map.pm.setLang("zh");
// this.map.pm.addControls(this.options);
+ // this.map.on("pm:drawstart", (e) => {
+ // // // workingLayer.on('pm:create', e => {
+ // // console.log("缁樺埗寮�濮�");
+ // // console.log(e);
+ // // // });
+ // });
+ // this.map.on("pm:drawend", (e) => {
+ // // // workingLayer.on('pm:create', e => {
+ // // console.log("缁樺埗缁撴潫");
+ // // // });
+ // });
this.locationMap();
+
},
locationMap() {
if (this.mark && this.map) {
diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue
index 323ecbf..d5c7037 100644
--- a/src/views/operate/baseSetting/illegalBuild/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/index.vue
@@ -12,11 +12,11 @@
</div>
<div class="addUser">
<el-button class="addBtn" type="primary" @click="dialogCreate = true"
- >鏂板杩濆缓</el-button
+ >鏂板杩濆缓绫诲瀷</el-button
>
<el-dialog
:visible.sync="dialogCreate"
- title="鏂板杩濆缓"
+ title="鏂板杩濆缓绫诲瀷"
width="45%"
v-if="dialogCreate"
:before-close="handleClose"
@@ -77,7 +77,7 @@
<!-- tools -->
<div class="tools">
<div class="funs">
- <!-- <div class="funsItem">
+ <div class="funsItem">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
@@ -89,7 +89,7 @@
:value="item.value" :disabled="item.disabled">
</el-option>
</el-select>
- </div> -->
+ </div>
</div>
<div class="pagination">
<el-pagination
@@ -300,7 +300,7 @@
}
header {
- background-color: #fff;
+ //background-color: #fff;
.headerContent {
padding: 0;
@@ -346,7 +346,7 @@
}
main {
- background-color: #fff;
+ //background-color: #fff;
margin-top: 20px;
padding-bottom: 50px;
@@ -367,7 +367,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ border: 1px solid #ccc;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
@@ -380,7 +380,10 @@
.el-select {
width: 120px;
}
-
+ &::v-deep .el-input__inner {
+ border: none;
+ // background-color: #09152f;
+ }
&:hover {
border: 1px solid #4b9bb7;
}
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index 5a27b83..f5b758f 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -82,7 +82,7 @@
<!-- tools -->
<div class="tools">
<div class="funs">
- <!-- <div class="funsItem">
+ <div class="funsItem">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
@@ -94,7 +94,7 @@
:value="item.value" :disabled="item.disabled">
</el-option>
</el-select>
- </div> -->
+ </div>
</div>
<div class="pagination">
<el-pagination
@@ -380,7 +380,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ border: 1px solid #ccc;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
diff --git a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
index e847637..c01be2c 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -109,7 +109,7 @@
</el-form-item>
<el-form-item class="optionItems" label-width='0px' prop="buildingWidth">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingWidth"></el-input>
- </el-form-item>
+ </el-form-item>
<el-form-item class="optionItems" label-width='0px' prop="buildingHigh">
<el-input placeholder="鍗曚綅绫�" v-model="ill.buildingHigh"></el-input>
</el-form-item>
@@ -360,7 +360,7 @@
created() {
const { getBigKind, getCommityList,getStreetList } = this;
getStreetList(0);
-
+
// this.ill.category = this.mytype + 1;
getBigKind();
getCommityList();
@@ -537,7 +537,7 @@
}
.input-form {
-
+
.upload-demo {
position: relative;
margin-right: 20px;
@@ -577,4 +577,4 @@
flex: 2;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/operate/fivepack/threepack/components/content.vue b/src/views/operate/fivepack/threepack/components/content.vue
index d399d6b..ce0cc4b 100644
--- a/src/views/operate/fivepack/threepack/components/content.vue
+++ b/src/views/operate/fivepack/threepack/components/content.vue
@@ -6,7 +6,8 @@
<div class="search-item">
<span>杈撳叆鏌ヨ:</span>
<el-input
- style="flex: 1"
+
+ style="flex: 1;margin-left: 15px"
:placeholder="
isStorePage() ? '搴楅摵锛堥棬搴楋級鍚嶇О' : '璇疯緭鍏ュ簵閾虹紪鍙�'
"
@@ -15,7 +16,7 @@
</div>
<div class="search-item">
<span>搴楅摵鐘舵��:</span>
- <el-select v-model="storeStatus" placeholder="閫夋嫨搴楅摵鐘舵��">
+ <el-select v-model="storeStatus" style="margin-left: 15px" placeholder="閫夋嫨搴楅摵鐘舵��">
<el-option
v-for="item in options"
:key="item.value"
@@ -253,18 +254,46 @@
</el-form>
</div>
</el-dialog>
- <!-- 鍒嗛〉 -->
- <div class="pagination">
- <el-pagination
- background
- :current-page="currentPage"
- layout="prev, pager, next"
- :total="totalNum"
- :page-size="pageSize"
- @current-change="changeCurrentPage"
- >
- </el-pagination>
+ <div class="tools">
+ <div class="funs">
+ <div class="funsItem">
+ <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
+ </div>
+ <div class="funsItem">
+ <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"
+ >
+ </el-pagination>
+ </div>
</div>
+ <!-- 鍒嗛〉 -->
+<!-- <div class="pagination">-->
+<!-- <el-pagination-->
+<!-- background-->
+<!-- :current-page="currentPage"-->
+<!-- layout="prev, pager, next"-->
+<!-- :total="totalNum"-->
+<!-- :page-size="pageSize"-->
+<!-- @current-change="changeCurrentPage"-->
+<!-- >-->
+<!-- </el-pagination>-->
+<!-- </div>-->
</main>
</div>
</template>
@@ -358,6 +387,46 @@
},
methods: {
+ // 鎵归噺鍒犻櫎
+ mulDelete(idArr) {
+ this.$axios({
+ method: "delete",
+ url: "sccg/illegal_building/batch_delete?ids=" + idArr,
+ }).then((res) => {
+ this.getUserList();
+ this.$message({
+ message: res.message,
+ type: res.code === 200 ? "success" : "warning",
+ });
+ });
+ },
+ // 鎵ц涓嬫媺妗嗘搷浣�
+ selectChange(val) {
+ let ids = [];
+ this.tempList.forEach((item) => {
+ ids.push(item.number);
+ });
+ if (ids.length !== 0) {
+ if (val === 3) {
+ this.mulDelete(ids);
+ }
+ } else {
+ this.$message({
+ type: "warning",
+ message: "鎮ㄨ繕娌￠�変腑浠讳綍鏁版嵁",
+ });
+ }
+ },
+ // 鍏ㄩ��
+ selectAll() {
+ this.$refs.multipleTable.toggleAllSelection();
+ },
+ // 鍙嶉��
+ disSame(list) {
+ list.forEach((row) => {
+ this.$refs.multipleTable.toggleRowSelection(row);
+ });
+ },
// 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅)
handleSubmit(mystatus) {
this.role.body = this.$refs.edit.editor.txt.html();
@@ -623,7 +692,67 @@
.mainTitle {
line-height: 60px;
}
+ .tools {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 20px;
+ .funs {
+ display: flex;
+
+ .funsItem {
+ line-height: 28px;
+ display: flex;
+ align-items: center;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ font-size: 12px;
+ margin-left: 10px;
+
+ .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;
+ }
+ }
+ }
+
+ .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;
+ }
+ }
+ }
+ }
.el-link {
color: #4b9bb7;
}
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index f4e79c0..e7e39ce 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -431,7 +431,7 @@
}
main {
- background-color: #fff;
+ //background-color: #fff;
margin-top: 20px;
padding-bottom: 50px;
@@ -456,6 +456,7 @@
line-height: 28px;
display: flex;
align-items: center;
+ border: 1px solid #ccc;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
--
Gitblit v1.8.0