From 5d9d45b9ddc4d99aba2d9dd9d75fc4d7ebf639d1 Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期五, 20 五月 2022 18:10:37 +0800 Subject: [PATCH] 修改ip配置的交互 --- src/pages/library/components/personList.vue | 1144 +++++++++++++++++++------------------------------------- 1 files changed, 392 insertions(+), 752 deletions(-) diff --git a/src/pages/library/components/personList.vue b/src/pages/library/components/personList.vue index 09726bb..da1f4d0 100644 --- a/src/pages/library/components/personList.vue +++ b/src/pages/library/components/personList.vue @@ -4,18 +4,12 @@ <div class="base-tip"> <div class="left-tips"> <span class="ku-name">{{ this.baseObject.tableName }}</span> - <span - class="list" - :class=" - this.baseObject.bwType === '1' ? 'black-list' : 'white-list' - " - >{{ this.baseObject.bwType === "1" ? "榛戝悕鍗�" : "鐧藉悕鍗�" }}</span - > + <span class="list" :class="this.baseObject.bwType === '1' ? 'black-list' : 'white-list'">{{ + this.baseObject.bwType === "1" ? "榛戝悕鍗�" : "鐧藉悕鍗�" + }}</span> <span class="ok-time" >鏈夋晥鏃堕棿锛歿{ this.baseObject.startTime }} -- - {{ - this.baseObject.endTime ? this.baseObject.endTime : "姘镐箙鏈夋晥" - }}</span + {{ this.baseObject.endTime ? this.baseObject.endTime : "姘镐箙鏈夋晥" }}</span > </div> @@ -43,11 +37,7 @@ </el-tooltip> <el-tooltip content="缂栬緫" placement="top" popper-class="atooltip"> - <span - class="iconfont iconfont-wrap iconbianjiku-09" - @click.stop="edit" - v-if="isShow('library:set')" - ></span> + <span class="iconfont iconfont-wrap iconbianjiku-09" @click.stop="edit" v-if="isShow('library:set')"></span> </el-tooltip> </div> </div> @@ -70,14 +60,8 @@ > <upload-icon slot="suffix"></upload-icon> </el-input> - <el-button size="small" type="primary" @click="handleSearch" - >鎼滅储</el-button - > - <el-tooltip - content="鎵归噺鍒犻櫎" - placement="top" - popper-class="atooltip" - > + <el-button size="small" type="primary" @click="handleSearch">鎼滅储</el-button> + <el-tooltip content="鎵归噺鍒犻櫎" placement="top" popper-class="atooltip"> <span class="iconfont iconfont-wrap iconpiliangshanchu-09" @click="askDelete('batch')" @@ -85,11 +69,7 @@ ></span> </el-tooltip> - <el-tooltip - content="涓婁紶鐓х墖" - placement="top" - popper-class="atooltip" - > + <el-tooltip content="涓婁紶鐓х墖" placement="top" popper-class="atooltip"> <UploadBtn limitTypes=".jpg,.png,.jpeg" limitSize @@ -113,7 +93,6 @@ tooltip-effect="dark" style="width: 100%; overflow: auto" :fit="true" - row-class-name="hover-row" cell-class-name="cell-classname" @row-click="pickRow" :default-sort="{ prop: 'createTime', order: 'descending' }" @@ -123,7 +102,7 @@ background: '#fff', color: '#222222', padding: '2px 1px', - borderBottom: 'none', + borderBottom: 'none' }" > <el-table-column type="selection" width="40"></el-table-column> @@ -134,9 +113,7 @@ style="width: 84px; height: 84px; object-fit: contain" alt /> - <p class="text-center fb f16" v-show="haveScore(scope.row)"> - {{ scope.row.compareScore }}% - </p> + <p class="text-center fb f16" v-show="haveScore(scope.row)">{{ scope.row.compareScore }}%</p> </template> </el-table-column> <el-table-column label="鐢熸晥鐘舵��" min-width="70"> @@ -152,19 +129,8 @@ ></el-switch> </template> </el-table-column> - <el-table-column - prop="personName" - label="濮撳悕" - min-width="70" - show-overflow-tooltip - sortable - ></el-table-column> - <el-table-column - prop="sex" - label="鎬у埆" - min-width="60" - sortable - ></el-table-column> + <el-table-column prop="personName" label="濮撳悕" min-width="70" show-overflow-tooltip sortable></el-table-column> + <el-table-column prop="sex" label="鎬у埆" min-width="60" sortable></el-table-column> <el-table-column prop="idCard" label="韬唤璇佸彿" @@ -179,11 +145,7 @@ show-overflow-tooltip sortable ></el-table-column> - <el-table-column - prop="monitorLevel" - label="绛夌骇" - min-width="50" - ></el-table-column> + <el-table-column prop="monitorLevel" label="绛夌骇" min-width="50"></el-table-column> <el-table-column prop="createTime" label="鍏ュ簱鏃堕棿" @@ -194,79 +156,34 @@ <el-table-column label="鎿嶄綔" min-width="130"> <template slot-scope="scope"> <fTemplate authority="library:set"> - <el-tooltip - content="缂栬緫" - placement="top" - popper-class="atooltip" - > + <el-tooltip content="缂栬緫" placement="top" popper-class="atooltip"> <span class="iconfont iconbianjixinxi-09" style="font-size: 24px; cursor: pointer" - @click="handleClick(scope.row)" + @click="editRow(scope.row)" ></span> </el-tooltip> </fTemplate> - <el-popover - placement="top" - trigger="click" - popper-class="popper-caozuo" - > - <el-tooltip - content="鏌ユ壘姝や汉" - placement="top" - popper-class="atooltip" - > - <span - class="iconfont iconchazhaociren-09" - @click="tosearch(scope.row)" - ></span> + <el-popover placement="top" trigger="click" popper-class="popper-caozuo"> + <el-tooltip content="鏌ユ壘姝や汉" placement="top" popper-class="atooltip"> + <span class="iconfont iconchazhaociren-09" @click="tosearch(scope.row)"></span> </el-tooltip> - <el-tooltip - content="鏌ョ湅璇︽儏" - placement="top" - popper-class="atooltip" - > - <span - class="iconfont iconchakanxiangqing-09" - @click="showDetail(scope.row)" - ></span> + <el-tooltip content="鏌ョ湅璇︽儏" placement="top" popper-class="atooltip"> + <span class="iconfont iconchakanxiangqing-09" @click="showDetail(scope.row)"></span> </el-tooltip> <fTemplate authority="library:set"> - <el-tooltip - content="澶嶅埗" - placement="top" - popper-class="atooltip" - > - <span - class="iconfont iconfuzhi-09" - title="澶嶅埗" - @click="copyClick(scope.row)" - ></span> + <el-tooltip content="澶嶅埗" placement="top" popper-class="atooltip"> + <span class="iconfont iconfuzhi-09" title="澶嶅埗" @click="copyClick(scope.row)"></span> </el-tooltip> </fTemplate> <fTemplate authority="library:set"> - <el-tooltip - content="绉诲姩" - placement="top" - popper-class="atooltip" - > - <span - class="iconfont iconyidong-09" - title="绉诲姩" - @click="moveClick(scope.row)" - ></span> + <el-tooltip content="绉诲姩" placement="top" popper-class="atooltip"> + <span class="iconfont iconyidong-09" title="绉诲姩" @click="moveClick(scope.row)"></span> </el-tooltip> </fTemplate> <fTemplate authority="library:set" class="del-wrap"> - <el-tooltip - content="鍒犻櫎" - placement="top" - popper-class="atooltip" - > - <span - class="iconfont iconshanchu-09" - @click="askDelete('single', scope.row.id)" - ></span> + <el-tooltip content="鍒犻櫎" placement="top" popper-class="atooltip"> + <span class="iconfont iconshanchu-09" @click="askDelete('single', scope.row.id)"></span> </el-tooltip> </fTemplate> <span @@ -289,12 +206,7 @@ :total="BaseManageData.total" ></el-pagination> </div> - <el-dialog - title="鎶撴媿璇︽儏" - :visible.sync="cameraDetailVisible" - okText="纭畾" - custom-class="zhuapai-dialog" - > + <el-dialog title="鎶撴媿璇︽儏" :visible.sync="cameraDetailVisible" okText="纭畾" custom-class="zhuapai-dialog"> <div class="member-info"> <label class> <img src="/images/library/涓汉淇℃伅.png" alt="" srcset="" /> @@ -342,13 +254,9 @@ ></el-date-picker> </div> - <el-button size="mini" type="primary" @click="postCameraData" - >鏌ヨ</el-button - > + <el-button size="mini" type="primary" @click="postCameraData">鏌ヨ</el-button> </div> - <p style="text-align: right; font-size: 14px; color: #5f5f5f"> - 鍏眥{ faceDataCount }}鏉℃暟鎹� - </p> + <p style="text-align: right; font-size: 14px; color: #5f5f5f">鍏眥{ faceDataCount }}鏉℃暟鎹�</p> <el-table :data="cameraDetailData" @@ -359,15 +267,10 @@ background: '#fff', color: '#222222', padding: '2px 1px', - borderBottom: 'none', + borderBottom: 'none' }" > - <el-table-column - prop="faceImg" - label="鎶撴媿瀹炴櫙" - width="160" - align="center" - > + <el-table-column prop="faceImg" label="鎶撴媿瀹炴櫙" width="160" align="center"> <template slot-scope="scope"> <div> <img @@ -384,28 +287,10 @@ </div> </template> </el-table-column> - <el-table-column - prop="cameraName" - label="鎽勫儚鏈哄悕绉�" - width="100" - align="center" - ></el-table-column> - <el-table-column - prop="startTime" - label="寮�濮嬫椂闂�" - align="center" - ></el-table-column> - <el-table-column - prop="endTime" - label="缁撴潫鏃堕棿" - align="center" - ></el-table-column> - <el-table-column - prop="stayTime" - label="鍋滅暀鏃堕暱" - width="99" - align="center" - > + <el-table-column prop="cameraName" label="鎽勫儚鏈哄悕绉�" width="100" align="center"></el-table-column> + <el-table-column prop="startTime" label="寮�濮嬫椂闂�" align="center"></el-table-column> + <el-table-column prop="endTime" label="缁撴潫鏃堕棿" align="center"></el-table-column> + <el-table-column prop="stayTime" label="鍋滅暀鏃堕暱" width="99" align="center"> <template slot-scope="scope"> <span>{{ scope.row.stayTime }} 绉�</span> </template> @@ -413,21 +298,11 @@ </el-table> <div class="bot-btn"> - <el-button - size="mini" - type="primary" - @click="cameraDetailVisible = false" - >鍏抽棴</el-button - > + <el-button size="mini" type="primary" @click="cameraDetailVisible = false">鍏抽棴</el-button> </div> </el-dialog> <el-drawer title="淇敼淇℃伅" :modal="false" :visible.sync="showInfoDrawer"> - <el-form - ref="formForEdit" - :model="form" - label-width="100px" - :rules="rules" - > + <el-form ref="formForEdit" :model="inputPersonForm" label-width="100px" :rules="rules"> <div class="flex-center mb10"> <el-upload class="avatar-uploader" @@ -439,11 +314,7 @@ :on-error="uploadError" > <div class="mask1"> - <div - slot="trigger" - class="flex-center" - style="position: absolute; top: 70px" - > + <div slot="trigger" class="flex-center" style="position: absolute; top: 70px"> <p style=" background: rgba(0, 0, 0, 0.35); @@ -459,8 +330,8 @@ </div> </div> <img - v-if="`httpImage/` + form.personPicUrl" - :src="`/httpImage/` + form.personPicUrl" + v-if="`httpImage/` + inputPersonForm.personPicUrl" + :src="`/httpImage/` + inputPersonForm.personPicUrl" style=" max-height: 100px; width: 100px; @@ -474,49 +345,28 @@ <el-row> <el-col :span="20"> <el-form-item label="ID" style="width: 100%; margin-bottom: 20px"> - <el-input - size="small" - v-model="form.id" - disabled - placeholder="璇疯緭鍏�" - ></el-input> + <el-input size="small" v-model="inputPersonForm.id" disabled placeholder="璇疯緭鍏�"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> - <el-form-item - label="鐓х墖鏍囪瘑" - prop="picDesc" - style="width: 100%; margin-bottom: 20px" - > - <el-input - size="small" - v-model="form.picDesc" - placeholder="璇疯緭鍏�" - ></el-input> + <el-form-item label="鐓х墖鏍囪瘑" prop="picDesc" style="width: 100%; margin-bottom: 20px"> + <el-input size="small" v-model="inputPersonForm.picDesc" placeholder="璇疯緭鍏�"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> <el-form-item label="濮撳悕" style="width: 100%; margin-bottom: 20px"> - <el-input - size="small" - v-model="form.personName" - placeholder="璇疯緭鍏�" - ></el-input> + <el-input size="small" v-model="inputPersonForm.personName" placeholder="璇疯緭鍏�"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> - <el-form-item - label="鎬у埆" - prop="sex" - style="width: 100%; margin-bottom: 20px; text-align: left" - > - <el-radio-group v-model="form.sex" class="mt10"> + <el-form-item label="鎬у埆" prop="sex" style="width: 100%; margin-bottom: 20px; text-align: left"> + <el-radio-group v-model="inputPersonForm.sex" class="mt10"> <el-radio label="鐢�"></el-radio> <el-radio label="濂�"></el-radio> </el-radio-group> @@ -525,45 +375,22 @@ </el-row> <el-row> <el-col :span="20"> - <el-form-item - label="韬唤璇佸彿" - style="width: 100%; margin-bottom: 20px" - > - <el-input - size="small" - v-model="form.idCard" - placeholder="璇疯緭鍏�" - ></el-input> + <el-form-item label="韬唤璇佸彿" prop="idCard" style="width: 100%; margin-bottom: 20px"> + <el-input size="small" v-model="inputPersonForm.idCard" placeholder="璇疯緭鍏�"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> - <el-form-item - label="鎵嬫満鍙�" - style="width: 100%; margin-bottom: 20px" - > - <el-input - size="small" - v-model="form.phoneNum" - placeholder="璇疯緭鍏�" - ></el-input> + <el-form-item label="鎵嬫満鍙�" prop="phoneNum" style="width: 100%; margin-bottom: 20px"> + <el-input size="small" v-model="inputPersonForm.phoneNum" placeholder="璇疯緭鍏�"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> - <el-form-item - label="浜哄憳绛夌骇" - prop="monitorLevel" - style="width: 100%; margin-bottom: 20px" - > - <el-select - size="small" - v-model="form.monitorLevel" - placeholder="璇烽�夋嫨" - style="width: 100%" - > + <el-form-item label="浜哄憳绛夌骇" prop="monitorLevel" style="width: 100%; margin-bottom: 20px"> + <el-select size="small" v-model="inputPersonForm.monitorLevel" placeholder="璇烽�夋嫨" style="width: 100%"> <el-option v-for="item in VideoPhotoData.dictionary.MONITORLEVEL" :key="item.value" @@ -576,67 +403,33 @@ </el-row> <el-row> <el-col :span="20"> - <el-form-item - label="鍏ュ簱浣嶇疆" - style="width: 100%; margin-bottom: 20px" - > - <el-input - size="small" - v-model="form.fromServerId" - disabled - ></el-input> + <el-form-item label="鍏ュ簱浣嶇疆" style="width: 100%; margin-bottom: 20px"> + <el-input size="small" v-model="inputPersonForm.fromServerId" disabled></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> - <el-form-item - label="鍏ュ簱鏃堕棿" - style="width: 100%; margin-bottom: 20px" - > - <el-input - size="small" - v-model="form.createTime" - disabled - ></el-input> + <el-form-item label="鍏ュ簱鏃堕棿" style="width: 100%; margin-bottom: 20px"> + <el-input size="small" v-model="inputPersonForm.createTime" disabled></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="20"> <el-form-item label="鍏朵粬" style="width: 100%; margin-bottom: 20px"> - <el-input - size="small" - v-model="form.reserved" - placeholder="璇疯緭鍏�" - ></el-input> + <el-input size="small" v-model="inputPersonForm.reserved" placeholder="璇疯緭鍏�"></el-input> </el-form-item> </el-col> </el-row> </el-form> <div class="dialog-footer"> - <el-button - size="small" - class="cancel-btn" - @click="handleClose" - type="info" - >鍙� 娑�</el-button - > - <el-button - size="small" - class="sure-btn" - type="primary" - @click="submit()" - >纭� 瀹�</el-button - > + <!-- {{BaseManageData.personList[1].idCard}} --> + <el-button size="small" class="cancel-btn" @click="handleClose" type="info">鍙栨秷</el-button> + <el-button size="small" class="sure-btn" type="primary" @click="submit">纭畾</el-button> </div> </el-drawer> - <el-dialog - :visible.sync="dialogVisible" - :close="getPersonList" - :center="true" - custom-class="suc-dialog" - > + <el-dialog :visible.sync="dialogVisible" :close="getPersonList" :center="true" custom-class="suc-dialog"> <div> <div class="suc-icon"> <i class="iconfont iconduigou3"></i> @@ -647,51 +440,31 @@ </div> <div class="flex-box mt10"> <span>涓婁紶澶辫触鐨勬暟閲忥細{{ uploadResult.failList.length }}</span> - <div - class="ml20" - v-for="(i, index) in uploadResult.failList" - :key="index" - > + <div class="ml20" v-for="(i, index) in uploadResult.failList" :key="index"> {{ i }} </div> </div> <div class="flex-box mt10"> - <span - >鍖呭惈澶氬紶浜鸿劯鐨勫浘鐗囨暟閲忥細{{ - uploadResult.multiFaceList.length - }}</span - > - <div - class="ml20" - v-for="(i, index) in uploadResult.multiFaceList" - :key="index" - > + <span>鍖呭惈澶氬紶浜鸿劯鐨勫浘鐗囨暟閲忥細{{ uploadResult.multiFaceList.length }}</span> + <div class="ml20" v-for="(i, index) in uploadResult.multiFaceList" :key="index"> {{ i }} </div> </div> <div class="flex-box mt10"> <span>涓嶅惈浜鸿劯鐨勫浘鐗囨暟閲忥細{{ uploadResult.noFaceList.length }}</span> - <div - class="ml20" - v-for="(i, index) in uploadResult.noFaceList" - :key="index" - > + <div class="ml20" v-for="(i, index) in uploadResult.noFaceList" :key="index"> {{ i }} </div> </div> </div> <span slot="footer" class="dialog-footer"> <el-button @click="dialogVisible = false">鍙� 娑�</el-button> - <el-button type="primary" @click="dialogVisible = false" - >纭� 瀹�</el-button - > + <el-button type="primary" @click="dialogVisible = false">纭� 瀹�</el-button> </span> </el-dialog> - <el-dialog - :visible.sync="askDeleteShow" - :center="true" - custom-class="del-dialog" - > + + <!-- 纭鍒犻櫎瀵硅瘽妗� --> + <el-dialog :visible.sync="askDeleteShow" :center="true" custom-class="del-dialog"> <div> <div class="suc-icon"> <i class="iconfont icongantanhao1"></i> @@ -703,42 +476,27 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="askDeleteShow = false">鍙� 娑�</el-button> - <el-button type="primary" @click="handleDel">纭� 瀹�</el-button> + <el-button type="primary" @click="handleDel" :loading="delBtnLoading">纭� 瀹�</el-button> </span> </el-dialog> - <el-dialog - title="澶嶅埗鍒�" - :visible.sync="copyVisiabled" - okText="淇濆瓨" - custom-class="copy-dialog" - cancelText="鍙栨秷" - > + + <el-dialog title="澶嶅埗鍒�" :visible.sync="copyVisiabled" okText="淇濆瓨" custom-class="copy-dialog" cancelText="鍙栨秷"> <div class="addToBase1"> <div class="items" v-if="baseObject.bwType === '1'"> <div class="lable"> <p>榛戝悕鍗�</p> </div> <div class="baseList"> - <el-checkbox-group - v-model="BaseManageData.selectBlacks" - @change="blackAngWhite" - > + <el-checkbox-group v-model="BaseManageData.selectBlacks" @change="blackAngWhite"> <div class="base" v-for="(item, index) in BaseManageData.blackList" :key="index" - :class=" - BaseManageData.selectBlacks.includes(item.value) - ? 'white-wrap' - : '' - " + :class="BaseManageData.selectBlacks.includes(item.value) ? 'white-wrap' : ''" > - <el-checkbox - :label="item.value" - :title="item.title" - :disabled="item.disabled" - >{{ item.title }}</el-checkbox - > + <el-checkbox :label="item.value" :title="item.title" :disabled="item.disabled">{{ + item.title + }}</el-checkbox> </div> </el-checkbox-group> </div> @@ -748,26 +506,16 @@ <p>鐧藉悕鍗�</p> </div> <div class="baseList"> - <el-checkbox-group - v-model="BaseManageData.selectWhites" - @change="blackAngWhite" - > + <el-checkbox-group v-model="BaseManageData.selectWhites" @change="blackAngWhite"> <div class="base" - :class=" - BaseManageData.selectWhites.includes(item.value) - ? 'white-wrap' - : '' - " + :class="BaseManageData.selectWhites.includes(item.value) ? 'white-wrap' : ''" v-for="(item, index) in BaseManageData.whiteList" :key="index" > - <el-checkbox - :label="item.value" - :title="item.title" - :disabled="item.disabled" - >{{ item.title }}</el-checkbox - > + <el-checkbox :label="item.value" :title="item.title" :disabled="item.disabled">{{ + item.title + }}</el-checkbox> </div> </el-checkbox-group> </div> @@ -775,46 +523,27 @@ </div> <div slot="footer" class="dialog-footer"> <el-button size="small" @click="copyClose" type="info">鍙� 娑�</el-button> - <el-button size="small" type="primary" @click="copySubmit()" - >纭� 瀹�</el-button - > + <el-button size="small" type="primary" @click="copySubmit()">纭� 瀹�</el-button> </div> </el-dialog> - <el-dialog - title="绉诲姩鑷�" - :visible.sync="moveVisiabled" - okText="淇濆瓨" - custom-class="copy-dialog" - cancelText="鍙栨秷" - > + <el-dialog title="绉诲姩鑷�" :visible.sync="moveVisiabled" okText="淇濆瓨" custom-class="copy-dialog" cancelText="鍙栨秷"> <div class="addToBase1"> <div class="items"> <div class="lable"> <p>榛戝悕鍗�</p> </div> <div class="baseList"> - <el-checkbox-group - v-model="BaseManageData.selectBlacks" - @change="blackAngWhite" - :max="1" - > + <el-checkbox-group v-model="BaseManageData.selectBlacks" @change="blackAngWhite" :max="1"> <div class="base" v-for="(item, index) in BaseManageData.blackList" :key="index" - :class=" - BaseManageData.selectBlacks.includes(item.value) - ? 'white-wrap' - : '' - " + :class="BaseManageData.selectBlacks.includes(item.value) ? 'white-wrap' : ''" > - <el-checkbox - :label="item.value" - :title="item.title" - :disabled="item.disabled" - >{{ item.title }}</el-checkbox - > + <el-checkbox :label="item.value" :title="item.title" :disabled="item.disabled">{{ + item.title + }}</el-checkbox> </div> </el-checkbox-group> </div> @@ -824,27 +553,16 @@ <p>鐧藉悕鍗�</p> </div> <div class="baseList"> - <el-checkbox-group - v-model="BaseManageData.selectWhites" - @change="blackAngWhite" - :max="1" - > + <el-checkbox-group v-model="BaseManageData.selectWhites" @change="blackAngWhite" :max="1"> <div class="base" v-for="(item, index) in BaseManageData.whiteList" :key="index" - :class=" - BaseManageData.selectWhites.includes(item.value) - ? 'white-wrap' - : '' - " + :class="BaseManageData.selectWhites.includes(item.value) ? 'white-wrap' : ''" > - <el-checkbox - :label="item.value" - :title="item.title" - :disabled="item.disabled" - >{{ item.title }}</el-checkbox - > + <el-checkbox :label="item.value" :title="item.title" :disabled="item.disabled">{{ + item.title + }}</el-checkbox> </div> </el-checkbox-group> </div> @@ -852,9 +570,7 @@ </div> <div slot="footer" class="dialog-footer"> <el-button size="small" @click="moveClose" type="info">鍙� 娑�</el-button> - <el-button size="small" type="primary" @click="moveSubmit()" - >纭� 瀹�</el-button - > + <el-button size="small" type="primary" @click="moveSubmit()">纭� 瀹�</el-button> </div> </el-dialog> </div> @@ -864,14 +580,29 @@ updateBasePerson, deleteBasePersons, updateDbTableStatus, -} from "@/api/baseLibrary"; -import { getCameraFaceData } from "@/api/es"; -import axios from "axios"; -import UploadBtn from "./upload"; -import fTemplate from "@/components/fTemplate"; -import UploadIcon from "@/components/searching/UploadIcon.vue"; + deleteDbPersonById, + deleteDBtablesById +} from "@/api/baseLibrary" +import { getCameraFaceData } from "@/api/es" +// import { checkIDCard } from "@/api/utils"; +import { isIDCard } from "../../../scripts/validate" -Date.prototype.Format = function (fmt) { +import axios from "axios" +import UploadBtn from "./upload" +import fTemplate from "@/components/fTemplate" +import UploadIcon from "@/components/searching/UploadIcon.vue" +function isPhone(rule, value, callback) { + if (!value) { + return callback() + } else if (value.trim()) { + var pattern = /^1[345789]\d{9}$/ + if (pattern.test(value)) { + return callback() + } + return callback(new Error("杈撳叆鐨勬墜鏈哄彿閿欒")) + } +} +Date.prototype.Format = function(fmt) { var o = { "M+": this.getMonth() + 1, //鏈堜唤 "d+": this.getDate(), //鏃� @@ -879,34 +610,59 @@ "m+": this.getMinutes(), //鍒� "s+": this.getSeconds(), //绉� "q+": Math.floor((this.getMonth() + 3) / 3), //瀛e害 - S: this.getMilliseconds(), //姣 - }; - if (/(y+)/.test(fmt)) - fmt = fmt.replace( - RegExp.$1, - (this.getFullYear() + "").substr(4 - RegExp.$1.length) - ); + S: this.getMilliseconds() //姣 + } + if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length)) for (var k in o) if (new RegExp("(" + k + ")").test(fmt)) - fmt = fmt.replace( - RegExp.$1, - RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length) - ); - return fmt; -}; + fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)) + return fmt +} export default { + components: { + UploadBtn, + fTemplate, + UploadIcon + }, + props: { + baseObject: { + default: () => {}, + type: Object + }, + syncType: { + type: String + } + }, + computed: { + isAdmin() { + if (sessionStorage.getItem("userInfo") && sessionStorage.getItem("userInfo") !== "") { + let loginName = JSON.parse(sessionStorage.getItem("userInfo")).username + return loginName === "superadmin" || loginName === "basic" + } + return false + }, + delText() { + switch (this.delType) { + case "base": + return ["鍒犻櫎搴曞簱", "纭畾鍒犻櫎璇ュ簳搴擄紵"] + case "single": + return ["鍒犻櫎浜哄憳", "纭畾鍒犻櫎璇ュ簳搴撲汉鍛橈紵"] + case "batch": + return ["鎵归噺鍒犻櫎", "纭畾鍒犻櫎璇ュ簳搴撻�変腑浜哄憳锛�"] + default: + return ["", ""] + } + } + }, data() { return { - timeRange: [ - new Date(2020, 7, 25, 8), - new Date(new Date().setHours(23, 59, 59)), - ], + timeRange: [new Date(2020, 7, 25, 8), new Date(new Date().setHours(23, 59, 59))], memberInfo: { personName: "", sex: "", idCard: "", - reserved: "", + reserved: "" }, askDeleteShow: false, toDeleteId: "", @@ -914,11 +670,10 @@ startTime: new Date(2020, 7, 25, 8).Format("yyyy-MM-dd HH:mm:ss"), endTime: new Date().Format("yyyy-MM-dd HH:mm:ss"), thresholdTime: 10, - faceId: [], + faceId: [] }, cameraDetailData: [], cameraDetailVisible: false, - dialogFormVisible: false, copyVisiabled: false, moveVisiabled: false, buttonAuthority: sessionStorage.getItem("buttonAuthoritys") || [], @@ -933,27 +688,13 @@ visible: false, showInfoDrawer: false, selectedRowKeys: [], - form: { - id: "", - sex: "鐢�", - personName: "鍛靛懙鍛�", - tableId: "", - picDesc: "", - idCard: "12312938102143253", - phoneNum: "18712766787", - monitorLevel: "one", - faceUrl: "group2/M00/0A/D7/wKgBnFyjH0-AUE5eAAC8hSMP2Yw110.jpg", - enable: 0, - reserved: "", - }, + inputPersonForm: {}, rules: { - picDesc: [ - { required: true, message: "璇疯緭鍏ョ収鐗囨爣璇�", trigger: "change" }, - ], + picDesc: [{ required: true, message: "璇疯緭鍏ョ収鐗囨爣璇�", trigger: "change" }], sex: [{ required: true, message: "璇峰嬀閫夋�у埆", trigger: "change" }], - monitorLevel: [ - { required: true, message: "璇烽�夋嫨浜哄憳绛夌骇", trigger: "change" }, - ], + idCard: [{ validator: isIDCard, trigger: "blur" }], + phoneNum: [{ validator: isPhone, trigger: "blur" }], + monitorLevel: [{ required: true, message: "璇烽�夋嫨浜哄憳绛夌骇", trigger: "change" }] }, tableData: [], oldWidth: "", @@ -967,71 +708,55 @@ failList: [], successList: [], multiFaceList: [], - noFaceList: [], + noFaceList: [] }, - }; + delBtnLoading: false + } }, - computed: { - isAdmin() { - if ( - sessionStorage.getItem("userInfo") && - sessionStorage.getItem("userInfo") !== "" - ) { - let loginName = JSON.parse(sessionStorage.getItem("userInfo")).username; - return loginName === "superadmin" || loginName === "basic"; - } - return false; + + watch: { + "BaseManageData.selectBlacks": function(value) { + this.blackAngWhite() }, - delText() { - switch (this.delType) { - case "base": - return ["鍒犻櫎搴曞簱", "纭畾鍒犻櫎璇ュ簳搴擄紵"]; - case "single": - return ["鍒犻櫎浜哄憳", "纭畾鍒犻櫎璇ュ簳搴撲汉鍛橈紵"]; - case "batch": - return ["鎵归噺鍒犻櫎", "纭畾鍒犻櫎璇ュ簳搴撻�変腑浜哄憳锛�"]; - default: - return ["", ""]; - } - }, + "BaseManageData.selectWhites": function(value) { + this.blackAngWhite() + } }, methods: { postCameraData() { getCameraFaceData(this.reqCameraParams).then((res) => { if (res && res.rtnCode == 1) { - this.cameraDetailData = res.rtnData; - this.faceDataCount = res.rtnData.length; + this.cameraDetailData = res.rtnData + this.faceDataCount = res.rtnData.length } - }); + }) }, timeChange(val) { - this.reqCameraParams.startTime = val[0]; - this.reqCameraParams.endTime = val[1]; + this.reqCameraParams.startTime = val[0] + this.reqCameraParams.endTime = val[1] }, showDetail(row) { - this.cameraDetailData = []; - this.memberInfo.reserved = row.reserved; - this.memberInfo.idCard = row.idCard; - this.memberInfo.personName = row.personName; - this.memberInfo.sex = row.sex; - this.reqCameraParams.faceId = row.id; - this.cameraDetailVisible = true; + this.cameraDetailData = [] + this.memberInfo.reserved = row.reserved + this.memberInfo.idCard = row.idCard + this.memberInfo.personName = row.personName + this.memberInfo.sex = row.sex + this.reqCameraParams.faceId = row.id + this.cameraDetailVisible = true }, isShow(authority) { - return ( - this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1 - ); + return this.isAdmin || this.buttonAuthority.indexOf("," + authority + ",") > -1 }, pickRow(row, column, event) { - this.$refs.multipleTable.toggleRowSelection(row); + this.$refs.multipleTable.toggleRowSelection(row) }, toggleSelection(rows) { if (rows) { rows.forEach((row) => { - this.$refs.multipleTable.toggleRowSelection(row); - }); + this.$refs.multipleTable.toggleRowSelection(row) + }) } else { - this.$refs.multipleTable.clearSelection(); + this.$refs.multipleTable.clearSelection() } }, askDelete(typ, id) { @@ -1040,177 +765,155 @@ this.$notify({ type: "warning", message: "璇烽�夋嫨瑕佸垹闄ょ殑浜哄憳", - duration: 1000000, - }); - return; + duration: 1000000 + }) + return } } - this.askDeleteShow = true; - this.delType = typ; - id && (this.toDeleteId = id); + this.askDeleteShow = true + this.delType = typ + id && (this.toDeleteId = id) }, - deleteThis() { - let token = - sessionStorage.getItem("loginedInfo") && - JSON.parse(sessionStorage.getItem("loginedInfo")).access_token; - - fetch(`/data/api-v/dbperson/deleteDbPersonById?id=${this.toDeleteId}`, { - method: "GET", - headers: { - "Content-Type": "application/json", - Authorization: token, - }, - }) - .then((res) => { - return res.json(); - }) - .then((data) => { - if (data.success) { - this.$notify({ - type: "success", - message: "璇ヤ汉鍛樺垹闄ゆ垚鍔燂紒", - }); - this.askDeleteShow = false; - } - this.getPersonList(); - }) - .catch((err) => {}); - }, - sayHello() {}, getUploadResult(result) { - this.uploadResult = result.data; - this.dialogVisible = true; - this.getPersonList(); + this.uploadResult = result.data + this.dialogVisible = true + this.getPersonList() }, async setEnable(item) { let res = await updateDbTableStatus({ id: item.id, - enable: item.enable, - }); + enable: item.enable + }) if (res.success) { this.$notify({ type: "success", - message: "搴曞簱鎴愬姛鍙樻洿鐢熸晥鐘舵�侊紒", - }); + message: "搴曞簱鎴愬姛鍙樻洿鐢熸晥鐘舵�侊紒" + }) } else { this.$notify({ type: "error", - message: "搴曞簱鍙樻洿鐢熸晥鐘舵�佸け璐ワ紒", - }); + message: "搴曞簱鍙樻洿鐢熸晥鐘舵�佸け璐ワ紒" + }) } }, isDisabled(item) { - var flag = true; + var flag = true if (this.isShow("library:set")) { if (item.endTime == "") { - flag = false; + flag = false } else { - flag = !this.$moment(new Date()).isBetween( - item.startTime, - item.endTime - ); + flag = !this.$moment(new Date()).isBetween(item.startTime, item.endTime) } } - return flag; + return flag }, edit() { - this.$emit("changeShow", this.baseObject, this.syncType); + this.$emit("changeShow", this.baseObject, this.syncType) + }, + + deleteThis() { + deleteDbPersonById({ id: this.toDeleteId }) + .then((data) => { + if (data.success) { + this.$notify({ + type: "success", + message: "璇ヤ汉鍛樺垹闄ゆ垚鍔燂紒" + }) + } + this.getPersonList() + }) + .catch((err) => {}) }, deleteBase() { - let token = - sessionStorage.getItem("loginedInfo") && - JSON.parse(sessionStorage.getItem("loginedInfo")).access_token; - fetch(`/data/api-v/dbtable/deleteDBtablesById?id=${this.baseObject.id}`, { - method: "GET", - headers: { - "Content-Type": "application/json", - Authorization: token, - }, - }) - .then((res) => { - return res.json(); - }) + deleteDBtablesById({ id: this.baseObject.id }) .then((res) => { if (res.success) { this.$notify({ type: "success", - message: "搴曞簱鍒犻櫎鎴愬姛锛�", - }); + message: "搴曞簱鍒犻櫎鎴愬姛锛�" + }) } - this.$emit("onDelete"); + + this.$emit("onDelete") }) .catch((err) => { this.$notify({ type: "error", - message: err, - }); - }); + message: err + }) + }) + }, + async deleteBatch() { + let ids = [] + this.selectedRowKeys.map((item, index) => { + ids.push(item.id) + }) + let res = await deleteBasePersons({ ids: ids }) + if (res.success) { + this.$notify({ + type: "success", + message: "鍒犻櫎鎴愬姛锛�" + }) + this.getPersonList() + } else { + this.$notify({ + type: "error", + message: "鍒犻櫎澶辫触锛�" + }) + } }, async getPersonList() { this.$nextTick(() => { if (this.baseObject.id && this.baseObject.id !== undefined) { - this.BaseManageData.tableId = this.baseObject.id; - this.setLoadSearch(this.BaseManageData.queryPersonList()); - } + this.BaseManageData.tableId = this.baseObject.id + this.setLoadSearch(this.BaseManageData.queryPersonList()) + } }) }, changeDialog(data) { data.erFileList.map((item, index) => { this.$notify({ type: "error", - message: item.errorMsg.message, - }); - }); + message: item.errorMsg.message + }) + }) }, handleClose() { - this.showInfoDrawer = false; + this.showInfoDrawer = false }, handleSelectionChange(val) { - this.selectedRowKeys = val; + this.selectedRowKeys = val }, refrash(current, pageSize) { - this.current = current; - this.BaseManageData.page = current; - this.getPersonList(); + this.current = current + this.BaseManageData.page = current + this.getPersonList() }, handleSizeChange(val) { - this.BaseManageData.size = val; - this.getPersonList(); + this.BaseManageData.size = val + this.getPersonList() }, - handleClick(row) { - this.form = row; - this.showInfoDrawer = true; + editRow(row) { + this.inputPersonForm = { ...row } + this.showInfoDrawer = true }, async submit() { this.$refs["formForEdit"].validate(async (valid) => { if (valid) { - let { ...json } = this.form; - delete json["compareScore"]; - let res = await updateBasePerson(json); + let { ...json } = this.inputPersonForm + delete json["compareScore"] + let res = await updateBasePerson(json) if (res.success) { - this.$notify({ - type: "success", - message: "浜哄憳淇敼鎴愬姛锛�", - }); - this.showInfoDrawer = false; + this.getPersonList() + this.$notify.success("浜哄憳淇敼鎴愬姛锛�") + this.showInfoDrawer = false } else { - this.$notify({ - type: "error", - message: "浜哄憳淇敼澶辫触锛岃閲嶈瘯锛侊紒", - }); + this.$notify.error("浜哄憳淇敼澶辫触锛岃閲嶈瘯锛�") } } else { - return false; + return false } - }); - }, - confirm() { - this.$confirm({ - title: "Confirm", - content: "Bla bla ...", - okText: "纭", - cancelText: "鍙栨秷", - }); + }) }, async enable(item) { let res = await updateBasePerson({ @@ -1223,40 +926,44 @@ phoneNum: item.phoneNum, monitorLevel: item.monitorLevel, personPicUrl: item.personPicUrl, - reserved: item.reserved, - }); + reserved: item.reserved + }) if (res.success === true) { this.$notify({ type: "success", - message: "搴曞簱浜哄憳鎴愬姛鍙樻洿鐢熸晥鐘舵�侊紒", - }); + message: "搴曞簱浜哄憳鎴愬姛鍙樻洿鐢熸晥鐘舵�侊紒" + }) } else { this.$notify({ type: "error", - message: "搴曞簱浜哄憳鍙樻洿鐢熸晥鐘舵�佸け璐ワ紒", - }); + message: "搴曞簱浜哄憳鍙樻洿鐢熸晥鐘舵�佸け璐ワ紒" + }) } }, handleSearch() { - this.getPersonList(); + this.getPersonList() }, - handleDel() { + async handleDel() { + this.delBtnLoading = true if (this.delType == "single") { - this.deleteThis(); + await this.deleteThis() } else if (this.delType == "base") { - this.deleteBase(); + await this.deleteBase() } else if (this.delType == "batch") { - this.deleteBatch(); + await this.deleteBatch() } + + this.delBtnLoading = false + this.askDeleteShow = false }, searchImg() { - this.$refs.uploadDrag && this.$refs.uploadDrag.uploadStart(); + this.$refs.uploadDrag && this.$refs.uploadDrag.uploadStart() }, haveScore(row) { if (row.compareScore && row.compareScore !== "") { - return true; + return true } else { - return false; + return false } }, async searchImgList(faceUrl, threshold) { @@ -1267,262 +974,199 @@ faceUrl: faceUrl, threshold: threshold, orderType: this.orderType, - orderName: this.orderName, - }; - let res = await getPersonByPhoto(json); - this.tableData = res.data.datalist; - this.total = res.data.total; - this.compare = true; + orderName: this.orderName + } + let res = await getPersonByPhoto(json) + this.tableData = res.data.datalist + this.total = res.data.total + this.compare = true }, updateThreshold() {}, async updateFace(param) { - const fd = new FormData(); - fd.append("file", param.file); - fd.append("id", this.form.id); + const fd = new FormData() + fd.append("file", param.file) + fd.append("id", this.inputPersonForm.id) let res = await axios({ method: "post", url: `/data/api-v/dbperson/updateFace`, headers: { Authorization: - sessionStorage.getItem("loginedInfo") && - JSON.parse(sessionStorage.getItem("loginedInfo")).access_token, + sessionStorage.getItem("loginedInfo") && JSON.parse(sessionStorage.getItem("loginedInfo")).access_token }, - data: fd, - }); + data: fd + }) if (res.data.success) { - this.form.persoasyncnPicUrl = res.data.data.personPicUrl; - this.form.faceFeature = res.data.data.faceFeature; + this.inputPersonForm.persoasyncnPicUrl = res.data.data.personPicUrl + this.inputPersonForm.faceFeature = res.data.data.faceFeature } }, uploadSuccess() {}, uploadError() {}, - async deleteBatch() { - let ids = []; - this.selectedRowKeys.map((item, index) => { - ids.push(item.id); - }); - let res = await deleteBasePersons(ids); - if (res.success) { - this.$notify({ - type: "success", - message: "鍒犻櫎鎴愬姛锛�", - }); - this.getPersonList(); - } else { - this.$notify({ - type: "error", - message: "鍒犻櫎澶辫触锛�", - }); - } - }, async init() { - await this.BaseManageData.querySyncTables(); - await this.BaseManageData.queryLocalTables(); + await this.BaseManageData.querySyncTables() + await this.BaseManageData.queryLocalTables() if (this.baseObject.id && this.baseObject.id !== undefined) { - } else if ( - this.BaseManageData.syncTables[0].id && - this.BaseManageData.syncTables[0].id !== undefined - ) { - this.BaseManageData.tableId = this.BaseManageData.syncTables[0].id; - this.BaseManageData.queryPersonList(); + } else if (this.BaseManageData.syncTables[0].id && this.BaseManageData.syncTables[0].id !== undefined) { + this.BaseManageData.tableId = this.BaseManageData.syncTables[0].id + this.BaseManageData.queryPersonList() } else { - this.BaseManageData.tableId = this.BaseManageData.localTables[0].id; - this.BaseManageData.queryPersonList(); + this.BaseManageData.tableId = this.BaseManageData.localTables[0].id + this.BaseManageData.queryPersonList() } }, blackAngWhite() { if (this.BaseManageData.selectBlacks.length > 0) { for (let i = 0; i < this.BaseManageData.whiteList.length; i++) { //this.VideoPhotoData.whiteList[i].disabled = true - this.$set(this.BaseManageData.whiteList[i], "disabled", true); + this.$set(this.BaseManageData.whiteList[i], "disabled", true) } } if (this.BaseManageData.selectBlacks.length == 0) { for (let i = 0; i < this.BaseManageData.whiteList.length; i++) { //this.VideoPhotoData.whiteList[i].disabled = false - this.$set(this.BaseManageData.whiteList[i], "disabled", false); + this.$set(this.BaseManageData.whiteList[i], "disabled", false) } } if (this.BaseManageData.selectWhites.length > 0) { for (let i = 0; i < this.BaseManageData.blackList.length; i++) { // this.VideoPhotoData.blackList[i].disabled = true - this.$set(this.BaseManageData.blackList[i], "disabled", true); + this.$set(this.BaseManageData.blackList[i], "disabled", true) } } if (this.BaseManageData.selectWhites.length == 0) { for (let i = 0; i < this.BaseManageData.blackList.length; i++) { //this.VideoPhotoData.blackList[i].disabled = false - this.$set(this.BaseManageData.blackList[i], "disabled", false); + this.$set(this.BaseManageData.blackList[i], "disabled", false) } } }, tosearch(item) { //let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id - let captureId = item.id == "" ? item.personId : item.id; - let imgUrl = item.personPicUrl ? item.personPicUrl : item.personPicUrl; - let compType = 0; + let captureId = item.id == "" ? item.personId : item.id + let imgUrl = item.personPicUrl ? item.personPicUrl : item.personPicUrl + let compType = 0 let message = - "toSearch?showType=findByPic&targetId=" + - captureId + - "&picSmUrl=" + - imgUrl + - "&compType=" + - compType; + "toSearch?showType=findByPic&targetId=" + captureId + "&picSmUrl=" + imgUrl + "&compType=" + compType window.parent.postMessage( { - msg: message, + msg: message }, "*" - ); + ) }, copyClick(row) { - this.BaseManageData.personId = row.id; - this.copyVisiabled = true; + this.BaseManageData.personId = row.id + this.copyVisiabled = true }, moveClick(row) { - this.BaseManageData.personId = row.id; - this.moveVisiabled = true; + this.BaseManageData.personId = row.id + this.moveVisiabled = true }, copyClose() { - this.copyVisiabled = false; - this.BaseManageData.personId = ""; - this.BaseManageData.selectBlacks = []; - this.BaseManageData.selectWhites = []; + this.copyVisiabled = false + this.BaseManageData.personId = "" + this.BaseManageData.selectBlacks = [] + this.BaseManageData.selectWhites = [] }, moveClose() { - this.moveVisiabled = false; - this.BaseManageData.personId = ""; - this.BaseManageData.selectBlacks = []; - this.BaseManageData.selectWhites = []; + this.moveVisiabled = false + this.BaseManageData.personId = "" + this.BaseManageData.selectBlacks = [] + this.BaseManageData.selectWhites = [] }, copySubmit() { - if ( - this.BaseManageData.selectBlacks.length === 0 && - this.BaseManageData.selectWhites.length === 0 - ) { + if (this.BaseManageData.selectBlacks.length === 0 && this.BaseManageData.selectWhites.length === 0) { this.$notify({ title: "娉ㄦ剰", message: "璇烽�夋嫨瑕佸鍒跺埌鐨勫簱", - type: "warning", - }); - return; + type: "warning" + }) + return } - var resp = this.BaseManageData.copyTo(); + var resp = this.BaseManageData.copyTo() resp.then((data) => { if (data.success) { this.$notify({ title: "鎴愬姛", message: data.data, - type: "success", - }); + type: "success" + }) } else { this.$notify({ title: "澶辫触", message: data.data, - type: "error", - }); + type: "error" + }) } - }); - this.copyVisiabled = false; - this.BaseManageData.personId = ""; - this.BaseManageData.selectBlacks = []; - this.BaseManageData.selectWhites = []; + }) + this.copyVisiabled = false + this.BaseManageData.personId = "" + this.BaseManageData.selectBlacks = [] + this.BaseManageData.selectWhites = [] }, moveSubmit() { - if ( - this.BaseManageData.selectBlacks.length === 0 && - this.BaseManageData.selectWhites.length === 0 - ) { + if (this.BaseManageData.selectBlacks.length === 0 && this.BaseManageData.selectWhites.length === 0) { this.$notify({ title: "娉ㄦ剰", message: "璇烽�夋嫨瑕佺Щ鍔ㄥ埌鐨勫簱", - type: "warning", - }); - return; + type: "warning" + }) + return } - var resp = this.BaseManageData.moveTo(); + var resp = this.BaseManageData.moveTo() resp.then((data) => { if (data.success) { this.$notify({ title: "鎴愬姛", message: data.data, - type: "success", - }); + type: "success" + }) } else { this.$notify({ title: "澶辫触", message: data.data, - type: "error", - }); + type: "error" + }) } - this.moveVisiabled = false; - this.BaseManageData.personId = ""; - this.BaseManageData.selectBlacks = []; - this.BaseManageData.selectWhites = []; - this.BaseManageData.queryPersonList(); - }); + this.moveVisiabled = false + this.BaseManageData.personId = "" + this.BaseManageData.selectBlacks = [] + this.BaseManageData.selectWhites = [] + this.BaseManageData.queryPersonList() + }) }, setLoadSearch(fn) { - this.AuthData.setLoading("multipleTable", this); + this.AuthData.setLoading("multipleTable", this) fn.then((_) => { - this.AuthData.closeLoad(); - }); - }, + this.AuthData.closeLoad() + }) + } }, mounted() { - this.getPersonList(); - this.VideoPhotoData.queryDictionary(); - this.BaseManageData.queryTagList(); - this.oldWidth = document.body.clientWidth; - this.oldHeight = document.body.clientHeight; - this.blackAngWhite(); + this.getPersonList() + this.VideoPhotoData.queryDictionary() + this.BaseManageData.queryTagList() + this.oldWidth = document.body.clientWidth + this.oldHeight = document.body.clientHeight + this.blackAngWhite() window.onresize = () => { - let width = document.body.clientWidth; - let height = document.body.clientHeight; + let width = document.body.clientWidth + let height = document.body.clientHeight if (width !== this.oldWidth && width < 1750) { } this.$nextTick(() => { - this.$refs.multipleTable.doLayout(); - }); - }; + this.$refs.multipleTable.doLayout() + }) + } this.$nextTick(() => { - this.$refs.multipleTable.doLayout(); - }); + this.$refs.multipleTable.doLayout() + }) }, beforeDestroy() { - window.onresize = null; - }, - watch: { - baseObject: { - handler(newVal, oldVal) { - this.BaseManageData.cleanData(); - this.getPersonList(); - }, - deep: true, - }, - "BaseManageData.selectBlacks": function (value) { - this.blackAngWhite(); - }, - "BaseManageData.selectWhites": function (value) { - this.blackAngWhite(); - }, - }, - components: { - UploadBtn, - fTemplate, - UploadIcon, - }, - props: { - baseObject: { - default: () => {}, - type: Object, - }, - syncType: { - type: String, - }, - }, -}; + window.onresize = null + } +} </script> <style lang="scss"> .activeRow { @@ -1769,8 +1413,7 @@ padding-top: 2px; left: 15px; } - .el-form-item.is-required:not(.is-no-asterisk) - > .el-form-item__label:before { + .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:before { color: #fe6d68; } .el-col-20 { @@ -1821,9 +1464,7 @@ display: none; } .el-table--border .el-table__cell, - .el-table__body-wrapper - .el-table--border.is-scrolling-left - ~ .el-table__fixed { + .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed { border-right: none; } td { @@ -1906,8 +1547,6 @@ .el-input-number--mini { width: 72px; } - } - .upload-img-box { } .uploadIconBox .left-section1 .el-input__inner { height: 32px; @@ -2195,6 +1834,7 @@ color: #5f5f5f; } .dialog-footer { + width: 315px; .el-button--info { color: #999999; background: #fff; -- Gitblit v1.8.0