Merge branches 'lijinlong' and 'main' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationPc into lijinlong

src/components/Breadcrumb/index.vue

@@ -40,25 +40,8 @@ export default {
       // 当前全部侧边栏
       let sidebarRouters = this.sidebarRouters
       let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      let matchedquery = this.$route.query
-      matched[0].query = matchedquery
-      
-      const first = matched[0]
-      
-      
-      // sidebarRouters.forEach(element => {
-      //   if (element.children && element.children.length != 0) {
-      //     // 提取带childen的侧边栏
-      //     if (element.children.find(item => item.name == this.$route.name)) {
-      //       // 插入
-      //       matched.splice(1, 0, element); // 在索引为 1 的位置插入 newObj
-      //     }
-      //   }
-      // });
-      if (!this.isDashboard(first)) {
-        // matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
-      }
-      console.log(matched[0]);
+
+
       if(matched[0].path == "/assetsAuth" ) {
         // 管理端--资产管理--新增资产
         const activeRoute = sidebarRouters.filter(item => item.path == '/' && item.children[0].path == 'assets')
@@ -103,7 +86,6 @@ export default {
       return name.trim() === 'Index'
     },
     handleLink(item) {
-      console.log(item);
       
       const { redirect, path } = item
       if (redirect) {

src/views/unitPages/myTask/info.vue

@@ -128,9 +128,19 @@
             </el-table-column>
             <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
               <template slot-scope="scope">
-                <span class="look-info" @click="goInfo(1, scope.row)" style="color: #192A92;cursor: pointer;">查看</span>
-                <span class="look-info" @click="goInfo(2, scope.row)" style="color: #192A92;cursor: pointer;"
-                  v-if="($route.query.pageType == 'info' || $route.meta.pageType == 'look') && scope.row.status != 3&& scope.row.status != 5&&scope.row.status != 1">核查</span>
+                <div style="display: flex;align-items: center;justify-content: center;">
+                  <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)">
+                    <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                    <span class="look-info"
+                      style="color: #1485EF;margin-right: 15px;">查看</span>
+                  </div>
+                  <!-- v-if="scope.row.taskStatus == 1" -->
+                  <div v-if="($route.query.pageType == 'info' || $route.meta.pageType == 'info') && scope.row.status != 3&& scope.row.status != 5&&scope.row.status != 1" style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(2,scope.row)">
+                    <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
+                    <span class="del-info"
+                      style="color: #1485EF;margin-right: 15px;">核查</span>
+                  </div>
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -259,7 +269,6 @@ export default {
             pageType: "change",
             taskId: row.taskId,
             assetId:row.id
-
           }
         })
       }