11wqe1 1 月之前
父節點
當前提交
b84edb7384

+ 11 - 0
src/assets/icon/liyuan/bz.svg

@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1540_2621)">
+<path d="M7 7H6C5.46957 7 4.96086 7.21071 4.58579 7.58579C4.21071 7.96086 4 8.46957 4 9V18C4 18.5304 4.21071 19.0391 4.58579 19.4142C4.96086 19.7893 5.46957 20 6 20H15C15.5304 20 16.0391 19.7893 16.4142 19.4142C16.7893 19.0391 17 18.5304 17 18V17" stroke="#9747FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 5.00011L19 8.00011M20.385 6.58511C20.7788 6.19126 21.0001 5.65709 21.0001 5.10011C21.0001 4.54312 20.7788 4.00895 20.385 3.61511C19.9912 3.22126 19.457 3 18.9 3C18.343 3 17.8088 3.22126 17.415 3.61511L9 12.0001V15.0001H12L20.385 6.58511Z" stroke="#9747FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_1540_2621">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

二進制
src/assets/icon/liyuan/toux.png


+ 5 - 1
src/components/pages/course.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;">
+
+    <backPage  v-if="$route.query.gotype == 1" tit="课程管理"></backPage>
+
     <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;">
       <div class="pb_head top">
         <div style="
@@ -421,9 +424,10 @@ import templateDialog from "./aiAddCourse/templateDialog.vue";
 import templateDialogE from "./aiEasy/templateDialog.vue";
 import { v4 as uuidv4 } from "uuid";
 import { myMixin } from "@/mixins/mixin.js"
+import backPage from "./liyuan/components/backPage.vue";
 
 export default {
-  components: { EditorBar, CourseProblem,shareDialog,templateDialog,templateDialogE },
+  components: { EditorBar, CourseProblem,shareDialog,templateDialog,templateDialogE,backPage },
   mixins: [ myMixin ],
   data() {
     return {

+ 0 - 6
src/components/pages/course/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div class="pb_content">
-      <backPage  v-if="$route.query.gotype == 1" tit="课程管理"></backPage>
-
     <div class="pb_content_body" style="width: 100%;margin: 0;">
       <!-- <div class="student_head">
         <el-carousel trigger="click" style="width: 100%; height: 100%">
@@ -217,12 +215,8 @@
 </template>
 
 <script>
-import backPage from "../liyuan/components/backPage.vue";
 
 export default {
-  components: {
-    backPage
-  },
   data() {
     return {
       zoneList: [],

+ 3 - 3
src/components/pages/liyuan/CourseCon.vue

@@ -20,9 +20,9 @@ export default {
       cardArray: [
         { title: '课程管理', icon: require('../../../assets/icon/liyuan/niandukaohe.svg'), type: 1, to: "/course" },
         { title: '课程中心', icon: require('../../../assets/icon/liyuan/gerendangan.svg'), type: 2, to: `http://localhost:8082/#/index?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&tType=${this.$route.query.tType}&cid=&screenType=3&gotype=1` },
-        { title: 'AI应用', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 2, to: `//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}` },
-        { title: '工作空间', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 1, to:`//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}` },
-        { title: '知识库', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: `//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}`  },
+        { title: 'AI应用', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 2, to: `//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=0` },
+        { title: '工作空间', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 1, to:`//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=1` },
+        { title: '知识库', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: `//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=2`  },
         { title: '协同建构', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/synergyCourse" },
       ]
     }

+ 1 - 1
src/components/pages/liyuan/aiOffice.vue

@@ -31,7 +31,7 @@ export default {
     // 进行权限判断一些只有管理员能看
     cardData(){
       return (val)=>{
-          let com = val.filter(e=> e.role==0 || (this.role == 1 && role == 1) )
+          let com = val.filter(e=> e.role==0 || (this.role == 1 && e.role == 1) )
           return com
       }
     }

+ 7 - 8
src/components/pages/liyuan/page/student.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="pb_content" style="background: unset">
+    <backPage  v-if="$route.query.gotype == 1" tit="学生管理"></backPage>
+
     <div class="sm_box">
 
       <div class="sm_right">
@@ -10,14 +12,8 @@
         border-radius: 5px;
       ">
           <div class="pb_head">
-            <div style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-        ">
+            <div>
               <span>学生管理</span>
-              <div style="font-size: 16px;font-weight: normal;cursor: pointer;" @click.stop="$router.go(-1)">返回</div>
-
 
             </div>
           </div>
@@ -224,10 +220,13 @@
 import $ from "jquery";
 import pinyin from "../../../../../node_modules/js-pinyin/index";
 import { myMixin } from "@/mixins/mixin.js"
+import backPage from "../components/backPage.vue";
 
 export default {
   mixins: [ myMixin ],
-
+  components: {
+    backPage
+  },
   data() {
     return {
       tableHeight: "500px",

+ 278 - 185
src/components/pages/liyuan/page/userInfoL.vue

@@ -6,9 +6,10 @@
   <div class="pb_content">
     <div class="leftInfo">
       <div class="leftInfoCon">
-        <div style="position: relative;width: 80px;height: 80px;">
-          <img style="width: 100%;height: 100%;object-fit: cover;border-radius: 50%;" :src="ruleForm.headportrait" alt="">
-          <img style="position: absolute;right: 0;bottom: 0;" src="../../../../assets/icon/liyuan/lpot.svg" alt="">
+        <div v-loading="uploadImageLoading" style="position: relative;width: 80px;height: 80px;">
+          <img style="width: 100%;height: 100%;object-fit: cover;border-radius: 50%;"
+           :src="ruleForm.headportrait ? ruleForm.headportrait :require('../../../../assets/icon/liyuan/toux.png')" alt="">
+          <img @click="uploadFile" style="position: absolute;right: 0;bottom: 0;cursor: pointer;" src="../../../../assets/icon/liyuan/lpot.svg" alt="">
         </div>
         <div>{{ruleForm.name}}</div>
         <div style="display: flex;flex-direction: column;gap: 10px;">
@@ -29,7 +30,8 @@
             align-items: center;
             gap: 6px;
             "
-          ><img src="../../../../assets/icon/liyuan/tele.svg" alt="">{{ ruleForm.phone ? ruleForm.phone :'暂无' }}
+           
+          ><img src="../../../../assets/icon/liyuan/tele.svg" alt="">{{ !ruleForm.phone ? '暂无' : ruleForm.phone }}
         </div>
         </div>
       </div>
@@ -42,7 +44,7 @@
           line-height: 100%;
           text-align: center;
           ">基础信息</span>
-          <img src="../../../../assets/icon/liyuan/edit.svg" @click="editInfo" style="cursor: pointer;" alt="">
+          <img :src=" editType ? require('../../../../assets/icon/liyuan/edit.svg') : require('../../../../assets/icon/liyuan/bz.svg')" @click="editInfo" style="cursor: pointer;" alt="">
       </div>
 
       <el-form
@@ -55,7 +57,7 @@
           <el-input
             v-model="ruleForm.name"
             style="width: 300px"
-            :disabled="type"
+            :disabled="editType"
             placeholder="请输入姓名"
           ></el-input>
           
@@ -65,7 +67,7 @@
           <el-select
             v-model="ruleForm.sex"
             clearable
-            :disabled="type"
+            :disabled="editType"
           >
             <el-option label="男" value="男"></el-option>
             <el-option label="女" value="女"></el-option>
@@ -77,7 +79,7 @@
             v-model="ruleForm.org"
             clearable
             placeholder="暂无组织"
-            :disabled="type"
+            disabled
           >
             <el-option
               v-for="item in orgJuri"
@@ -89,12 +91,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="教研室" v-if="ruleForm.type == '老师'">
+        <el-form-item label="教研室">
           <el-select
             v-model="ccName"
             clearable
             placeholder="暂无教研室"
-            :disabled="type"
+            disabled
           >
           </el-select>
         </el-form-item>
@@ -104,45 +106,63 @@
             v-model="ruleForm.sBySchool"
             clearable
             placeholder="请选择学校"
-            :disabled="type"
+            disabled
           >
-        
             <el-option :value="ruleForm.sBySchool"> </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="职务" prop="type">
-          <el-select
-            v-model="ruleForm.type"
-            clearable
-            placeholder="请选择身份"
-            :disabled="type"
-          >
-            <el-option :value="ruleForm.type"> </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="司龄" prop="type">
-          <el-select
-            v-model="ruleForm.type"
-            clearable
-            placeholder="请选择身份"
-            :disabled="type"
-          >
-            <el-option :value="ruleForm.type"> </el-option>
+        <!-- <div class="info_span" v-for="item in teaType" :key="item.id" :class="{ 'error-text': !item.value.length, 'error-border': !item.value.length }">
+          <span>
+            {{ item.name + ":" }}
+          </span>
+          <el-select v-model="item.value" multiple :placeholder="'请选择'+item.name" @change="Ochange">
+            <el-option v-for="i in item.child" :key="i.id" :label="i.name" :value="i.id">
+            </el-option>
           </el-select>
-        </el-form-item>
+        </div> -->
+        <template v-for="item in teaType">
+          <el-form-item  v-if="['2a1379bd-54a0-11ef-b873-005056b86db5','2d255541-54a0-11ef-b873-005056b86db5'].indexOf(item.id) != -1"  :key="item.id" :label="item.name">
+            <el-select
+              v-model="item.value"
+              multiple
+              placeholder="请选择"
+              :disabled="editType"
+              @change="Ochange"
+            >
+              <el-option
+                v-for="ind in item.child"
+                :key="ind.id"
+                :label="ind.name"
+                :value="ind.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </template>
 
         <el-form-item label="简介" prop="type">
           <el-input
             type="textarea"
             resize="none"
             rows="6"
+            v-model="ruleForm.intro"
             placeholder="简介"
-            :disabled="type"
+            :disabled="editType"
           ></el-input>
         </el-form-item>
       </el-form>
+      <div class="diaBtn" v-if="!editType" style="display: flex;justify-content: flex-end;">
+        <div style="color: #000;" @click="feaClo()">取消</div>
+        <div
+          style="
+            background: #fff;
+          "
+          :style="{border: editType ? '1px #9747FF solid':'1px #0663fe solid',
+          color: editType ? '#9747FF' : '#0663fe'}"
+          @click="setJsonL()"
+          >保存</div
+        >
+      </div>
     </div>
   </div>
 
@@ -158,94 +178,149 @@ export default {
     backPage
   },
   data() {
-    var validatePass = (rule, value, callback) => {
-      if (value == "") {
-        return;
-      }
-      var reg =
-        /^[A-Za-z\d]+([-_.][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,4}$/;
-      if (!reg.test(value)) {
-        callback(new Error("请输入正确的邮箱"));
-      } else {
-        callback();
-      }
-    };
-    var validatePass1 = (rule, value, callback) => {
-      var reg = /^1\d{10}$/;
-      if (!reg.test(value)) {
-        callback(new Error("请输入正确的手机号码"));
-      } else {
-        callback();
-      }
-    };
     return {
-      type: true,
+      uploadImageLoading:false,
+      options:[],
+      teaType:[],
+      schoolJuri:[],
+      editType: true,
+      ruleFormCopy:'',
       ruleForm: {
         name: "",
-        type: "",
+        type: "", //身份。教师还是学生还是管理员
         sex: "男",
-        intro: "",
-        // mail: "",
-        phone: "",
-        sBySchool: "",
-        org: "",
-        headportrait: "",
+        intro: "", //简介
+        phone: "", //手机号
+        sBySchool: "", //学校
+        org: "", //组织
+        headportrait: "", //头像
       },
       ccName: "",
-      opassword: "",
-      password: "",
-      password1: "",
-      isLook: false,
-      eyeOff: require("../../../../assets/icon/eyeOff.png"),
-      eye: require("../../../../assets/icon/eye.png"),
-      tx: require("../../../../assets/avatar.png"),
-      userinfo: "",
-      schoolJuri: [],
+
       orgJuri: [],
       userid: this.$route.query.userid,
-      rules: {
-        pass: [{ validator: validatePass, trigger: "blur" }],
-        name: [{ required: true, message: "请输入你的名字", trigger: "blur" }],
-        mail: [
-          {
-            required: true,
-            message: "请输入你的邮箱",
-            trigger: "blur",
-          },
-        ],
-        phone: [
-          // { required: true, message: "请输入你的手机号码", trigger: "blur" },
-
-          {
-            validator: validatePass1,
-            trigger: "blur",
-          },
-        ],
-      },
+      oid: this.$route.query.oid,
+
     };
   },
+
   methods: {
-    editInfo(){
-      this.type = !this.type
+    feaClo(){
+      this.editType = true
+      this.ruleForm = JSON.parse(JSON.stringify(this.ruleFormCopy))
     },
-    getSchool() {
-      this.isLoading = true;
-      let params = {
-        page: this.page,
-      };
+		uploadFile(accept = "image/*") {
+			return new Promise((resolve) => {
+				const input = document.createElement("input");
+				input.type = "file";
+				input.accept = accept;
+				input.onchange = (event) => {
+					const file = event.target.files[0];
+					if (file) {
+						let credentials = {
+							accessKeyId: "AKIATLPEDU37QV5CHLMH",
+							secretAccessKey: "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",
+						}; //秘钥形式的登录上传
+						window.AWS.config.update(credentials);
+						window.AWS.config.region = "cn-northwest-1"; //设置区域
+						let bucket = new window.AWS.S3({ params: { Bucket: "ccrb" } }); //选择桶
+            this.uploadImageLoading = true
+
+						let params = {
+							Key:
+								file.name.split(".")[0] +
+								new Date().getTime() +
+								"." +
+								file.name.split(".")[file.name.split(".").length - 1],
+							ContentType: file.type,
+							Body: file,
+							"Access-Control-Allow-Credentials": "*",
+							ACL: "public-read",
+						}; //key可以设置为桶的相抵路径,Body为文件, ACL最好要设置
+						let options = {
+							partSize: 2048 * 1024 * 1024,
+							queueSize: 2,
+							leavePartsOnError: true,
+						};
+
+						bucket
+							.upload(params, options)
+							.on("httpUploadProgress", (evt) => {
+								console.log(evt);
+							})
+							.send((err, data) => {
+								if (err) {
+									this.$message.error("上传失败");
+                  this.uploadImageLoading = false
+
+									// return resolve("");
+								} else {
+                  this.ruleForm.headportrait = data.Location
+                  this.uploadImageLoading = false
+                  this.setJsonL()
+									return resolve();
+								}
+							});
+					} else {
+						resolve("");
+            this.uploadImageLoading = false
+
+						console.log("没上传成功");
+					}
+				};
+				input.click();
+			});
+		},
+    setJsonL(){
+      if (!this.ruleForm.name.trim()) return this.$message.error('请输入姓名')
+      let con = this.teaType.filter(e=> e.id == '2a1379bd-54a0-11ef-b873-005056b86db5')
+      if (con[0].value.length == 0) return this.$message.error('请选择职务')
+      let con1 = this.teaType.filter(e=> e.id == '2d255541-54a0-11ef-b873-005056b86db5')
+      if (con1[0].value.length == 0) return this.$message.error('请选择司龄')
+
+      
+      let allC = []
+      this.teaType.forEach(e=>{
+        allC = [...allC,...e.value]
+      })
+      console.log('allC',allC);
+      
+
+
+      let params = [{
+        userid: this.userid,
+        h: this.ruleForm.headportrait ? this.ruleForm.headportrait : '',
+        username: this.ruleForm.name,
+        sex:this.ruleForm.sex == '男' ? 0 : 1,
+        cclassid: allC.join(','),
+        intro: this.ruleForm.intro,
+        
+      }];
+          // this.editType = true
+      
+     console.log('params',params);
+      //  return
       this.ajax
-        .get(this.$store.state.api + "selectOrg", params)
+        .post(this.$store.state.api + "updateliyuanUser", params)
         .then((res) => {
-          this.isLoading = false;
-          this.schoolJuri = res.data[0];
+          this.$message.success('修改成功')
+          this.editType = true
+          
+          this.getData()
+          // this.$emit("update:dialogVisibleInfo", false);
         })
         .catch((err) => {
-          this.isLoading = false;
+          this.$message.error("网络不佳");
           console.error(err);
         });
+
+      
     },
-    changeEye() {
-      this.isLook = !this.isLook;
+    editInfo(){
+      this.editType = !this.editType
+      if (this.editType == true) {
+        this.ruleForm = JSON.parse(JSON.stringify(this.ruleFormCopy))
+      }
     },
     getOrg() {
       this.isLoading = true;
@@ -260,57 +335,51 @@ export default {
           console.error(err);
         });
     },
-    submitForm(formName) {
-      this.$refs[formName];
-      let params = [
-        {
-          userid: this.userid,
-          username: this.ruleForm.name,
-          type: this.ruleForm.type == "老师" ? 1 : 2,
-          oid: this.ruleForm.sBySchool,
-          phone: this.ruleForm.phone,
-          // intro: this.ruleForm.intro,
-          intro: "",
-          sex: this.ruleForm.sex == "男" ? "0" : "1",
-        },
-      ];
-      this.ajax
-        .post(this.$store.state.api + "updatePblMessage2", params)
-        .then((res) => {
-          this.$message({
-            message: "修改成功",
-            type: "success",
+//获取分类类名
+    getTypeInfo() {
+      return new Promise((resolve, reject) => {
+        let params = {
+          oid: this.oid
+        };
+        this.ajax
+          .get(this.$store.state.api + "selectPerInfoAllTea", params)
+          .then((res) => {
+            
+            this.teaType = res.data[0];
+            
+            let typeInfo = res.data[1];
+
+            this.teaType.forEach((e) => {
+              e.child = [];
+              e.value = [];
+              typeInfo.forEach((i) => {
+                if (e.id == i.parentid) {
+                  e.child.push({ id: i.id, name: i.name })
+                }
+              })
+            })
+
+            this.options = res.data[2];
+            resolve(1)
+          })
+          .catch((err) => {
+            reject(1)
+            console.error(err);
           });
-           window.topU.postMessage({ close: "1" }, "*");
-          this.getUser();
-        })
-        .catch((err) => {
-          this.$message.error("修改失败");
-          console.error(err);
-        });
-    },
-    getUser() {
-      let params = { uid: this.userid };
-      this.ajax
-        .get(this.$store.state.api + "getUser", params)
-        .then((res) => {
-          this.userinfo = res.data[0][0];
-          // this.$cookies.set("userInfo", this.userinfo, -1);
-          this.$cookies.set("teacherInfo", res.data[0][0], -1);
-          this.$store.commit("update", ["userInfo", this.userinfo]);
-          console.log(res.data[0][0]);
         })
-        .catch((err) => {
-          console.error(err);
-        });
+      
     },
-    getDetail() {
-      let params = { uid: this.userid };
+    async getData() {
+
+      await this.getTypeInfo()
+      let params = {
+        uid: this.userid,
+      };
       this.ajax
-        .get(this.$store.state.api + "getUser", params)
+        .get(this.$store.state.api + "selectTestUser", params)
         .then((res) => {
-          if (res.data[0][0]) {
-            res.data[0][0].sex = res.data[0][0].sex ? "女" : "男";
+
+           res.data[0][0].sex = res.data[0][0].sex ? "女" : "男";
             this.ruleForm = res.data[0][0];
             this.ruleForm.org = res.data[0][0].org
               ? res.data[0][0].org.split(",")[0]
@@ -321,14 +390,43 @@ export default {
                 : res.data[0][0].type == 2
                 ? "学生"
                 : "管理员";
+                this.ruleForm.sBySchool = res.data[0][0].organizationname
+               
+                
             this.getCcName(res.data[0][0].organizeid);
-            console.log(res.data[0][0]);
-          }
+        
+            this.teaType.forEach(e =>{
+              let array2 = []
+              for (var i = 0; i < e.child.length; i++) {
+                array2.push(e.child[i].id)
+              }
+              e.value = this.arrayToArray(this.ruleForm.cclassid.split(','), array2)
+
+          })
+
+           this.ruleFormCopy = JSON.parse(JSON.stringify(this.ruleForm))
+            console.log('this.ruleForm',JSON.parse(JSON.stringify(this.ruleForm)));
         })
         .catch((err) => {
           console.error(err);
         });
     },
+    arrayToArray(arrayo, arrayt) {
+      let array1 = arrayo;
+      let array2 = arrayt;
+
+      let commonElements = [];
+
+      for (let i = 0; i < array1.length; i++) {
+        for (let j = 0; j < array2.length; j++) {
+          if (array1[i] === array2[j]) {
+            commonElements.push(array1[i]);
+          }
+        }
+      }
+      return commonElements;
+    },
+   
     getCcName(oid) {
       let params = { oid: oid };
       this.ajax
@@ -353,44 +451,15 @@ export default {
           console.error(err);
         });
     },
-    updatePassword() {
-      const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d]{8,16}$/;
-      if (!reg.test(this.password)) {
-        this.$message.error("密码长度为8-16位,且包含大小写字母");
-        return;
-      } else if (this.password != this.password1) {
-        this.$message.error("两次新密码不相同");
-        return;
-      }
-      let params = [
-        {
-          userid: this.userid,
-          opassword: this.opassword,
-          password: this.password,
-        },
-      ];
-      this.ajax
-        .post(this.$store.state.api + "updatePassword", params)
-        .then((res) => {
-          if (res.data[0] && res.data[0].success == 1) {
-            this.$message.success("修改成功");
-            this.opassword = "";
-            this.password = "";
-            this.password1 = "";
-          } else {
-            this.$message.error("修改失败,原密码不正确");
-          }
-        })
-        .catch((err) => {
-          this.$message.error("修改失败");
-          console.error(err);
-        });
-    },
+    Ochange() {
+      this.$forceUpdate()
+    }
   },
   created() {
-    this.getSchool();
     this.getOrg();
-    this.getDetail();
+    // this.getSchool()
+    this.getData()
+    // this.getDetail();
   },
 };
 </script>
@@ -459,4 +528,28 @@ export default {
 .rightCon >>> .el-form-item__label{
   color: #000 !important;
 }
+.diaBtn {
+	display: flex;
+	justify-content: flex-end;
+	gap: 10px;
+	/* height: 40px; */
+	align-items: center;
+	padding: 10px 0px 0 !important;
+	box-sizing: border-box;
+	/* min-height: 60px; */
+}
+.diaBtn > div {
+	background: #e7e7e7;
+	border-radius: 25px;
+	height: 24px;
+	width: 56px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	box-sizing: border-box;
+	font-family: PingFang SC;
+	font-weight: 400;
+	font-size: 12px;
+	cursor: pointer;
+}
 </style>

+ 1 - 1
src/components/pages/liyuan/schoolSafe.vue

@@ -18,7 +18,7 @@ export default {
   data() {
     return {
       cardArray: [
-        { title: '安全巡查', icon: require('../../../assets/icon/liyuan/mbll.svg'), type: 1, to: "/examineL" },
+        // { title: '安全巡查', icon: require('../../../assets/icon/liyuan/mbll.svg'), type: 1, to: "/examineL" },
         { title: '安全表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/safeTest" }
       ]
     }

+ 7 - 2
src/components/pages/sz/teacher.vue

@@ -3,6 +3,7 @@
     class="pb_content"
     style="background: unset; height: 100%; overflow: auto"
   >
+      <backPage  v-if="$route.query.gotype == 1" tit="教师管理"></backPage>
     <div
       class="pb_content_body"
       style="
@@ -13,9 +14,8 @@
         /* border-radius: 5px; */
       "
     >
-      <div class="pb_head" style="display:flex;justify-content: space-between;align-items: center;">
+      <div class="pb_head">
         <span>教师管理</span>
-        <div style="font-size: 16px;font-weight: normal;cursor: pointer;" @click.stop="$router.go(-1)">返回</div>
       </div>
       <div class="student_head">
         <div class="head_left">
@@ -300,8 +300,13 @@
 
 <script>
 import $ from "jquery";
+import backPage from "../liyuan/components/backPage.vue";
+
 // import pinyin from "../../../../node_modules/js-pinyin/index";
 export default {
+  components: {
+    backPage
+  },
   data() {
     return {
       tableHeight: "500px",

+ 6 - 3
src/components/pages/test/check/index.vue

@@ -2399,7 +2399,7 @@ export default {
     },
     // ai评分循环
     async loopSco(val){
-      console.log('6666',val);
+      // console.log('6666',val);
       
       let userWork =[]
       let _fileid = ''
@@ -2413,8 +2413,11 @@ for (let index = 0; index < val.array.length; index++) {
             // })
           }
           if (val.array[index].type == 5 && this.cueWord.fieldList.includes(val.array[index].json.title)) {
-            
-            if (val.array[index].json.file && val.array[index].json.file[0].url && this.cueWord.fieldList.indexOf('附件') != -1) {
+            // console.log('qqq',val.array[index].json.file)
+            // console.log('888',this.cueWord.fieldList)
+
+            if (val.array[index].json.file && val.array[index].json.file[0].url) {
+              // console.log('6666')
               _fileid = await this.createFileid(val.array[index].json.file[0].url)
             }
 

+ 6 - 5
src/components/pages/test/index.vue

@@ -1,7 +1,9 @@
 <template>
     <div class="pb_content" style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;">
+        <backPage  v-if="$route.query.gotype == 1" tit="智能表单"></backPage>
+
         <div style="width:100%;padding:0;box-sizing: border-box;">
-            <div class="pb_head top">
+            <div class="pb_head top" v-if="!$route.query.gotype">
                 <div style="display: flex;align-items: center;">
                     <span class="sub_head">表单管理</span>
                     <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
@@ -44,9 +46,6 @@
                         )
                         ">智能助手</span>
                 </div>
-                <div style="font-size: 16px;display: flex;align-items: center;cursor: pointer;" v-if="$route.query.gotype == 1" @click.stop="$router.go(-1)">
-                    返回
-                </div>
             </div>
         </div>
         <div class="bbox_nav">
@@ -433,9 +432,11 @@ import randar2 from "./data/randar2.vue";
 import shareBox from './shareBox/index.vue'
 import examine from './examine/index.vue'
 import aggregate from './aggregate/index'
+import backPage from "../liyuan/components/backPage.vue";
+
 export default {
     name: 'test',
-    components: { EditorBar, CourseProblem, pie1, pie2, randar1, randar2, shareBox, examine, aggregate },
+    components: { EditorBar, CourseProblem, pie1, pie2, randar1, randar2, shareBox, examine, aggregate,backPage },
     data() {
         return {
             examineData: [],