瀏覽代碼

去除强制关联点号才能操作遥探、遥调限制

liling 1 年之前
父節點
當前提交
a2600adfd1
共有 1 個文件被更改,包括 13 次插入10 次删除
  1. 13 10
      src/views/device/tables/Sample_master104.vue

+ 13 - 10
src/views/device/tables/Sample_master104.vue

@@ -21,6 +21,7 @@
       <div class="title-container">
         <div class="title-main">采样值</div>
         <div class="title-right">
+          <!--
           <div class="check-resaults">
             <el-button
               icon="el-icon-refresh-left"
@@ -29,6 +30,7 @@
               @click="refreshManual(true)"
             >刷新</el-button>
           </div>
+          -->
           <div class="check-resaults">
             <!-- 导入即是上传文件 -->
             <el-upload
@@ -113,13 +115,14 @@
         <div v-for="(item, index) in carddata" :key="index">
           <div style="float: left;width: 100%;font-weight: bold;">{{ index }}</div>
           <div style="float: left;width: 100%;">
-            <div v-for="(c, index2) in item" v-show="c.isshow" :key="index2" :class=" typeof(c.relationTag)!=='undefined' && c.relationTag!=='' ? 'card card_opt':'card'">
-              <div class="card-title">{{ c.occur || '-' }}<span v-if="typeof(c.relationTag)!=='undefined' && c.relationTag!==''" class="card_opt_btn" @click="commandOpt(c)">操作</span></div>
+            <div v-for="(c, index2) in item" v-show="c.isshow" :key="index2" :class="c.range=='COIL_STATUS' || c.range=='HOLDING_REGISTER' ? 'card card_opt':'card'">
+              <div class="card-title">{{ c.occur || '-' }}<span v-if="c.range=='COIL_STATUS' || c.range=='HOLDING_REGISTER'" class="card_opt_btn" @click="commandOpt(c)">操作</span></div>
               <div style="position: relative;">
-                <template v-if="typeof(c.relationTag)!=='undefined' && c.relationTag!==''">
+                <template v-if="c.range=='COIL_STATUS' || c.range=='HOLDING_REGISTER'">
                   <span class="card-label" style="margin-top: 5%;" :title="`类型:${c.rangeName} 点号:${c.offset}`"><li>{{ c.name }}</li></span>
                   <div class="card-label-linkline" />
-                  <span class="card-label" style="margin-top: 20%;" :title="`类型:${c.rangeName} 点号:${c.offset}`"><li>{{ c.name }}</li></span>
+                  <span v-if="c.relationTag == null" class="card-label" style="margin-top: 20%;color: #999;"><li>未关联点号</li></span>
+                  <span v-else class="card-label" style="margin-top: 20%;" :title="`关联点号:${c.relationTag}`"><li>{{ c.relationTag }}</li></span>
                 </template>
                 <template v-else>
                   <span class="card-label" :title="`类型:${c.rangeName} 点号:${c.offset}`">{{ c.name }}</span>
@@ -148,7 +151,7 @@
           <el-table-column fixed="right" label="操作" width="250px">
             <template slot-scope="scope">
               <el-button
-                v-if="scope.row.range=='COIL_STATUS' && typeof(scope.row.relationTag)!=='undefined' && scope.row.relationTag!=''"
+                v-if="scope.row.range=='COIL_STATUS'"
                 class="table-act"
                 type="text"
                 icon="el-icon-setting"
@@ -156,7 +159,7 @@
                 @click="commandOpt(scope.row)"
               >遥控操作</el-button>
               <el-button
-                v-if="scope.row.range=='HOLDING_REGISTER' && typeof(scope.row.relationTag)!=='undefined' && scope.row.relationTag!=''"
+                v-if="scope.row.range=='HOLDING_REGISTER'"
                 class="table-act"
                 type="text"
                 icon="el-icon-setting"
@@ -631,14 +634,14 @@ export default {
     top: 0;
     left: 0;
     width: 65%;
-    font-size: 1rem;
-    padding-left: 5%;
+    font-size: 0.8rem;
+    padding-left: 10.5%;
     position: absolute;
 }
 .card-label>li{
   white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
+  // text-overflow: ellipsis;
+  // overflow: hidden;
 }
 .card-label-linkline{
     margin-left: 12.5px;