浏览代码

问题修改

suxinf 4 年之前
父节点
当前提交
4a2d8bf442
共有 4 个文件被更改,包括 14 次插入36 次删除
  1. 1 1
      src/App.vue
  2. 12 11
      src/components/Loading.vue
  3. 1 23
      src/views/data/InforList.vue
  4. 0 1
      src/views/data/UploadLinks.vue

+ 1 - 1
src/App.vue

@@ -142,7 +142,7 @@ export default {
     //   sessionStorage.setItem("userNameAccount", "L0M14_MM");
     //   this.userAccount = "L0M14_MM";
     // } else {
-    //   if(this.$route.path !== '/loading') this.$router.replace({ path: "/inforList" });
+    //   if(this.$route.path === '/loading') this.$router.replace({ path: "/inforList" });
     //   localStorage.setItem("userId", 2002);
     //   sessionStorage.setItem("userNameAccount", "L0210_MM");
     //   this.userAccount = "L0210_MM";

+ 12 - 11
src/components/Loading.vue

@@ -16,20 +16,21 @@ export default {
       default: "",
     },
   },
-  computed: {
-
-  },
+  computed: {},
   watch: {
-    isLoading: function (newValue) {
-      if (!newValue) {
-        if (this.isManufacturer === "manufacturer") {
-          this.$router.replace({ path: "/uploadInfor" });
-        } else {
-          this.$router.replace({ path: "/inforList" });
+    isLoading: {
+      handler(newValue) {
+        if (!newValue) {
+          if (this.isManufacturer === "manufacturer") {
+            this.$router.replace({ path: "/uploadInfor" });
+          } else {
+            this.$router.replace({ path: "/inforList" });
+          }
         }
-      }
+      },
+      immediate: true,
     },
-  }
+  },
 };
 </script>
 

+ 1 - 23
src/views/data/InforList.vue

@@ -58,7 +58,7 @@
                 :class="{ table_gray: !discolor && index % 2 === 0 }"
               >
                 <!--  <td v-for="(item, i) in obj" :key="i" :style="trStyle"> -->
-                <td>{{ obj.informationName || "北京博瑞" }}</td>
+                <td>{{ obj.informationName || "-" }}</td>
                 <td>{{ (obj.filePulishTime || "").replace("-", "/") }}</td>
                 <td>{{ obj.accountScope == 1 ? "共通" : "部分" }}</td>
                 <td>
@@ -71,28 +71,6 @@
                 </td>
                 <td>{{ obj.download > 0 ? "已下载" : "未下载" }}</td>
                 <td>
-                  <!-- <span
-                    @click="waitToReport(obj.report, index)"
-                    :class="showItemOperation"
-                    class="reportStyle"
-                    >待办</span
-                  > -->
-                  <!--  :class="{ reportStyle: obj.report == 0 ? true : false }" -->
-                  <!-- <span :class="!showItemOperation">已完成</span> -->
-                  <!-- <span
-                    @click="waitToReport(obj, index)"
-                    :class="{
-                      showItemOperationStyle: obj.report == 1 ? true : false,
-                    }"
-                    class="reportStyle"
-                    >待办</span
-                  >
-                  <span
-                    :class="{
-                      showItemOperationStyle: obj.report == 0 ? true : false,
-                    }"
-                    >已完成</span
-                  > -->
                   <span v-if="!obj.endDate || (obj.endDate && obj.download >= 1 && obj.report >= 1)" class="noPoint">已完成</span>
                   <span 
                     v-else-if="obj.download >= 1 && obj.report == 0 && (obj.endDate.replace(RegExp('-', 'g'), '') - localDate) >= 0"

+ 0 - 1
src/views/data/UploadLinks.vue

@@ -207,7 +207,6 @@ export default {
         data: data,
       })
         .then((res) => {
-          console.log(res)
           this.tableData = res.data.data;
           this.sum = +res.data.count;
         })