From 023dd7fafa5d1a39d6f62ba88b6c4ec590aa20cd Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 14 七月 2023 16:01:36 +0800 Subject: [PATCH] Merge branch 'feature-001' of ssh://114.215.109.124:29418/grid-management-vue into feature-001 --- src/views/overlay-clue/components/ClueReport.vue | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ src/components.d.ts | 6 + src/views/HistoryMode.vue | 2 src/views/overlay-clue/ClueLayout.vue | 4 4 files changed, 206 insertions(+), 4 deletions(-) diff --git a/src/components.d.ts b/src/components.d.ts index 1dae46b..5be1cc6 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -14,16 +14,20 @@ ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] + ElDescrrptions: typeof import('element-plus/es')['ElDescrrptions'] + ElDescrrptionsItem: typeof import('element-plus/es')['ElDescrrptionsItem'] + ElDiag: typeof import('element-plus/es')['ElDiag'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] ElOption: typeof import('element-plus/es')['ElOption'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTag: typeof import('element-plus/es')['ElTag'] OptionTime: typeof import('./components/search-option/OptionTime.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/views/HistoryMode.vue b/src/views/HistoryMode.vue index 93a8160..41632b1 100644 --- a/src/views/HistoryMode.vue +++ b/src/views/HistoryMode.vue @@ -4,6 +4,6 @@ <script> export default { - name: 'HomePage', + name: 'HistoryPage', }; </script> diff --git a/src/views/overlay-clue/ClueLayout.vue b/src/views/overlay-clue/ClueLayout.vue index d7e8821..774d7c1 100644 --- a/src/views/overlay-clue/ClueLayout.vue +++ b/src/views/overlay-clue/ClueLayout.vue @@ -54,7 +54,7 @@ * 閫夋嫨绾跨储浜嬩欢 */ const selectClue = function (clue) { - + }; </script> @@ -84,6 +84,8 @@ } .bg-content-1 { + height: 90vh; + background: white; } .search-wrap { diff --git a/src/views/overlay-clue/components/ClueReport.vue b/src/views/overlay-clue/components/ClueReport.vue index 2b4f71f..609f7d9 100644 --- a/src/views/overlay-clue/components/ClueReport.vue +++ b/src/views/overlay-clue/components/ClueReport.vue @@ -20,6 +20,7 @@ </template> kooriookami </el-descriptions-item> + <el-descriptions-item> <template #label> <div class="cell-item"> @@ -65,10 +66,205 @@ No.1188, Wuzhong Avenue, Wuzhong District, Suzhou, Jiangsu Province </el-descriptions-item> </el-descriptions> + + + <!-- 娓呭崟璇︽儏 --> +<el-descriptions +class="" + title="绾跨储娓呭崟璇︽儏" + :column="1" + :size="size" + border + > + <!-- <el-descriptions-item class="inventory-descriptions-item" v-for="item in 10" :key="item" > + <template #label> + <span>{{ item }}</span> + </template> + {{ item }} + </el-descriptions-item> --> + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 涓婚敭 + </div> + </template> + {{ clueData.id }} + </el-descriptions-item> + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 绾跨储鍚嶇О + </div> + </template> + {{ clueData.clueName }} + </el-descriptions-item> + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 绾跨储缁撹 + </div> + </template> + {{ clueData.conclusion }} + </el-descriptions-item> + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 鍒涘缓鏃堕棿 + </div> + </template> + {{ clueData.createTime }} + </el-descriptions-item> + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 鎶ヨ绔欑偣鍚嶇О + </div> + </template> + {{ clueData.siteName }} + </el-descriptions-item> + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 绔欑偣绫诲瀷 + </div> + </template> + {{ clueData.sitetype }} + </el-descriptions-item> + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 涓嬪彂鏃堕棿 + </div> + </template> + {{ clueData.xfsj }} + </el-descriptions-item> + + <el-descriptions-item> + <template #label> + <div class="cell-item"> + 绔欑偣绫诲瀷 + </div> + </template> + {{ clueData.airCheckedOptions }} + </el-descriptions-item> +</el-descriptions> + +<el-button type="primary" @click="reportButton">鍙嶉涓婃姤</el-button> +<el-dialog v-if="!this.isClueHave" v-model="isShow" width="50%" :before-close="handleClose"> + <template #title> + <span> 鍙嶉涓婃姤</span> + </template> + <el-form label-width="120px" label-position="left"> + <el-form-item label="闂绫诲瀷" > + <el-radio-group v-model="form.radio"> + <el-radio label="鏈夐棶棰�">鏈夐棶棰�</el-radio> + <el-radio label="鏃犻棶棰�">鏃犻棶棰�</el-radio> + <el-radio label="宸茶В鍐�">宸茶В鍐�</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item label="绾跨储id"> + <el-input v-model.number="form.id"></el-input> + </el-form-item> + <el-form-item label="绾跨储缁撹"> + <el-input v-model="form.conclusion"></el-input> + </el-form-item> + <el-form-item label="璇︾粏鎻忚堪"> + <el-input v-model="form.details" type="textarea" placeholder="璇疯緭鍏ヨ鎯�"></el-input> + </el-form-item> + </el-form> + <template #footer> + <el-button type="" @click="isShow=false">鍙栨秷</el-button> + <el-button @click="report">纭畾</el-button> + </template> +</el-dialog> +<el-button type="primary" @click="reportPhoto">鍥剧墖涓婁紶</el-button> +<el-dialog v-model="isShowReportPhoto"> +<el-form> + <el-form-item label="绾跨储id"> + <el-input v-model=""></el-input> + </el-form-item> +</el-form> +</el-dialog> </template> + <script> +import axios from 'axios' export default { + // 甯冨皵绫诲瀷 鎺у埗鍙嶉涓婃姤鐨勬牱寮� + // fasle浠h〃鏃犳暟鎹� true浠h〃鏈夋暟鎹� + props:{ + isClueHave:{ + type:Boolean, + default:false + } + }, name: 'HomePage', -}; + data(){ + return{ + // 淇濆瓨涓嬪彂绾跨储鏌ヨ鍚庤繑鍥炵殑鏁扮粍鏁版嵁 + // 鎴栬�呮槸鐐瑰嚮鐨勫睍绀虹粨鏋滃搴旂殑瀵硅薄鏁版嵁 + clueData:{}, + // 涓婃姤寮瑰嚭妗� + isShow:false, + // 鍥剧墖涓婁紶鐨勫脊鍑烘 + isShowReportPhoto:false, + // 琛ㄥ崟涓� + form:{ + // 闂绫诲瀷 鍗曢�夋寜閽殑鍊� + radio:'', + // 绾跨储id + id:0, + // 绾跨储缁撹 + conclusion:'', + // 璇︾粏鎻忚堪 + details:'', + // 淇濆瓨鎻愪氦鍚庣殑杩斿洖缁撴灉 + result:'' + }, + photoForm:{ + clueId:0, + questionDescription:'', + + } + } + }, + methods:{ + // 鐐瑰嚮涓婃姤鎸夐挳 + reportButton(){ + // 褰撹绾跨储id宸茬粡鏈夌粨璁轰簡 + if(this.isClueHave === true){ + alert('璇ョ嚎绱㈠凡缁忔湁缁撹浜嗭紝涓嶅彲閲嶅涓婃姤') + } + else if(this.isClueHave === false){ + this.isShow = !this.isShow + } + }, +// 鐐瑰嚮鍙嶉涓婃姤鏃� +report(){ + //鍙戝嚭璇锋眰 + axios.post('').then(response =>{ + // 鑾峰彇缁撴灉 + this.result = response.data.data + if(this.result =='涓婃姤鎴愬姛'){ + ElMessage.success(this.result); + // 鍙湁涓婁紶鎴愬姛鏃舵墠鍏抽棴瀵硅瘽妗� + this.isShow = false + } + else if(this.result =='涓婃姤澶辫触'){ + ElMessage.error(this.result); + // 鍚﹀垯鏆傛椂涓嶅叧闂璇濇 + } + }) + +}, +reportPhoto(){ + +} + } +} </script> + +<style> + +</style> \ No newline at end of file -- Gitblit v1.9.3