Browse Source

修改测试卷计划状态

plg 4 months ago
parent
commit
95124e9ecc

+ 37 - 2
src/components/ComparePlanUser.vue

@@ -36,13 +36,48 @@
               width=""
             >
               <template slot-scope="scope">
-                <div v-if="scope.row.isComplete == '0'" style="color: #ff7800">
+                <!-- <div v-if="scope.row.isComplete == '0'" style="color: #ff7800">
                   未开始
                 </div>
 
                 <div v-if="scope.row.isComplete == '1'" style="color: #333333">
                   已完成
-                </div>
+                </div> -->
+
+
+                <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.isComplete == '1'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../assets/img/home/isCom.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #333333">已完成</div>
+              </div>
+              <!-- <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '2'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isRun.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #f6cb00">进行中</div>
+              </div> -->
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.isComplete == '0'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../assets/img/home/isNo.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #d52121">未开始</div>
+              </div>
               </template>
             </el-table-column>
 

+ 1 - 0
src/views/manage/channelInfo/invite.vue

@@ -56,6 +56,7 @@
             prop="planName"
             label="计划名称"
             align="center"
+            
             width="300px"
           >
           </el-table-column>

+ 43 - 13
src/views/manage/channelManagement/channelManagement.vue

@@ -103,9 +103,39 @@
             width=""
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.planStatus == '1'" style="color: #ff7800">未开始</div>
-              <div v-if="scope.row.planStatus == '2'" style="color: #2342ff">进行中</div>
-              <div v-if="scope.row.planStatus == '3'" style="color: #333333">已完成</div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '3'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isCom.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #333333">已完成</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '2'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isRun.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #f6cb00">进行中</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '1'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isNo.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #d52121">未开始</div>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="250px" align="center">
@@ -368,13 +398,13 @@ export default {
       courtNum: "",
       grade: "",
       gradeList: [],
-      optionsLoad:{
-          lock: true,
-          text: '努力下载中',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
+      optionsLoad: {
+        lock: true,
+        text: "努力下载中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
       },
-      loadingInstance :null
+      loadingInstance: null,
     };
   },
   created() {},
@@ -448,9 +478,9 @@ export default {
           classIds: this.orgName,
         };
       }
-    
-      this.loadingInstance=  Loading.service(this.optionsLoad);
-      this.$http.post(`/generate/report`, params, (res) => {
+
+      this.loadingInstance = Loading.service(this.optionsLoad);
+      this.$http.post(`/generate/report/v2`, params, (res) => {
         if (res && res.code == 200) {
           // this.currentDownFun(res.data);
           let a = document.createElement("a");
@@ -501,7 +531,7 @@ export default {
       };
       Loading.service(options);
       // Loading.service(options);
-      this.$http.post(`/plan/generate/report`, params, (res) => {
+      this.$http.post(`/plan/generate/report/v2`, params, (res) => {
         if (res && res.code == 200) {
           let a = document.createElement("a");
           document.body.appendChild(a);

+ 33 - 3
src/views/manage/channelManagement/contract.vue

@@ -188,9 +188,39 @@
             width=""
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.planStatus == '1'" style="color: #ff7800">未开始</div>
-              <div v-if="scope.row.planStatus == '2'" style="color: #2342ff">进行中</div>
-              <div v-if="scope.row.planStatus == '3'" style="color: #333333">已完成</div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '3'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isCom.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #333333">已完成</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '2'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isRun.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #f6cb00">进行中</div>
+              </div>
+              <div
+                style="display: flex; justify-content: center; align-items: center"
+                v-if="scope.row.planStatus == '1'"
+              >
+                <img
+                  style="width: 16px"
+                  src="../../../assets/img/home/isNo.png"
+                  alt=""
+                />&nbsp;&nbsp;
+                <div style="color: #d52121">未开始</div>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="300px" align="center">