Ver Fonte

有点东西

Reiskuchen há 5 anos atrás
pai
commit
2696f07781
2 ficheiros alterados com 28 adições e 28 exclusões
  1. 27 27
      ys_vue/src/views/Home.vue
  2. 1 1
      ys_vue/src/views/mold/moldDetail.vue

+ 27 - 27
ys_vue/src/views/Home.vue

@@ -36,17 +36,17 @@
                 </span>
                 <div class="popover-item" v-if="popoverData[0].length == 0">暂无审批消息</div>
                 <div class="popover-item" v-for="item in popoverData[0]">
-                  <p class="popover-title">
-                    <span
-                      style="cursor: pointer;"
-                      @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
+                  <div
+                    style="cursor: pointer;"
+                    @click="locationHerf(item.id, item.refId, item.noticeType)"
+                  >
+                    <p class="popover-title">
                       <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
                       <span v-else>{{item.projectName}}</span>
-                    </span>
-                  </p>
-                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                  <p v-else>{{item.content}}</p>
+                    </p>
+                    <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                    <p v-else>{{item.content}}</p>
+                  </div>
                 </div>
               </el-tab-pane>
 
@@ -58,17 +58,17 @@
                 </span>
                 <div class="popover-item" v-if="popoverData[1].length == 0">暂无警告消息</div>
                 <div class="popover-item" v-for="item in popoverData[1]">
-                  <p class="popover-title">
-                    <span
-                      style="cursor: pointer;"
-                      @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
+                  <div
+                    style="cursor: pointer;"
+                    @click="locationHerf(item.id, item.refId, item.noticeType)"
+                  >
+                    <p class="popover-title">
                       <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
                       <span v-else>{{item.projectName}}</span>
-                    </span>
-                  </p>
-                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                  <p v-else>{{item.content}}</p>
+                    </p>
+                    <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                    <p v-else>{{item.content}}</p>
+                  </div>
                 </div>
               </el-tab-pane>
 
@@ -80,17 +80,17 @@
                 </span>
                 <div class="popover-item" v-if="popoverData[2].length == 0">暂无保养消息</div>
                 <div class="popover-item" v-for="item in popoverData[2]">
-                  <p class="popover-title">
-                    <span
-                      style="cursor: pointer;"
-                      @click="locationHerf(item.id, item.refId, item.noticeType)"
-                    >
+                  <div
+                    style="cursor: pointer;"
+                    @click="locationHerf(item.id, item.refId, item.noticeType)"
+                  >
+                    <p class="popover-title">
                       <span v-if="item.isRead == 1" class="isRead">{{item.projectName}}</span>
                       <span v-else>{{item.projectName}}</span>
-                    </span>
-                  </p>
-                  <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
-                  <p v-else>{{item.content}}</p>
+                    </p>
+                    <p v-if="item.isRead == 1" class="isRead">{{item.content}}</p>
+                    <p v-else>{{item.content}}</p>
+                  </div>
                 </div>
               </el-tab-pane>
             </el-tabs>

+ 1 - 1
ys_vue/src/views/mold/moldDetail.vue

@@ -414,7 +414,7 @@
                 <el-table-column prop="mouldId" label="模具编号" sortable></el-table-column>
                 <el-table-column prop="applicantName" label="申请人" align="center" width="200" sortable></el-table-column>
                 <el-table-column prop="operatorName" label="审批人" align="center" width="200" sortable></el-table-column>
-                <el-table-column prop="isPass" label="状态" width="200" align="center" sortable>
+                <el-table-column label="状态" width="200" align="center" sortable>
                     <template slot-scope="scope">
                         <span v-if="scope.row.isPass == 1">已通过</span>
                         <span v-else>未通过</span>