From e903b9669c92a6cda1a2114a3320c2646fc5d1f4 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 03 八月 2023 09:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue | 191 ++++++++++++++++++++++++++++-------------------
1 files changed, 114 insertions(+), 77 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
index 1b582e6..4f61aaa 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -45,168 +45,169 @@
<!-- 鍙充晶杩愮畻绗� -->
<el-col :span="10">
<el-card
- class="box-card"
- style="height: 33vh;">
+ class="box-card formula-box-card"
+ data-v-49729759
+ style="height: 35vh;">
<div slot="header" class="clearfix">
<span style="font-size: medium">杩愮畻绗�</span>
</div>
- <div class="text item">
+ <div class="formula-editor-total">
<div class="formula-editor">
<div class="one">
- <button
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '7' })"
>
7
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '8' })"
>
8
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '9' })"
>
9
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '/' })"
>
- /</button
- ><br />
+ /</el-button>
+ <br />
</div>
<div class="one">
- <button
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '4' })"
>
4
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '5' })"
>
5
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '6' })"
>
6
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '*' })"
>
- *</button
- ><br />
+ *</el-button>
+ <br />
</div>
<div class="one">
- <button
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '1' })"
>
1
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '2' })"
>
2
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '3' })"
>
3
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '>' })"
>
- -</button
- ><br />
+ -</el-button>
+ <br />
</div>
<div class="one">
- <button
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '0' })"
>
0
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '00' })"
>
00
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '.' })"
>
.
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '+' })"
>
- +</button
- ><br />
+ +</el-button>
+ <br/>
</div>
<div class="one">
- <button
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '->' })"
>
->
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '==' })"
>
==
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '(' })"
>
(
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: ')' })"
>
- )</button
- ><br />
+ )</el-button>
+ <br />
</div>
<div class="one">
- <button
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '<' })"
>
<
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '>' })"
>
>
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '<=' })"
>
<=
- </button>
- <button
+ </el-button>
+ <el-button type="primary"
class="formula-editor-btn-sm"
@click="dbClickAddContent({ formula: '>=' })"
>
>=
- </button>
+ </el-button>
</div>
</div>
</div>
@@ -311,9 +312,9 @@
:show-header="false"
style="width: 100%"
>
- <el-table-column prop="formula" width="40">
+ <el-table-column prop="formula" width="120">
</el-table-column>
- <el-table-column prop="desc" width="100"> </el-table-column>
+ <el-table-column prop="desc" width="200"> </el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="绯荤粺鍙橀噺" name="second">
@@ -323,9 +324,9 @@
:show-header="false"
style="width: 100%"
>
- <el-table-column prop="formula" width="150">
+ <el-table-column prop="formula" width="200">
</el-table-column>
- <el-table-column prop="desc" width="150"> </el-table-column>
+ <el-table-column prop="desc" width="200"> </el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -337,11 +338,20 @@
</el-dialog>
</template>
-
+
<script>
export default {
name: "formulaEditor",
props: {
+ // 瀵硅瘽妗嗘樉绀洪殣钘忔帶鍒�
+ visible: {
+ type: "Boolean",
+ default: false,
+ },
+ componentRuleText:{
+ type:String,
+ default: ""
+ },
//鏈満鏅彉閲�
thisSceneTableData: {
type: Array,
@@ -353,7 +363,7 @@
},
data() {
return {
- isShowformulaEdit: false, //鍏紡缂栬緫妗嗗璇濇鏄剧ず鎺у埗
+ isShowformulaEdit: this.visible, //鍏紡缂栬緫妗嗗璇濇鏄剧ず鎺у埗
formulaContent: '', //鍏紡缂栬緫妗嗗唴瀹�,鏂逛究鍊肩殑鍥炰紶
activeName: 'first', //褰撳墠娲诲姩鐨則ab
activeNameAttr: 'first', //鍙橀噺涓殑褰撳墠娲诲姩tab
@@ -638,6 +648,16 @@
],
};
},
+ watch: {
+ // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊硷紝浠ュ強鍊肩殑鍥炲～
+ visible() {
+ this.isShowformulaEdit = this.visible;
+ this.formulaContent=this.componentRuleText || '';
+ },
+ },
+ mounted() {
+
+ },
methods: {
//鍙屽嚮娣诲姞鍏紡鍐呭
@@ -652,6 +672,7 @@
//鍏抽棴鏃舵竻绌轰笂娆″叕寮忓唴瀹�
closeFormulaEdit(){
this.resetFormulaContent();
+ this.$emit('update:visible',false);
},
//缂栬緫瀹屾垚鍏紡鍐呭鍥炴樉骞跺叧闂璇濇
saveFormulaContent(){
@@ -661,24 +682,36 @@
return;
}
//鍏紡鍐呭鍥炴樉
- this.$emit('updateFormulaContent', this.formulaContent) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
- this.isShowformulaEdit = false;
+ // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
+ this.$emit('updateFormulaContent', this.formulaContent)
+ this.isShowformulaEdit = false;
},
},
};
</script>
-
+
<style scoped>
+
+ .formula-box-card >>> .el-card__body {
+ padding: 0px;
+ height: 85%;
+ width: 100%;
+ }
+
+ .formula-editor-total {
+ /* margin-top: 3px; */
+ height: 100%;
+ width: 100%;
+ }
+
.formula-editor{
- margin-top: -15px;
- margin-left: 4vw;
/*璁剧疆寮规�х洅瀛�*/
display: flex;
/*瀛愬厓绱犱互绔栧垪鎺掑垪锛屼竴鍏辨湁6鍒�*/
flex-direction:column;
- width: 310px;
- height: 185px;
+ width: 100%;
+ height: 100%;
/*宸﹀彸鍧囧寑鎺掑垪*/
justify-content: space-around;
/*涓婁笅鍧囧寑鎺掑垪*/
@@ -689,17 +722,21 @@
display: flex;
/*浠ヨ鎺掑垪*/
flex-direction: row;
- width: 223px;
- height: 80px;
+ width: auto;
+ height: auto;
justify-content: space-between;
align-items: center;
- }
+ }
.formula-editor-btn-sm {
- width: 55px;
- height: 29px;
- background: rgb(153, 214, 240);
- border-radius: 10%;
+ width: 4.5vw;
+ height: 4vh;
+ margin-left: 10px;
+ text-align: center;
+ line-height: 0;
+ /* background: rgb(153, 214, 240); */
+ background: #87c2fc;
+ /* border-radius: 10%; */
}
+
</style>
-
\ No newline at end of file
--
Gitblit v1.9.3