From d441a339549da0e1280879333f0b22823a603443 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 02 十二月 2024 16:59:11 +0800 Subject: [PATCH] 合同积分的提示、地图样式调整 --- src/views/system/contract/score/index.vue | 2 src/views/screen/components/map3.vue | 24 ++++--- src/views/screen/index.vue | 8 +- src/views/system/contract/contract/index.vue | 113 +++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 16 deletions(-) diff --git a/src/views/screen/components/map3.vue b/src/views/screen/components/map3.vue index a8c8f34..f45b680 100644 --- a/src/views/screen/components/map3.vue +++ b/src/views/screen/components/map3.vue @@ -36,7 +36,7 @@ }, { name: '澶у畨鍖�', - value: [104.93805, 29.175946, 300], + value: [104.95805, 29.155946, 300], platformOnline: true }, { @@ -64,7 +64,7 @@ { name: '鑷祦浜曞尯', number: '0', - value: [104.841471408, 29.860000, 300] + value: [104.821471408, 29.860000, 300] }, { name: '楂樻柊鍖�', @@ -74,12 +74,12 @@ { name: '澶у畨鍖�', number: '0', - value: [105.17337686031, 29.57948885792289, 300] + value: [105.27337686031, 29.57948885792289, 300] }, { name: '娌挎哗鍖�', number: '0', - value: [105.36237686031, 30.30048885792289, 300] + value: [105.33237686031, 30.20048885792289, 300] }, { name: '璐′簳鍖�', @@ -160,6 +160,8 @@ map: name, left: '-5%', top: '20%', + width: '100%', // 鏄庣‘鎸囧畾瀹藉害 + height: '720px', // 鏄庣‘鎸囧畾楂樺害 // boxWidth: 100, regionHeight: 0.8, zlevel: 10, @@ -256,6 +258,8 @@ regionHeight: 0.8, left: '-5%', top: '20%', + width: '100%', // 鏄庣‘鎸囧畾瀹藉害 + height: '720px', // 鏄庣‘鎸囧畾楂樺害 zlevel: 5, // tooltip: { @@ -333,21 +337,21 @@ { coords: [ [104.621171408, 29.150000, 300], - [104.841471408, 29.860000, 335] + [104.841471408, 29.900000, 335] ] }, // 楂樻柊鍖虹嚎 { coords: [ [104.780000, 29.19, 300], - [104.867237686031, 29.39548885792289, 335] + [104.880237686031, 29.42548885792289, 335] ] }, // 澶у畨鍖虹嚎 { coords: [ - [104.93805, 29.175946, 300], - [105.17337686031, 29.57948885792289, 335] + [104.95805, 29.155946, 300], + [105.27337686031, 29.60948885792289, 335] ] }, // 娌挎哗鍖虹嚎 @@ -417,8 +421,8 @@ }, formatter: function (params) { - return `{style|${params.data.name} 锛�${params.data.number}}` - // return `{style|${params.data.name} \n 瑙嗛锛�${params.data.number} \n 杞﹁締锛�${params.data.number} \n 浜鸿劯锛�${params.data.number}}` + // return `{style|${params.data.name} 锛�${params.data.number}}` + return `{style|${params.data.name} \n 瑙嗛锛�${params.data.number} \n 杞﹁締锛�${params.data.number} \n 浜鸿劯锛�${params.data.number}}` }, rich: { style: { diff --git a/src/views/screen/index.vue b/src/views/screen/index.vue index 2649739..8e9677b 100644 --- a/src/views/screen/index.vue +++ b/src/views/screen/index.vue @@ -1435,8 +1435,8 @@ } .rotating-image { - width: 900px; - height: 900px; + width: 950px; + height: 950px; position: absolute; top: calc(50% - 450px); left: calc(50% - 450px); @@ -1445,8 +1445,8 @@ } .rotating-image-in { - width: 850px; - height: 850px; + width: 900px; + height: 900px; position: absolute; top: calc(50% - 425px); left: calc(50% - 425px); diff --git a/src/views/system/contract/contract/index.vue b/src/views/system/contract/contract/index.vue index 3ad33e6..9d9757d 100644 --- a/src/views/system/contract/contract/index.vue +++ b/src/views/system/contract/contract/index.vue @@ -23,7 +23,6 @@ </el-form-item> </el-form> - <el-row :gutter="10" class="mb8" style="margin-top: 10px"> <el-col :span="1.5"> <el-button @@ -171,13 +170,106 @@ </el-link > <div style="text-align: right; margin-top: 10px"> +<!-- <el-button type="primary" @click="handleImportRule">瀵煎叆瑙勫垯</el-button>--> <el-button type="primary" @click="submitForm">鎻愪氦</el-button> </div> </el-collapse> </el-form> </div> </el-drawer> + <!-- 瀵煎叆瑙勫垯瀵硅瘽妗� --> + <el-dialog + :title="importRule.title" + :visible.sync="importRule.open" + width="1000px" + append-to-body + > + <el-form ref="form" :model="upload" :rules="rules" label-width="80px"> + <div class="row-right" style="margin-left: 80px"> + <div class="margin-5"> + <el-upload + ref="upload" + :limit="1" + accept=".xlsx, .xls" + :headers="upload.headers" + :action="upload.url" + :disabled="upload.isUploading" + :on-progress="handleFileUploadProgress" + :on-success="handleFileSuccess" + :data="upload" + :auto-upload="false" + drag + style="text-align: center" + > + <i class="el-icon-upload"></i> + <div class="el-upload__text"> + 灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em> + </div> + <div class="el-upload__tip text-center" slot="tip"> + <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span> + <el-link + type="primary" + :underline="false" + style="font-size: 12px; vertical-align: baseline" + @click="importTemplate" + >涓嬭浇妯℃澘 + </el-link + > + </div> + </el-upload> + </div> + </div> + <el-divider content-position="left">鑰冩牳缁撴灉搴旂敤瑙勫垯</el-divider> + <div class="row-warp"> + <div + class="row" + v-for="(item, index) in upload.ruleList" + :key="index" + > + <div class="row-left" style="flex: 0.7"> + <div class="block"> + <el-form-item label="鑰冩牳鏉′欢" prop="ruleList"> + <el-input + v-model="item.scoreCondition" + style="width: 250px" + /> + </el-form-item> + </div> + </div> + <div class="row-right"> + <div class="margin-5"> + <el-form-item label="瑙勫垯鎻忚堪" prop="ruleList"> + <el-input + type="textarea" + v-model="item.description" + style="width: 300px" + /> + <el-button + style="margin-left: 50px" + type="danger" + icon="el-icon-delete" + circle + @click="deleteRule(index)" + ></el-button> + </el-form-item> + </div> + </div> + </div> + </div> + <el-button + style="margin-left: 50px" + type="success" + icon="el-icon-plus" + circle + @click="addRule" + ></el-button> + </el-form> + <div slot="footer" class="dialog-footer"> + <el-button @click="upload.open = false">鍙� 娑�</el-button> + <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button> + </div> + </el-dialog> <!-- 鍚堝悓瀵煎叆瀵硅瘽妗� --> <el-dialog :title="upload.title" @@ -355,6 +447,20 @@ startTime: "", endTime: "", }, + // 瑙勫垯瀵煎叆鍙傛暟 + importRule: { + // 鏄惁鏄剧ず寮瑰嚭灞傦紙鍚堝悓瀵煎叆锛� + open: false, + // 寮瑰嚭灞傛爣棰橈紙鍚堝悓瀵煎叆锛� + title: "", + // 鏄惁绂佺敤涓婁紶 + isUploading: false, + // 璁剧疆涓婁紶鐨勮姹傚ご閮� + headers: {Authorization: "Bearer " + getToken()}, + // 涓婁紶鐨勫湴鍧� + url: process.env.VUE_APP_BASE_API + "/system/contract/updateRule", + ruleList: [], + }, dialogImageUrl: "", dialogVisible: false, disabled: false, @@ -460,6 +566,11 @@ this.upload.title = "鍚堝悓瀵煎叆"; this.upload.open = true; }, + /** 瀵煎叆鎸夐挳鎿嶄綔 */ + handleImportRule() { + this.importRule.title = "瑙勫垯瀵煎叆"; + this.importRule.open = true; + }, /** 涓嬭浇妯℃澘鎿嶄綔 */ importTemplate() { this.download("system/contract/importTemplate", {}, `鍚堝悓瀵煎叆妯℃澘.xlsx`); diff --git a/src/views/system/contract/score/index.vue b/src/views/system/contract/score/index.vue index 79680b3..2f2e193 100644 --- a/src/views/system/contract/score/index.vue +++ b/src/views/system/contract/score/index.vue @@ -139,7 +139,7 @@ </div> </div> </div> - <div style="font-size: 5px"> + <div> {{ ruleDescription}} </div> -- Gitblit v1.8.0