From b654384fcaedb1d90c535d209778003d199aafa5 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期四, 20 十月 2022 11:47:26 +0800
Subject: [PATCH] 修改时间为字符串
---
dist.rar | 0
src/views/systemSetting/baseSetting/department/updateUser/index.vue | 123 ++++++------------------
src/views/systemSetting/device/point/index.vue | 7 +
src/components/myUpload/index.vue | 50 ++++++++-
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 5
src/views/operate/message/myIndex/index.vue | 24 ++--
src/components/dispatch/index.vue | 6 +
src/views/operate/disposal/casepool/pool/index.vue | 10 +-
src/components/scene/index.vue | 2
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 11 +-
src/views/operate/management/myIndex/index.vue | 4
src/components/solveProblem/index.vue | 3
src/views/operate/lawEnforcement/index.vue | 14 +-
src/views/systemSetting/baseSetting/role/index.vue | 2
14 files changed, 123 insertions(+), 138 deletions(-)
diff --git a/dist.rar b/dist.rar
index 1375850..8482614 100644
--- a/dist.rar
+++ b/dist.rar
Binary files differ
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index 2d1673e..eb46b15 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -79,6 +79,7 @@
</template>
<script>
import MyMap from '@/components/map'
+import {parseTime } from '@/utils/index'
export default {
components: {
MyMap
@@ -233,7 +234,10 @@
this.$axios({
method: 'post',
url: `sccg/dispatch_handle/dispatch`,
- data: dispatch
+ data: {
+ ...dispatch,
+ disposeDate:parseTime(dispatch.disposeDate)
+ }
})
.then(res => {
this.$message({
diff --git a/src/components/myUpload/index.vue b/src/components/myUpload/index.vue
index d51b510..6bcc4ff 100644
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@@ -1,8 +1,19 @@
<template>
<div class="my-upload">
- <el-upload :file-list="fileList" class="upload-demo" action="/sccg/file/medias" :multiple="multiple"
- :show-file-list="flag" :before-upload="beforeUpload" :limit="limit" :on-success="handleSuccess"
- :on-error="handleError" :list-type="listType" :headers="getToken()">
+ <el-upload
+ :file-list="fileList"
+ class="upload-demo"
+ action="/sccg/file/medias"
+ :multiple="multiple"
+ :show-file-list="flag"
+ :before-upload="beforeUpload"
+ :limit="limit"
+ :on-success="handleSuccess"
+ :on-error="handleError"
+ :list-type="listType"
+ :on-preview="handlePreview"
+ :on-remove="handleRemove"
+ :headers="getToken()">
<div class="upload-btn" :style="{'height':btnHeight,'width':btnWidth}">
<i class="el-icon-plus"></i>
<span>涓婁紶鍥剧墖</span>
@@ -11,7 +22,6 @@
</div>
</template>
<script>
-
export default {
data() {
return {
@@ -34,7 +44,6 @@
methods: {
// 涓婁紶涔嬪墠鍥炶皟
beforeUpload(rawFile) {
- console.log(rawFile);
if (rawFile.type !== 'image/png' && rawFile.type !== 'image/svg+xml' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/jpeg') {
this.$message.error('鍥剧墖蹇呴』鏄� jpg/svg/jpeg/png 鏍煎紡!')
return false
@@ -46,11 +55,26 @@
},
// 涓婁紶鎴愬姛鍥炶皟
handleSuccess(res, file, filelist) {
- console.log(res);
+ if(res.data.url1){
+ this.$emit('setPictureUrl',{url:res.data.url1});
+ }
+ else if(res.data.url2){
+ this.$emit('setPictureUrl',{url:res.data.url2});
+ }
+ else if(res.data.url3){
+ this.$emit('setPictureUrl',{url:res.data.url3});
+ }
+ else{
+ this.$emit('setPictureUrl',{url:res.data.url4});
+ }
},
// 涓婁紶澶辫触鍥炶皟
handleError(err, file, fileList) {
console.log(err);
+ this.$message({
+ type:'error',
+ message:err
+ })
},
// 鑾峰彇token
getToken() {
@@ -59,10 +83,22 @@
if (token && tokenHead) {
return { Authorization: tokenHead + token }
}
+ },
+ // 棰勮
+ handlePreview(file){
+ console.log(file)
+ },
+ // 绉婚櫎鏂囦欢
+ handleRemove(file, fileList){
+ console.log(file,fileList)
}
},
props: {
-
+ // 杩斿洖涓婁紶鎴愬姛鍥剧墖鍦板潃
+ setPictureUrl:{
+ type:Function,
+ default:()=>{}
+ }
}
}
</script>
diff --git a/src/components/scene/index.vue b/src/components/scene/index.vue
index b382cc8..791c5c8 100644
--- a/src/components/scene/index.vue
+++ b/src/components/scene/index.vue
@@ -207,7 +207,7 @@
}
.scene-item {
- padding: 20px 100px;
+ padding: 20px 0px;
::v-deep .el-input__inner {
background-color: #09152f;
diff --git a/src/components/solveProblem/index.vue b/src/components/solveProblem/index.vue
index 9223300..414bece 100644
--- a/src/components/solveProblem/index.vue
+++ b/src/components/solveProblem/index.vue
@@ -8,8 +8,7 @@
<el-timeline>
<el-timeline-item :color="mycolor" v-for="item in list" :key="item.id">
<div class="title">
- <div class="title-left">銆恵{item.name}}銆憑{item.name === '娲鹃仯' ? '娲鹃仯鍛�':item.name === '澶勭悊' ?
- '澶勭悊浜�':'璇勫畾浜�'}}:{{item.disposeRecords.length !==0 ? item.disposeRecords[0].handleId : ''}}
+ <div class="title-left">銆恵{item.name}}銆戝鐞嗕汉: {{item.disposeRecords && item.disposeRecords.length != 0 ? item.disposeRecords[0].handlerText:''}}
</div>
<div class="title-right">{{item.disposeRecords.length !==0 ? filterTime(item.disposeRecords[0].endTime):''}}
</div>
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
index 25e713a..e3ba435 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
@@ -20,6 +20,7 @@
import MyArrive from '../components/arrive'
import MyEvidence from "../components/evidence"
import MyBook from "../components/book"
+import {parseTime} from '@/utils/index'
export default {
components: {
MyArrive, MyEvidence, MyBook
@@ -54,14 +55,14 @@
url: `sccg/dispatch_handle/addition_dispose_result?caseId=${this.caseId}&type=2`,
data: {
arrivalAddress: arrive.arrive.arrivalAddress,
- arrivalTime: arrive.arrive.arrivalTime,
+ arrivalTime: parseTime(arrive.arrive.arrivalTime),
situationExplain: arrive.arrive.situationExplain,
replyExplain: arrive.arrive.replyExplain,
situationPic: `${arrive.arrive.situationPic}`,
//
undertaker: evidence.evidence.undertaker,
assistant: evidence.evidence.assistant,
- investigationTime: evidence.evidence.investigationTime,
+ investigationTime: parseTime(evidence.evidence.investigationTime),
address: evidence.evidence.address,
caseAction: evidence.evidence.caseAction,
description: evidence.evidence.description,
@@ -83,11 +84,11 @@
writType: book.book.writType,
writCode: book.book.writCode,
// illegalType: book.book.illegalType,
- sendTime: book.book.sendTime,
- limitTime: book.book.limitTime,
+ sendTime: parseTime(book.book.sendTime),
+ limitTime: parseTime(book.book.limitTime),
sendContent: book.book.sendContent,
rectifySituation:book.book.rectifySituation,
- rectifyTime: book.book.rectifyTime,
+ rectifyTime:parseTime(book.book.rectifyTime),
remark: book.book.remark,
writPic: `${book.book.writPic}`,
originalPic: `${book.book.originalPic}`,
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
index 8e9cf49..b1f009d 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
@@ -14,6 +14,7 @@
<script>
import MyArrive from '../components/arrive'
import MyEvidence from "../components/evidence"
+import {parseTime} from '@/utils/index'
export default {
components: {
MyArrive, MyEvidence
@@ -44,14 +45,14 @@
url: `sccg/dispatch_handle/addition_dispose_result?caseId=`+this.caseId+'&type=1',
data:{
arrivalAddress: arrive.arrive.arrivalAddress,
- arrivalTime: arrive.arrive.arrivalTime,
+ arrivalTime: parseTime(arrive.arrive.arrivalTime),
situationExplain: arrive.arrive.situationExplain,
replyExplain: arrive.arrive.replyExplain,
situationPic: `${arrive.arrive.situationPic}`,
//
undertaker: evidence.evidence.undertaker,
assistant: evidence.evidence.assistant,
- investigationTime: evidence.evidence.investigationTime,
+ investigationTime: parseTime(evidence.evidence.investigationTime),
address: evidence.evidence.address,
caseAction: evidence.evidence.caseAction,
description: evidence.evidence.description,
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index 8799435..2976df9 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -29,7 +29,7 @@
<MyIll v-if="newAddType === 1" :refresh="getUserList" :mytype=newAddType
@changeDialog=changeDialog />
<!-- 杩濊鐧昏 -->
- <myVio v-else :refresh="getUserList" :mytype=newAddType @changeDialog=changeDialog />
+ <myVio v-else :refresh="getUserList" :mytype=newAddType @changeDialog=changeDialog />
</el-dialog>
</div>
</div>
@@ -68,9 +68,9 @@
<el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'"
min-width="10">
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'"
+ <!-- <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'"
:label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
- </el-table-column>
+ </el-table-column> -->
<el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
:min-width="mystatus===1?'10' :'20' ">
<template slot-scope="scope">
@@ -80,7 +80,7 @@
</template>
</el-table-column>
<el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'"
- :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10">
+ :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="12">
</el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
<template slot-scope="scope">
@@ -88,7 +88,7 @@
</template>
</el-table-column>
<el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'"
- :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
+ :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="12">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
diff --git a/src/views/operate/lawEnforcement/index.vue b/src/views/operate/lawEnforcement/index.vue
index d635173..b3b7977 100644
--- a/src/views/operate/lawEnforcement/index.vue
+++ b/src/views/operate/lawEnforcement/index.vue
@@ -1,12 +1,8 @@
<template>
<div class="law-enforcement">
<!-- table琛ㄦ牸灞曠ず -->
- <MyTable
- :tableData="list"
- :tableOption="tableOption"
- :totalNum="totalNum"
- @getCurrentPage="getCurrentPage"
- @openDialog="changeDialog">
+ <MyTable :tableData="list" :tableOption="tableOption" :totalNum="totalNum" @getCurrentPage="getCurrentPage"
+ @openDialog="changeDialog">
<template #operation="{info}">
<div class="btn">
<!-- 鎿嶄綔鍖哄煙 -->
@@ -87,11 +83,11 @@
]
},
visible: false,
- totalNum:'',
+ totalNum: '',
showData: {},
}
},
- created(){
+ created() {
this.totalNum = this.list.length;
},
methods: {
@@ -115,7 +111,7 @@
console.log(data);
},
// 鑾峰彇褰撳墠椤垫暟鎹�
- getCurrentPage(current){
+ getCurrentPage(current) {
console.log(current);
}
}
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index ee0a296..75c2111 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -55,9 +55,9 @@
<span>{{filterTime(scope.row.alarmTime)}}</span>
</template>
</el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="15">
</el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+ <el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="btn">
<!-- v-if="instatus===7 ? true : false" -->
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index bd09596..1c0cd18 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -107,7 +107,7 @@
<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>
@@ -334,18 +334,18 @@
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.search();
+ this.setTableData();
},
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.search();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
- this.currentPage = page;
- this.search();
- },
+ // // 涓婁竴椤电偣鍑讳簨浠�
+ // handlePrev(page) {
+ // this.currentPage = page;
+ // this.search();
+ // },
+ // // 涓嬩竴椤电偣鍑讳簨浠�
+ // handleNext(page) {
+ // this.currentPage = page;
+ // this.search();
+ // },
// 鍏抽棴寮圭獥
handleClose(done) {
done();
diff --git a/src/views/systemSetting/baseSetting/department/updateUser/index.vue b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
index 7de6472..fa05478 100644
--- a/src/views/systemSetting/baseSetting/department/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/updateUser/index.vue
@@ -1,80 +1,39 @@
<template>
<div class="updateUser">
- <!-- <header>
- <div class="headerTitle">{{updateFlag ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅' :'鏌ョ湅鐢ㄦ埛淇℃伅'}}</div>
- </header> -->
<main>
<div class="mainContent">
- <el-form
- ref="user"
- label-width="140px"
- autoComplete="on"
- :model="user"
- :rules="createUserRules"
- label-position="right"
- >
- <!-- 閮ㄩ棬id
- <el-form-item class="optionItem" label="閮ㄩ棬id:" prop="id">
- <el-input v-model="user.id" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input>
- </el-form-item> -->
+ <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
+ label-position="right">
<!-- 閮ㄩ棬鍚嶇О -->
<el-form-item class="optionItem" label="閮ㄩ棬鍚嶇О:" prop="departName">
- <el-input
- v-model="user.departName"
- placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
- :disabled="!updateFlag"
- ></el-input>
+ <el-input v-model="user.departName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input>
</el-form-item>
<!-- 涓婄骇閮ㄩ棬 -->
<el-form-item class="optionItems" label="涓婄骇閮ㄩ棬:" prop="parentId">
- <el-select v-model="user.parentId" placeholder="璇烽�夋嫨涓婄骇閮ㄩ棬">
- <el-option
- v-for="item in departList"
- :key="item.departName"
- :label="item.departName"
- :value="item.id"
- >
+ <el-select v-model="user.parentId" placeholder="璇烽�夋嫨涓婄骇閮ㄩ棬" :disabled="!updateFlag">
+ <el-option v-for="item in departList" :key="item.departName" :label="item.departName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<!-- 閮ㄩ棬绫诲瀷 -->
<el-form-item class="optionItem" label="閮ㄩ棬绫诲瀷:" prop="departType">
- <el-select
- v-model="user.departType"
- placeholder="璇烽�夋嫨閮ㄩ棬绫诲瀷"
- :disabled="!updateFlag"
- >
- <el-option
- v-for="item in typeList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
+ <el-select v-model="user.departType" placeholder="璇烽�夋嫨閮ㄩ棬绫诲瀷" :disabled="!updateFlag">
+ <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<!--娣诲姞浜哄憳 -->
- <el-form-item class="optionItem add" label="娣诲姞浜哄憳:">
+ <el-form-item class="optionItem add" label="閮ㄩ棬浜哄憳:">
<ul class="addPerson">
- <li
- v-for="(item, index) in checkedList"
- :key="index"
- @click="setLeader(index)"
- >
+ <li v-for="(item, index) in checkedList" :key="index" @click="setLeader(index)">
<div class="li-item">
<div class="li-icon">
- <i
- :class="[
- 'el-icon-user-solid',
- item.leader ? 'leader' : '',
- ]"
- ></i>
+ <i :class="[
+ 'el-icon-user-solid',
+ item.leader ? 'leader' : '',
+ ]"></i>
</div>
- <label
- style="font-size: 12px"
- :class="[item.leader ? 'leader' : '']"
- >{{ item.username }}</label
- >
+ <label style="font-size: 12px" :class="[item.leader ? 'leader' : '']">{{ item.username }}</label>
</div>
</li>
<li class="li-btn" v-if="updateFlag">
@@ -89,11 +48,7 @@
</div>
<div class="scrollWrap">
<el-checkbox-group v-model="checkedUser">
- <el-checkbox
- v-for="user in userList"
- :label="user.id"
- :key="user.id"
- >
+ <el-checkbox v-for="user in userList" :label="user.id" :key="user.id">
{{ user.username }}
</el-checkbox>
</el-checkbox-group>
@@ -103,27 +58,16 @@
</div>
</el-form-item>
<el-form-item style="margin-top: -40px">
- <label style="color: #ff0000ab"
- >绾㈣壊浠ｈ〃閮ㄩ棬棰嗗锛岀偣鍑诲ご鍍忓彲璁剧疆閮ㄩ棬棰嗗</label
- >
+ <label style="color: #ff0000ab">绾㈣壊浠ｈ〃閮ㄩ棬棰嗗锛岀偣鍑诲ご鍍忓彲璁剧疆閮ㄩ棬棰嗗</label>
</el-form-item>
<!-- 閮ㄩ棬鎻忚堪 -->
<el-form-item class="optionItem" label="閮ㄩ棬鎻忚堪:" prop="departDes">
- <el-input
- type="textarea"
- :rows="4"
- v-model="user.departDes"
- placeholder="璇疯緭鍏ラ儴闂ㄦ弿杩�"
- :disabled="!updateFlag"
- ></el-input>
+ <el-input type="textarea" :rows="4" v-model="user.departDes" placeholder="璇疯緭鍏ラ儴闂ㄦ弿杩�" :disabled="!updateFlag">
+ </el-input>
</el-form-item>
<el-form-item v-if="updateFlag">
<div class="optionBtn">
- <el-button
- type="primary"
- class="btn submit"
- @click.native.prevent="handleUser"
- >鎻愪氦
+ <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
</el-button>
</div>
</el-form-item>
@@ -155,10 +99,6 @@
callback();
} else {
callback();
- // const rep = /^\w+$/;
- // if (!rep.test(value)) {
- // callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
- // }
}
};
const validatePhone = (rule, value, callback) => {
@@ -166,10 +106,6 @@
callback();
} else {
callback();
- // const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
- // if (!rep.test(value)) {
- // callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- // }
}
};
return {
@@ -202,6 +138,9 @@
created() {
const that = this;
this.user = JSON.parse(JSON.stringify(that.userInfo));
+ console.log(this.user);
+ this.user.parentId = this.user.parentId === 0 ? '鏆傛棤涓婄骇閮ㄩ棬' : this.user.parentId;
+ console.log(this.user.parentId);
this.checkedList = this.user.userInfoDTOS;
this.checkedList.forEach((e) => {
this.checkedUser.push(e.userId);
@@ -223,8 +162,9 @@
const { user, checkedList } = this;
const arr = [];
checkedList.forEach((item) => {
- arr.push({ leader: item.leader, userId: item.id });
+ arr.push({ leader: item.leader, userId: item.userId });
});
+ console.log(arr);
this.$axios
.post("sccg/depart/update", {
id: user.id,
@@ -239,7 +179,6 @@
type: res.code === 200 ? "success" : "warning",
});
this.$emit("changeDialog", { flag: false });
- debugger;
this.getDepartList();
});
} else {
@@ -254,9 +193,11 @@
// 璁剧疆棰嗗
setLeader(idx) {
- this.checkedList.forEach((item, index) => {
- item.leader = index === idx;
- });
+ if (this.updateFlag) {
+ this.checkedList.forEach((item, index) => {
+ item.leader = index === idx;
+ });
+ }
},
// 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
@@ -269,8 +210,6 @@
});
},
addUser() {
- console.log(this.checkedUser);
- console.log(this.userList);
this.checkedList = [];
this.userList.forEach((item) => {
this.checkedUser.forEach((child) => {
@@ -362,6 +301,7 @@
padding: 0;
flex-wrap: wrap;
max-width: 280px;
+
li {
color: #fff;
text-align: center;
@@ -369,6 +309,7 @@
margin-left: 10px;
}
}
+
.li-icon {
background-color: #cccccc;
width: 36px;
@@ -376,6 +317,7 @@
border-radius: 50%;
margin: 0 auto;
}
+
.li-btn {
background-color: #cccccc;
width: 36px;
@@ -437,6 +379,7 @@
.leader {
color: red;
}
+
.el-input {
width: 280px !important;
}
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index 84b1695..04857a4 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -32,7 +32,7 @@
</el-table-column> -->
<el-table-column prop="name" label="瑙掕壊鍚嶇О" min-width="10">
</el-table-column>
- <el-table-column prop="sort" label="瑙掕壊绫诲瀷" min-width="10">
+ <el-table-column prop="typeText" label="瑙掕壊绫诲瀷" min-width="10">
</el-table-column>
<!-- <el-table-column prop="adminCount" label="榛樿瑙掕壊" min-width="10">
</el-table-column> -->
diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue
index a0df916..01b7099 100644
--- a/src/views/systemSetting/device/point/index.vue
+++ b/src/views/systemSetting/device/point/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="point">
- <MyUpload></MyUpload>
+ <MyUpload @setPictureUrl="getPictureUrl"></MyUpload>
</div>
</template>
<script>
@@ -14,6 +14,11 @@
return {
}
+ },
+ methods:{
+ getPictureUrl({url}){
+ console.log(url)
+ }
}
}
</script>
\ No newline at end of file
--
Gitblit v1.8.0