zhulizhen 5 years ago
parent
commit
9ea4e42055

+ 6 - 6
src/components/config_point/step3_edit/index.vue

@@ -3,27 +3,27 @@
         <div class='left'>
             <ul>
                 <li>
-                    <span>原始点位信息:</span>&nbsp;&nbsp;&nbsp;
+                    <span>原始点位信息</span>&nbsp;&nbsp;&nbsp;
                     <span>{{editData.Point.Description || '--'}}</span>
                 </li>
                 <li>
-                    <span>位置标签:</span>&nbsp;&nbsp;&nbsp;
+                    <span>位置标签</span>&nbsp;&nbsp;&nbsp;
                     <span>{{editData.Point.LocationFlag.toString() || '--'}}</span>
                 </li>
                 <li>
-                    <span>设备类型:</span>&nbsp;&nbsp;&nbsp;
+                    <span>设备类型</span>&nbsp;&nbsp;&nbsp;
                     <span>{{editData.Point.KeyEquipmentType || '--'}}</span>
                 </li>
                 <li>
-                    <span>设备参数:</span>&nbsp;&nbsp;&nbsp;
+                    <span>设备参数</span>&nbsp;&nbsp;&nbsp;
                     <span>{{editData.Point.KeyEquipmentParameter || '--'}}</span>
                 </li>
                 <li>
-                    <span>值/单位说明:</span>&nbsp;&nbsp;&nbsp;
+                    <span>值/单位说明</span>&nbsp;&nbsp;&nbsp;
                     <span>{{editData.Point.ValueDescription || '--'}}</span>
                 </li>
                 <li>
-                    <span>备注:</span>&nbsp;&nbsp;&nbsp;
+                    <span>备注</span>&nbsp;&nbsp;&nbsp;
                     <span>{{editData.Point.Remarks || '--'}}</span>
                 </li>
             </ul>

+ 3 - 3
src/components/config_point/step3_edit/split_handle.vue

@@ -2,7 +2,7 @@
     <div class='edit-box'>
         <el-form v-if='form.devArr.length' class='form' ref='form' :model='form' label-width='140px'>
             <div class='dev-know' v-for='(item,index) in form.devArr' :key='index'>
-                <el-form-item v-if='devFlag' label='设备标识:' :prop='"devArr." + index + ".EquipmentMark"' :rules='{
+                <el-form-item v-if='devFlag' label='设备标识' :prop='"devArr." + index + ".EquipmentMark"' :rules='{
           required: true, message: "设备标识不能为空", trigger: "blur"
         }'>
                     <el-input v-model='item.EquipmentMark'></el-input>
@@ -18,8 +18,8 @@
                 <el-button type='primary' @click='addDevs'>+添加设备标识</el-button>
             </div>
             <p class='tranf-box'>
-                需要将截取值转换为标准值:
-                <el-switch v-model='tranfVal' active-color='#13ce66' inactive-color='#ff4949'></el-switch>
+                需要将截取值转换为标准值
+                <el-switch v-model='tranfVal' style="margin-left:12px" active-color='#13ce66' inactive-color='#ff4949'></el-switch>
             </p>
             <ul class='point-box'>
                 <span class='left'>如果</span>

+ 1 - 1
src/views/point/config_point/edit_origin/index.vue

@@ -183,7 +183,7 @@
         width: 928px;
         margin: auto;
         .edit-textarea {
-            margin: 10px 0;
+            margin: 8px 0 22px 0;
             height: 117px;
             textarea {
                 height: 100%;

+ 1 - 1
src/views/point/config_point/index.vue

@@ -4,7 +4,7 @@
             <span>此项目包括<i style="color:#409EFF;">{{list.length}}</i>个数据源</span>
             <div style="float:right;">
                 <el-button>同步配置文件到云端</el-button>
-                <el-button @click="addItem">添加数据源</el-button>
+                <el-button style="width:140px;" @click="addItem">添加数据源</el-button>
             </div>
         </div>
         <div class="saga-origin-list" v-loading="isLoading">

+ 5 - 5
src/views/point/config_point/steps/step1.vue

@@ -1,11 +1,11 @@
 <template>
     <div id="handsonStep1">
         <div class="btns-view">
-            <el-button style="float:right;margin-top:4px;margin-left:10px;" @click="saveData">保存</el-button>
-            <el-button style="float:right;margin-top:4px;" @click="addRow">新增行</el-button>
-            <el-button style="float:right;margin-top:4px;" @click="downData">导出配置点位表</el-button>
-            <el-button style="float:right;margin-top:4px;" @click="updateExcel = true">导入Excel</el-button>
-            <el-button style="float:right;margin-top:4px;" @click="downloadExcel = true">导出Excel模板</el-button>
+            <el-button style="float:right;margin-top:4px;margin-left:10px;width:120px;" @click="saveData">保存</el-button>
+            <el-button style="float:right;margin-top:4px;width:120px;" @click="addRow">新增行</el-button>
+            <el-button style="float:right;margin-top:4px;width:120px;" @click="downData">导出配置点位表</el-button>
+            <el-button style="float:right;margin-top:4px;width:120px;" @click="updateExcel = true">导入Excel</el-button>
+            <el-button style="float:right;margin-top:4px;width:120px;" @click="downloadExcel = true">导出Excel模板</el-button>
             <el-checkbox style="float:right;line-height:40px;" @change="getData" v-model="checked">只显示使用的原始点位</el-checkbox>
             <el-button @click="clickPointVal">获取原始点位当前值</el-button>
         </div>

+ 2 - 2
src/views/point/config_point/steps/step2.vue

@@ -1,10 +1,10 @@
 <template>
     <div id="handsonStep2">
         <div class="btns-view">
-            <el-button>AI自动识别</el-button>
+            <el-button style="width:164px">AI自动识别</el-button>
             <el-button @click="discern(1)">批量识别设备类型关键字</el-button>
             <el-button @click="discern(2)">批量识别设备参数关键字</el-button>
-            <el-button @click="examine">检查&微调</el-button>
+            <el-button style="width:164px" @click="examine">检查&微调</el-button>
             <div style="float:right;">
                 <el-button @click="reset">刷新</el-button>
                 <el-button @click="saveData">保存</el-button>