SanHQin преди 1 седмица
родител
ревизия
11b1a73f7a

+ 43 - 0
src/components/pages/liyuan/page/examine/index.vue

@@ -61,6 +61,14 @@
           @click="Submit"
           >提交</el-button
         >
+
+        <el-button
+          v-if="allData.type != 2"
+          type="primary"
+          size="mini"
+          @click="saveBtn"
+          >保存</el-button
+        >
       </div>
     </div>
     <div style="flex: 1;overflow: hidden;" class="notes">
@@ -556,6 +564,41 @@ export default {
     handleClose(done) {
       this.getPageBase();
       done();
+    },
+    //保存按钮
+    saveBtn(){
+      this.$forceUpdate();
+      let PageBaseDataCopy = JSON.parse(JSON.stringify(this.PageBaseData));
+
+      for (const e of PageBaseDataCopy) {
+        for (const k of e.children) {
+          if (k.testid.test.length > 0) {
+            k.testid.test = k.testid.test.map(item => item.courseId);
+          }
+        }
+      }
+
+      let params = [
+        {
+          uid: this.userid,
+          oid: this.oid,
+          org: this.org,
+          type: this.pType,
+          json: JSON.stringify(PageBaseDataCopy),
+          ttype: 1,
+          tid:this.testExamineBaseList[0].id
+        }
+      ];
+      // return console.log(params);
+      this.ajax
+        .post(this.$store.state.api + "addTestExamineWorks2", params)
+        .then(res => {
+          console.log("addTestExamineWorks2", res);
+          this.$message.success("保存成功")
+        })
+        .catch(error => {
+          console.log(error);
+        });
     }
   }
 };

+ 177 - 0
src/components/pages/noticeCenter/index.vue

@@ -0,0 +1,177 @@
+<template>
+  <div class="noticeCenter">
+    <div class="nc_main">
+      <div class="nc_m_left" v-show="false"></div>
+      <div class="nc_m_right">
+        <div class="nc_m_r_header">
+          <div class="nc_m_r_h_title">已收通知</div>
+          <div class="nc_m_r_h_right">
+            <div class="nc_m_r_h_r_total">
+              共(
+              <div>{{ pageData.total }}</div>
+              )封
+            </div>
+            <el-input
+              style="width: 250px;"
+              placeholder="请输入关键词"
+              v-model="searchValue"
+            >
+              <i slot="suffix" class="el-input__icon el-icon-search"></i>
+            </el-input>
+          </div>
+        </div>
+        <div class="nc_m_r_content">
+          <el-table :data="tableData"  :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }" style="width: 100%" height="calc(100%)">
+            <el-table-column fixed prop="date" label="通知标题" width="auto" min-width="200">
+            </el-table-column>
+            <el-table-column prop="name" label="状态 " width="150" align="center">
+            </el-table-column>
+            <el-table-column prop="province" label="类型 " width="150" align="center">
+            </el-table-column>
+            <el-table-column prop="city" label="时间 " width="200" align="center">
+            </el-table-column>
+            <el-table-column prop="address" label="发布者 " width="300" align="center">
+            </el-table-column>
+            <el-table-column prop="zip" label="发布来源" width="200" align="center">
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="nc_m_r_bottom">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="pageData.nowPage"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageData.size"
+            layout="sizes, prev, pager, next"
+            :total="pageData.total">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      userId:this.$route.query.userid,
+      org:this.$route.query.org,
+      oid:this.$route.query.oid,
+      searchValue: "",
+      tableData: [],
+      pageData:{
+        nowPage:1,
+        total: 0,
+        size:20,
+      },
+    };
+  },
+  methods:{
+    handleSizeChange(val){
+      this.pageData.size = val;
+      this.getData()
+    },
+    handleCurrentChange(val){
+      this.pageData.nowPage = val;
+      this.getData();
+    },
+    getData(){
+      this.$message.info("获取数据")
+    },
+  },
+};
+</script>
+
+<style scoped>
+.noticeCenter {
+  width: 100%;
+  height: 100%;
+  background: #e8e9eb;
+  box-sizing: border-box;
+  padding: 10px;
+}
+
+.nc_main {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 20px;
+  border-radius: 4px;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+}
+
+.nc_m_left {
+  width: 300px;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 20px 10px;
+  background: #fff;
+  border: solid 1px #dfdfe0;
+  border-radius: 4px;
+  margin-right: 20px;
+}
+
+.nc_m_right {
+  width: calc(100% - 300px - 20px);
+  width: calc(100%);
+  height: 100%;
+  padding: 20px 20px;
+  background: #fff;
+  border: solid 1px #dfdfe0;
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+
+.nc_m_r_header {
+  width: 100%;
+  height: 80px;
+  display: flex;
+  box-sizing: border-box;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.nc_m_r_h_right {
+  width: fit-content;
+  display: flex;
+  align-items: center;
+}
+
+.nc_m_r_h_r_total {
+  width: fit-content;
+  margin-right: 20px;
+  display: flex;
+  align-items: center;
+}
+
+.nc_m_r_h_r_total > div {
+  display: flex;
+  color: #5398e3;
+}
+
+.nc_m_r_h_title {
+  font-size: 28px;
+  font-weight: bold;
+}
+
+.nc_m_r_content {
+  width: 100%;
+  height: calc(100% - 80px - 40px);
+  overflow: auto;
+  box-sizing: border-box;
+  padding: 20px 0px;
+  border-top: solid 1px #dfdfe0;
+}
+
+.nc_m_r_bottom {
+  width: 100%;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+</style>

+ 1 - 1
src/components/pages/test/check/index.vue

@@ -2667,7 +2667,7 @@ ${JSON.stringify(forAllList)}
       let scoid =  this.scoList.map(e=> e.id);
       console.log('scoid',scoid);
       let TabArr = this.tableWorksArray.filter(e=> scoid.indexOf(e.id) == -1)
-      
+
       console.log('this.TabArr',TabArr);
       if (!TabArr.length) return this.$message.error('已全部评分')
 

+ 66 - 4
src/components/pages/test/examine/conpoments/personPage.vue

@@ -146,16 +146,21 @@
               v-if="tableData.length > 0"
               style="display: flex;justify-content: space-between;width: 150px;"
             >
-              <div>
+              <div style="margin-right:10px">
                 <el-button type="primary" size="mini" @click="upTea"
                   >上一个</el-button
                 >
               </div>
-              <div>
+              <div style="margin-right:10px">
                 <el-button type="primary" size="mini" @click="nextTea"
                   >下一个</el-button
                 >
               </div>
+              <div style="margin-right:10px">
+                <el-button type="primary" size="mini" @click="saveBtn"
+                  >保存</el-button
+                >
+              </div>
             </div>
           </div>
           <div
@@ -250,8 +255,22 @@
                                   : ''
                               )
                             "
-                            v-model.number="k.sco2"
+                            v-model="k.sco2"
                             v-stopMousewheel
+                            @input="val => {
+                              // 只允许输入数字(整数或小数)
+                              let num = val.replace(/[^0-9.]/g, '');
+                              // 防止多个小数点
+                              num = num.replace(/\.{2,}/g, '.');
+                              num = num.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.');
+                              // 防止小数点开头
+                              if(num !== '' && num[0] === '.') num = '';
+                              // 防止小数点后多余数字
+                              if(num.split('.').length > 1 && num.split('.')[1].length > 2) {
+                                num = num.split('.')[0] + '.' + num.split('.')[1].slice(0, 2);
+                              }
+                              k.sco2 = num;
+                            }"
                           ></el-input>
                         </div>
                       </div>
@@ -848,6 +867,8 @@ export default {
           })
         }
       ];
+
+      console.log("params",params[0])
       // return console.log(params);
       this.ajax
         .post(this.$store.state.api + "updateExamineCogDataCopy", params)
@@ -1011,7 +1032,9 @@ export default {
           console.log("getTestExamineByUserId", res);
 
           if (res.data[0].length > 0) {
-            let val = JSON.parse(res.data[0][0].json);
+            let _data = res.data[0].find(i=>i.id==this.digTid)
+            if(_data){
+              let val = JSON.parse(_data.json);
 
             this.PageBaseData.forEach(e => {
               val.forEach(i => {
@@ -1032,6 +1055,7 @@ export default {
             this.PageBaseDataTwo = val;
             // 弹框计算自评分数,与二级指标个数
             this.getTwoRigData();
+            }
           } else {
             // 清空自评分数,与二级指标个数
             this.DigSelfSco = 0;
@@ -1146,6 +1170,44 @@ export default {
       }else if(this.pType == 2 && this.timeB){
         this.copyTableData = this.tableData.filter(i=>i.time == this.timeB)
       }
+    },
+    //保存按钮
+    saveBtn(){
+      let PageBaseDataCopy = JSON.parse(JSON.stringify(this.PageBaseData));
+
+      for (const e of PageBaseDataCopy) {
+        for (const k of e.children) {
+          if (k.testid.test.length > 0) {
+            k.testid.test = k.testid.test.map(item => item.courseId);
+          }
+        }
+      }
+
+      let params = [
+        {
+          uid: this.userid,
+          tid: this.digTid,
+          typ: this.pType,
+          // json: JSON.stringify(PageBaseDataCopy)
+          json: JSON.stringify(PageBaseDataCopy),
+          rjson: JSON.stringify({
+            rjson: PageBaseDataCopy,
+            text: `按人员,进行修改`
+          })
+        }
+      ];
+      // return console.log(params);
+      this.ajax
+        .post(this.$store.state.api + "updateExamineCogDataCopy", params)
+        .then(res => {
+          // console.log("updateExamineCogDataCopy", res);
+          // this.CopDigSco();
+          this.getDigData();
+          this.$message.success("保存成功")
+        })
+        .catch(error => {
+          console.log(error);
+        });
     }
   }
 };

+ 11 - 9
src/router/index.js

@@ -147,7 +147,6 @@ import knowledge from '@/components/pages/knowledge/index'
 import sassPlatform from '@/components/pages/sassPlatform/index'
 import classroomObservationTest from '@/components/pages/classroomObservation/test.vue'
 import CourseCon from '@/components/pages/liyuan/CourseCon'
-import testReview from "@/components/pages/test/examine";
 import aiOffice from '@/components/pages/liyuan/aiOffice'
 import schoolSafe from '@/components/pages/liyuan/schoolSafe'
 import lyStudentEva from '@/components/pages/liyuan/studentEva'
@@ -160,6 +159,7 @@ import Listudent from '@/components/pages/liyuan/page/student'
 import safeTest from '@/components/pages/liyuan/page/safeTest'
 import workPage from '@/components/pages/workPage/index'
 import pptEasy from '@/components/pages/pptEasy/addCourse'
+import noticeCenter from '@/components/pages/noticeCenter/index'
 
 // 全局修改默认配置,点击空白处不能关闭弹窗
 ElementUI.Dialog.props.closeOnClickModal.default = false
@@ -1283,13 +1283,6 @@ export default new Router({
       keepAlive: true,
       requireAuth: ""//不需要鉴权
     }
-  },{
-      path: "/testReview",
-      name: "testReview",
-      component: testReview,
-      meta: {
-        requireAuth: "" // 不需要鉴权
-      }
   }, {
     path: "/aiOffice",
     name: "aiOffice",
@@ -1389,7 +1382,16 @@ export default new Router({
     meta:{
       requireAuth:''//不需要鉴权
     }
-  }
+  },
+  {
+    path:"/noticeCenter",
+    name:"noticeCenter",
+    component:noticeCenter,
+    meta:{
+      requireAuth:''//不需要鉴权
+    }
+  },
+
 
   ]
 })