Ana Sayfa Keşfet Yardım
Giriş Yap
CocoRoboLabs
/
pbl-teacher-table
3
0
Çatalla 0
Dosyalar Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

Merge branch 'beta'

SanHQin 1 hafta önce
ebeveyn
494e34ed1e 1a0947bb76
işleme
89fe2322cd
20 değiştirilmiş dosya ile 376 ekleme ve 59 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.a2b714d6186042ff2e0e903a255cd7e0.css
  3. 0 0
      dist/static/css/app.a2b714d6186042ff2e0e903a255cd7e0.css.map
  4. 0 0
      dist/static/js/0.4f3b05586c3acc102a54.js
  5. 0 0
      dist/static/js/0.4f3b05586c3acc102a54.js.map
  6. 0 0
      dist/static/js/0.df8814bab917ab2583e0.js.map
  7. 0 0
      dist/static/js/app.72fcfc0ea66c2a914a04.js
  8. 0 0
      dist/static/js/app.72fcfc0ea66c2a914a04.js.map
  9. 2 2
      dist/static/js/manifest.161e82026ac2ae03ab6f.js
  10. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  11. 0 0
      dist/static/js/vendor.b7212920b6e58d14a873.js
  12. 0 0
      dist/static/js/vendor.b7212920b6e58d14a873.js.map
  13. 107 40
      src/components/pages/noticeCenter/component/received.vue
  14. 247 0
      src/components/pages/noticeCenter/dialog/noticeDetailDialog.vue
  15. 2 2
      src/components/pages/test/aggregate/index.vue
  16. 3 3
      src/components/pages/test/examine/conpoments/personPage.vue
  17. 4 4
      src/components/pages/test/examine/conpoments/targetPage.vue
  18. 5 2
      src/components/pages/testStudent/view/preview.vue
  19. 1 1
      src/components/pages/test_old/examine/conpoments/personPage.vue
  20. 4 4
      src/components/pages/test_old/examine/conpoments/targetPage.vue

+ 1 - 1
dist/index.html
Dosyayı Görüntüle 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.4bcf49c9fa7e32c607c97c63aff9266c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.9811ebe9d5c4458a1b2a.js></script><script type=text/javascript src=./static/js/vendor.bb486323f0fa002ba2e7.js></script><script type=text/javascript src=./static/js/app.b727f8ad1c8ad61866bd.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.a2b714d6186042ff2e0e903a255cd7e0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.72fcfc0ea66c2a914a04.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.a2b714d6186042ff2e0e903a255cd7e0.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.a2b714d6186042ff2e0e903a255cd7e0.css.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/0.4f3b05586c3acc102a54.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/0.4f3b05586c3acc102a54.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/0.df8814bab917ab2583e0.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.72fcfc0ea66c2a914a04.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.72fcfc0ea66c2a914a04.js.map


+ 2 - 2
dist/static/js/manifest.9811ebe9d5c4458a1b2a.js → dist/static/js/manifest.161e82026ac2ae03ab6f.js
Dosyayı Görüntüle 

@@ -1,2 +1,2 @@
 
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"df8814bab917ab2583e0",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
-//# sourceMappingURL=manifest.9811ebe9d5c4458a1b2a.js.map
 
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
+//# sourceMappingURL=manifest.161e82026ac2ae03ab6f.js.map

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/vendor.b7212920b6e58d14a873.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/vendor.b7212920b6e58d14a873.js.map


+ 107 - 40
src/components/pages/noticeCenter/component/received.vue
Dosyayı Görüntüle 

@@ -13,7 +13,7 @@
 
           placeholder="请输入关键词"
 
           v-model="searchValue"
 
         >
 
-          <i slot="suffix" class="el-input__icon el-icon-search"></i>
 
+          <i slot="suffix" class="el-input__icon el-icon-search" style="cursor: pointer;font-size: 18px;color: #000;" @click="getData()"></i>
 
         </el-input>
 
       </div>
 
     </div>
 
@@ -22,6 +22,8 @@
 
         :data="tableData"
 
         :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
 
         style="width: 100%"
 
+        @row-click="showNoticeDetail"
 
+        :row-style="{cursor:'pointer'}"
 
         height="calc(100%)"
 
       >
 
         <el-table-column
 
@@ -31,24 +33,26 @@
 
           width="auto"
 
           min-width="200"
 
         >
 
-        <template slot-scope="scope">
 
-          <span v-html="scope.row.title"></span>
 
-        </template>
 
+          <template slot-scope="scope">
 
+            <span v-html="scope.row.title"></span>
 
+          </template>
 
         </el-table-column>
 
         <el-table-column label="状态 " width="150" align="center">
 
           <template slot-scope="scope">
 
-          <span>{{status[scope.row.status]}}</span>
 
-        </template>
 
+            <span class="status" :class="`status_${scope.row.status}`">{{
 
+              status[scope.row.status]
 
+            }}</span>
 
+          </template>
 
+        </el-table-column>
 
+        <el-table-column prop="type" label="类型 " width="150" align="center">
 
         </el-table-column>
 
         <el-table-column
 
-          prop="type"
 
-          label="类型 "
 
-          width="150"
 
+          prop="create_at"
 
+          label="时间 "
 
+          width="250"
 
           align="center"
 
         >
 
         </el-table-column>
 
-        <el-table-column prop="create_at" label="时间 " width="250" align="center">
 
-        </el-table-column>
 
         <el-table-column
 
           prop="publisherName"
 
           label="发布者 "
 
@@ -56,7 +60,12 @@
 
           align="center"
 
         >
 
         </el-table-column>
 
-        <el-table-column prop="source" label="发布来源" width="200" align="center">
 
+        <el-table-column
 
+          prop="source"
 
+          label="发布来源"
 
+          width="200"
 
+          align="center"
 
+        >
 
         </el-table-column>
 
       </el-table>
 
     </div>
 
@@ -72,21 +81,26 @@
 
       >
 
       </el-pagination>
 
     </div>
 
+    <noticeDetailDialog ref="noticeDetailDialogRef"/>
 
   </div>
 
 </template>
 
 
 <script>
 
+import noticeDetailDialog from '../dialog/noticeDetailDialog.vue';
 
 export default {
 
+  components: {
 
+    noticeDetailDialog
 
+  },
 
   data() {
 
     return {
 
       userId: this.$route.query.userid,
 
       org: this.$route.query.org,
 
       oid: this.$route.query.oid,
 
       tableLoading: false,
 
-      status:["未读","已读"],
 
+      status: ["未读", "已读"],
 
       searchValue: "",
 
       tableData: [],
 
-      copyData:[],
 
+      copyData: [],
 
       pageData: {
 
         nowPage: 1,
 
         total: 0,
 
@@ -106,39 +120,69 @@ export default {
 
     getData() {
 
       if (this.tableLoading) return;
 
       this.tableLoading = true;
 
+      let params = [
 
+        {
 
+          uid: this.userId,
 
+          status: "",
 
+          type: "",
 
+          source: "",
 
+          pUid: "",
 
+          searchValue: this.searchValue,
 
+          pageNum: this.pageData.nowPage,
 
+          pageSize: this.pageData.size
 
+        }
 
+      ];
 
+
 
+      this.ajax
 
+        .post(this.$store.state.api + "select_noticeCenter", params)
 
+        .then(res => {
 
+          let _resData = res.data[0];
 
+          if (_resData.length > 0) {
 
+            _resData.forEach(item => {
 
+              item.content = JSON.parse(item.content);
 
+            })
 
+            this.copyData = _resData;
 
+            this.tableData = _resData;
 
+            this.pageData.total = res.data[1][0].total;
 
+          } else {
 
+            this.copyData = [];
 
+            this.pageData.total = 0;
 
+            this.pageData.nowPage = 1;
 
+          }
 
+          this.tableLoading = false;
 
+          // this.tableData = res.data.list
 
+          // this.pageData.total = res.data.total
 
+        })
 
+        .catch(e => {
 
+          console.log(e);
 
+          this.$message.error("获取通知失败");
 
+          this.tableLoading = false;
 
+        });
 
+    },
 
+    showNoticeDetail(row){
 
+      this.$refs.noticeDetailDialogRef.open(row)
 
+      if(row.status!=1){
 
+        this.changeStatus(row.id,1)
 
+      }
 
+    },
 
+    changeStatus(id,newStatus){
 
       let params = [{
 
-        uid: this.userId,
 
-        status:"",
 
-        type:"",
 
-        source:"",
 
-        pUid:"",
 
-        searchValue:this.searchValue,
 
-        pageNum:this.pageData.nowPage,
 
-        pageSize:this.pageData.size,
 
+        uid:this.userId,
 
+        id:id,
 
+        status:newStatus
 
       }]
 
 
-      this.ajax.post(this.$store.state.api+"select_noticeCenter",params).then(res=>{
 
-        let _resData = res.data[0];
 
-        if(_resData.length>0){
 
-          this.copyData = _resData;
 
-          this.tableData = _resData;
 
-          this.pageData.total = res.data[1][0].total;
 
-        }else{
 
-          this.copyData = [];
 
-          this.pageData.total = 0;
 
-          this.pageData.nowPage = 1;
 
+      this.ajax.post(this.$store.state.api+"update_noticeCenter_statusByid",params).then(res=>{
 
+        if(res.data==1){
 
+          this.tableData.find(i=>i.id===id).status = newStatus;
 
+          console.log("更新状态成功");
 
         }
 
-        this.tableLoading = false;
 
-        // this.tableData = res.data.list
 
-        // this.pageData.total = res.data.total
 
-      }).catch(e=>{
 
-        console.log(e);
 
-        this.$message.error("获取通知失败")
 
-        this.tableLoading = false;
 
+      }).catch(err=>{
 
+        console.log("更新状态失败",err);
 
       })
 
     }
 
   },
 
-  mounted(){
 
+  mounted() {
 
     this.getData();
 
   }
 
 };
 
@@ -196,6 +240,29 @@ export default {
 
   border-top: solid 1px #dfdfe0;
 
 }
 
 
+.status {
 
+  padding: 0px 10px;
 
+  border-radius: 4px;
 
+  height: 30px;
 
+  width: fit-content;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  margin: 0 auto;
 
+}
 
+
 
+.status_0 {
 
+  background: #f3f4f6;
 
+  color: #4d5765;
 
+  border: solid 1px #d4d8dd;
 
+}
 
+
 
+.status_1 {
 
+  background: #ecfdf5;
 
+  color: #10664e;
 
+  border: solid 1px #abf4d3;
 
+}
 
+
 
 .r_bottom {
 
   width: 100%;
 
   height: 40px;

+ 247 - 0
src/components/pages/noticeCenter/dialog/noticeDetailDialog.vue
Dosyayı Görüntüle 

@@ -0,0 +1,247 @@
 
+<template>
 
+	<div>
 
+		<el-dialog
 
+			:center="true"
 
+			:visible.sync="show"
 
+			:close-on-click-modal="true"
 
+			:modal="true"
 
+			width="auto"
 
+			height="auto"
 
+      top="10vh"
 
+			:append-to-body="true"
 
+			class="dialog"
 
+		>
 
+			<div class="box">
 
+				<div class="b_head">
 
+					<span>消息详细</span>
 
+					<svg
 
+						@click="close()"
 
+						t="1748587270371"
 
+						class="icon"
 
+						viewBox="0 0 1024 1024"
 
+						version="1.1"
 
+						xmlns="http://www.w3.org/2000/svg"
 
+						p-id="5023"
 
+						width="200"
 
+						height="200"
 
+					>
 
+						<path
 
+							d="M0 0h1024v1024H0z"
 
+							fill="#FF0033"
 
+							fill-opacity="0"
 
+							p-id="5024"
 
+						></path>
 
+						<path
 
+							d="M240.448 168l2.346667 2.154667 289.92 289.941333 279.253333-279.253333a42.666667 42.666667 0 0 1 62.506667 58.026666l-2.133334 2.346667-279.296 279.210667 279.274667 279.253333a42.666667 42.666667 0 0 1-58.005333 62.528l-2.346667-2.176-279.253333-279.253333-289.92 289.962666a42.666667 42.666667 0 0 1-62.506667-58.005333l2.154667-2.346667 289.941333-289.962666-289.92-289.92a42.666667 42.666667 0 0 1 57.984-62.506667z"
 
+							fill="#fff"
 
+							p-id="5025"
 
+						></path>
 
+					</svg>
 
+				</div>
 
+				<div class="b_main" v-loading="loading" v-if="data">
 
+          <div class="b_m_top">
 
+            <div class="b_m_t_title" v-html=" data.title"></div>
 
+            <div>
 
+              <span>发布来源：{{data.source}}</span>
 
+              <span>发布者：{{data.publisherName}}</span>
 
+              <span>发布时间：{{data.create_at}}</span>
 
+            </div>
 
+          </div>
 
+          <div class="b_m_content" v-html="data.content.text">
 
+
 
+          </div>
 
+          <div class="b_m_bottom" v-if="false"></div>
 
+				</div>
 
+				<div class="b_bottom">
 
+          <div class="b_b_submit" @click="close()">确定</div>
 
+				</div>
 
+			</div>
 
+		</el-dialog>
 
+	</div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+	data() {
 
+		return {
 
+			loading: false,
 
+			show: false,
 
+			data: null,
 
+		};
 
+	},
 
+	methods: {
 
+		open(data) {
 
+			this.data = JSON.parse(JSON.stringify(data));
 
+			this.loading = false;
 
+			this.show = true;
 
+		},
 
+		close() {
 
+			this.show = false;
 
+			this.init();
 
+		},
 
+		init() {
 
+			this.data = null;
 
+			this.loading = false;
 
+		},
 
+    submit(){
 
+      this.close()
 
+    },
 
+	},
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+.dialog >>> .el-dialog {
 
+	width: 80vw !important;
 
+	border-radius: 8px;
 
+	padding: 0;
 
+	background-color: #fff;
 
+	overflow: hidden;
 
+}
 
+
 
+.dialog >>> .el-dialog__body {
 
+	width: 80vw !important;
 
+  height: 80vh;
 
+	height: auto;
 
+	flex-shrink: 0;
 
+	padding: 0;
 
+	box-sizing: border-box;
 
+	overflow: auto;
 
+}
 
+
 
+.dialog >>> .el-dialog__header {
 
+	display: none !important;
 
+}
 
+
 
+.box {
 
+	width: 80vw;
 
+	height: 80vh;
 
+	background: #fff;
 
+	border-radius: 15px;
 
+	box-shadow: 0px 6px 30px 5px rgba(0, 0, 0, 0.05),
 
+		0px 16px 24px 2px rgba(0, 0, 0, 0.04), 0px 8px 10px -5px rgba(0, 0, 0, 0.08);
 
+
 
+}
 
+
 
+.b_head {
 
+	width: 100%;
 
+	height: 50px;
 
+	/* border-radius: 15px 15px 0 0; */
 
+	background: #1A1A1A;
 
+	display: flex;
 
+	align-items: center;
 
+	justify-content: space-between;
 
+	box-sizing: border-box;
 
+	padding: 0 20px;
 
+  color: #fff;
 
+}
 
+
 
+.b_head > span {
 
+	font-size: 18px;
 
+	font-weight: bold;
 
+	color: #fff;
 
+}
 
+
 
+.b_head > img {
 
+	width: 20px;
 
+	height: 20px;
 
+	cursor: pointer;
 
+}
 
+
 
+.b_head > svg {
 
+	width: 20px;
 
+	height: 20px;
 
+	cursor: pointer;
 
+}
 
+
 
+.b_main {
 
+	width: 100%;
 
+	height: calc(100% - 70px - 40px - 15px);
 
+	background: #fff;
 
+	padding: 20px 20px 20px 20px;
 
+	box-sizing: border-box;
 
+  overflow: auto;
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+}
 
+
 
+.b_bottom {
 
+	width: 100%;
 
+	height: 70px;
 
+	display: flex;
 
+	align-items: center;
 
+	justify-content: flex-end;
 
+	box-sizing: border-box;
 
+	padding: 0 20px;
 
+}
 
+
 
+.b_bottom>div{
 
+  padding: 10px 25px;
 
+  background: #fff;
 
+  color: #000;
 
+  border-radius: 4px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  border: solid 1px #EEEEEE;
 
+  margin-left: 15px;
 
+  cursor: pointer;
 
+  font-size: 16px;
 
+}
 
+
 
+.b_bottom>.b_b_submit{
 
+  background: #1A1A1A;
 
+  color: #D4D4D4;
 
+  border-color: #1A1A1A;
 
+}
 
+
 
+
 
+.b_m_top{
 
+  width: 100%;
 
+  height: auto;
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  justify-content: center;
 
+  margin-top: 30px;
 
+  position: relative;
 
+}
 
+
 
+.b_m_top::after{
 
+  content: "";
 
+  width: 98%;
 
+  height: 1px;
 
+  background: #C1C1C1;
 
+  position: absolute;
 
+  bottom: -30px;
 
+  left: 1%;
 
+}
 
+
 
+.b_m_t_title{
 
+  font-size: 3em;
 
+  margin-bottom: 30px;
 
+}
 
+
 
+.b_m_top>div{
 
+  width: 100%;
 
+  height: auto;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+}
 
+
 
+.b_m_top>div>span{
 
+  margin: 0 40px;
 
+  font-size: 16px;
 
+}
 
+
 
+.b_m_content{
 
+  margin-top: 50px;
 
+  width: 100%;
 
+  height: auto;
 
+  font-size: 18px;
 
+  padding: 10px;
 
+  box-sizing: border-box;
 
+}
 
+</style>

+ 2 - 2
src/components/pages/test/aggregate/index.vue
Dosyayı Görüntüle 

@@ -163,9 +163,9 @@ export default {
 
     gotoFrom(val, uid) {
 
       // return console.log(val, uid);
 
       if(this.betaL == 'beta'){
 
-        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${uid}`;
 
+        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${uid}`;
 
       }else{
 
-        this.ifmUrl = `https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${uid}`;
 
+        this.ifmUrl = `https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${uid}`;
 
       }
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
 
       this.diaIframe = true;

+ 3 - 3
src/components/pages/test/examine/conpoments/personPage.vue
Dosyayı Görüntüle 

@@ -653,7 +653,7 @@ ws['!rows'] = [
 
 
 
       XLSX.utils.book_append_sheet(wb, ws, "sheet1"); //把sheet添加到workbook里，第三个参数是sheet名
 
-      XLSX.writeFile(wb, "教师发展.xlsx");
 
+      XLSX.writeFile(wb, this.digUsername +'-'+ (this.digType == 1 ? '班主任考核' :'专任教师')+".xlsx");
 
       this.$message({
 
         message: "导出成功",
 
         type: "success"
 
@@ -1015,9 +1015,9 @@ ws['!rows'] = [
 
 
       if(this.timeSortList){
 
         let timeValue = this.timeSortList.time
 
-        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${cid}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.digUserid}&timeLimit=${timeValue}&review=1`;
 
+        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${cid}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.digUserid}&timeLimit=${timeValue}&review=1&disableBack=true`;
 
       }else{
 
-      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${cid}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.digUserid}&review=1`;
 
+      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${cid}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${this.digUserid}&review=1&disableBack=true`;
 
 
       }
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;

+ 4 - 4
src/components/pages/test/examine/conpoments/targetPage.vue
Dosyayı Görüntüle 

@@ -1555,9 +1555,9 @@ export default {
 
     lookPrize(val) {
 
       if(this.testExamineBaseList[0].value){
 
         const timeValue = JSON.parse(this.testExamineBaseList[0].value).time;
 
-        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&userid=${this.userid}&type=2&role=0&disableBack=true&timeLimit=${timeValue}`;
 
+        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${val}&oid=${this.oid}&org=${this.org}&userid=${this.userid}&type=2&role=0&disableBack=true&timeLimit=${timeValue}`;
 
       }else{
 
-        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&userid=${this.userid}&type=2&role=0&disableBack=true`;
 
+        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${val}&oid=${this.oid}&org=${this.org}&userid=${this.userid}&type=2&role=0&disableBack=true`;
 
       }
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&userid=${this.userid}&type=2&role=0&disableBack=true`;
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&userid=${this.userid}&type=2&role=0&disableBack=true&`;
 
@@ -1744,9 +1744,9 @@ export default {
 
 
       if(this.testExamineBaseList[0].value){
 
         const timeValue = JSON.parse(this.testExamineBaseList[0].value).time;
 
-        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${val.organizeid}&userid=${this.userid}&org=${val.org}&type=2&role=0&peopleId=${val.userid}&disableBack=true&timeLimit=${timeValue}&review=1`;
 
+        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${cid}&oid=${val.organizeid}&userid=${this.userid}&org=${val.org}&type=2&role=0&peopleId=${val.userid}&disableBack=true&timeLimit=${timeValue}&review=1`;
 
       }else{
 
-        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${val.organizeid}&userid=${this.userid}&org=${val.org}&type=2&role=0&peopleId=${val.userid}&disableBack=true&review=1`;
 
+        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${cid}&oid=${val.organizeid}&userid=${this.userid}&org=${val.org}&type=2&role=0&peopleId=${val.userid}&disableBack=true&review=1`;
 
       }
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${cid}&oid=${val.organizeid}&userid=${this.userid}&org=${val.org}&type=2&role=0&peopleId=${val.userid}&disableBack=true`;
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;

+ 5 - 2
src/components/pages/testStudent/view/preview.vue
Dosyayı Görüntüle 

@@ -8,7 +8,7 @@
 
           
         <div class="courseTop" v-else :style="`justify-content: ${isN==1?'flex-end':'space-between'};`">
 
           <div class="stepsNav" v-if="isN !=1 && !gotype">
 
-            <el-breadcrumb v-if="!gotype" separator-class="el-icon-arrow-right">
 
+            <el-breadcrumb v-if="!gotype && back!=1" separator-class="el-icon-arrow-right">
 
               <el-breadcrumb-item :to="{
 
     path:
 
       '/testPerson?userid=' +
 
@@ -19,7 +19,7 @@
 
       org +
 
       '&role=' +
 
       role,
 
-                }" v-if="type == 3 && back!=1">个人中心</el-breadcrumb-item>
 
+                }" v-if="type == 3">个人中心</el-breadcrumb-item>
 
               <el-breadcrumb-item :to="{
 
     path:
 
       '/testStudent?userid=' +
 
@@ -525,6 +525,9 @@ export default {
 
         .post(this.$store.state.api + "addTestWorks", params)
 
         .then((res) => {
 
           this.$message.success('保存成功')
 
+           if(this.back==1){
 
+            return this.$router.back()
 
+          }
 
           // this.goTo(
 
           //   "/testStudent?userid=" +
 
           //   this.userid +

+ 1 - 1
src/components/pages/test_old/examine/conpoments/personPage.vue
Dosyayı Görüntüle 

@@ -207,7 +207,7 @@
 
                         <div v-else style="padding-top: 10px;">
 
                           <!-- {{ reverseString(k.testid.test) }} -->
 
                           <div
 
-                            v-for="(item2, index) in k.testid.test"
 
+                            v-for="(item2) in k.testid.test"
 
                             :key="item2.courseId"
 
                             class="orgData"
 
                           >

+ 4 - 4
src/components/pages/test_old/examine/conpoments/targetPage.vue
Dosyayı Görüntüle 

@@ -34,7 +34,7 @@
 
                   <div v-if="!k.testid.test.length">/</div>
 
                   <div v-else style="padding-top: 10px;">
 
                     <div
 
-                      v-for="(item2, index) in k.testid.test"
 
+                      v-for="(item2) in k.testid.test"
 
                       :key="item2.courseId"
 
                       @click="lookPrize(item2.courseId)"
 
                       class="orgDataCss"
 
@@ -91,7 +91,7 @@
 
                   <div v-if="!k.testid.test.length">/</div>
 
                   <div v-else style="padding-top: 10px;">
 
                     <div
 
-                      v-for="(item2, index) in k.testid.test"
 
+                      v-for="(item2) in k.testid.test"
 
                       :key="item2.courseId"
 
                       @click="lookPrize(item2.courseId)"
 
                       class="orgDataCss"
 
@@ -214,7 +214,7 @@
 
               <div v-if="!scope.row.orgData.length">/</div>
 
               <div v-else style="padding-top: 10px;">
 
                 <div
 
-                  v-for="(item2, index) in scope.row.orgData"
 
+                  v-for="(item2) in scope.row.orgData"
 
                   :key="item2.courseId"
 
                   class="orgDataCss"
 
                 >
 
@@ -1499,7 +1499,7 @@ export default {
 
 
     // 查看数据来源
 
     lookPrize(val) {
 
-      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0`;
 
+      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?userid=${this.userid}&cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0`;
 
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
 
       this.diaIframe = true;
 
     },

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor