zhuliu 1 year ago
parent
commit
8aa839aa27

+ 6 - 3
src/utils/model/noPermission/index.vue

@@ -38,9 +38,10 @@ export default {
     bottom: 0;
     margin: auto;
     width: 180px;
-    height: 50px;
+    height: 65px;
+    line-height: 35px;
     z-index: 9999;
-    padding: 15px;
+    // padding: 15px;
     border: none;
     box-shadow: 0.01333rem 0.01333rem 0.26667rem rgba(0,0,0,0.3);
     border-radius: 0.04rem;
@@ -52,7 +53,9 @@ export default {
         font-size: 1rem;
     }
     .myNoPermission_content{
-        line-height: 25px;
+        // line-height: 35px;
+        // height: 35px;
+        margin: 15px;
     }
 }
 </style>

+ 5 - 1
src/views/project/components/view/card.vue

@@ -69,7 +69,11 @@
                 <i class="el-icon-edit" @click="handleCommand('e', item)"></i>
                 <i class="el-icon-delete" @click="handleCommand('10', item)"></i>
               </div>
-              <span v-if="item.ifUpdate" class="iconfont icon-a-yijiankong2x" style="color:var(--color1)"> </span>
+              <!-- <span v-if="item.ifUpdate" class="iconfont icon-a-yijiankong2x" style="color:var(--color1)"> </span> -->
+              <span v-if="item.ifUpdate">
+                <span  class="iconfont icon-shiwujiaoxing" style="color:red"></span>
+                监控中
+              </span>
             </div>
           </myCard>
         </el-col>

+ 5 - 3
src/views/project/components/view/table.vue

@@ -12,11 +12,13 @@
         <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" :sortable="item.ifSort?'custom':false" :align="['createName','createTime'].indexOf(item.value)!=-1?'center':'left'">
           <template slot-scope="scope">
             <div v-if="['name'].includes(item.value)" class="patentName">
-              <el-link type="primary" @click="handleClick(scope.row, item.value)">
+              <el-link type="primary" @click="handleClick(scope.row, item.value)" style="display:inline">
                 <span  v-html="$commonJS.getColumnData(scope.row, item)"></span>
-                <span v-if="scope.row.ifUpdate"  class="iconfont icon-shiwujiaoxing" style="color:red"></span>
               </el-link>
-              
+              <span v-if="scope.row.ifUpdate">
+                (<span  class="iconfont icon-shiwujiaoxing" style="color:red"></span>
+                监控中)
+              </span>
               <!-- <div v-if="scope.row.ifUpdate" class="jiankong" >
                 <el-image class="img" :src="require('@/assets/img/摄像头.png')" fit="contain"></el-image>
               </div> -->