Browse Source

Merge branch 'master' into liua

* master:
  ~
  bug 1113
  ~
la 2 years ago
parent
commit
57b220a490

File diff suppressed because it is too large
+ 1122 - 999
pnpm-lock.yaml


File diff suppressed because it is too large
+ 0 - 1
public/dtk/assets/index.26656681.js


File diff suppressed because it is too large
+ 1 - 0
public/dtk/assets/index.4e3cb552.js


File diff suppressed because it is too large
+ 0 - 1
public/dtk/assets/index.72940277.js


File diff suppressed because it is too large
+ 1 - 1
public/dtk/assets/index.b33036ab.css


File diff suppressed because it is too large
+ 1 - 0
public/dtk/assets/index.b9033355.js


File diff suppressed because it is too large
+ 0 - 1
public/dtk/assets/index.cb418333.css


File diff suppressed because it is too large
+ 0 - 1
public/dtk/assets/index.fe2cf7b0.js


+ 3 - 0
public/dtk/config.js

@@ -8,6 +8,7 @@ const local = {
   api:'https://openapi.dev.bozedu.net/',
   uc: 'https://uc.dev.bozedu.net/',
   origin: window.location.origin,
+  tiny: '',
 }
 
 // 测试服环境
@@ -18,6 +19,7 @@ const development = {
   yzy: 'https://yzy.dev.bozedu.net/',
   api:'https://openapi.dev.bozedu.net/',
   uc: 'https://uc.dev.bozedu.net/',
+  tiny: '/webapps/page/liankao',
 }
 
 // // 正式服环境
@@ -28,6 +30,7 @@ const production = {
   yzy: 'https://yzy.bozedu.net/',
   api:'https://openapi.bozedu.net/',
   uc: 'https://uc.bozedu.net/',
+  tiny: '/webapps/page/liankao',
 }
 
 function isWhich() {

+ 2 - 2
public/dtk/index.html

@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>自定义答题卡</title>
     <script src="./config.js"></script>
-    <script type="module" crossorigin src="./assets/index.fe2cf7b0.js"></script>
+    <script type="module" crossorigin src="./assets/index.4e3cb552.js"></script>
     <link rel="modulepreload" href="./assets/vendor.fb7751d4.js">
     <link rel="stylesheet" href="./assets/vendor.e1b158b3.css">
-    <link rel="stylesheet" href="./assets/index.e410b78d.css">
+    <link rel="stylesheet" href="./assets/index.8eebdf04.css">
   </head>
   <body>
     <div id="app"></div>

+ 1 - 1
src/pages/process/index.vue

@@ -398,7 +398,7 @@ function jfgzSub() {
               <div v-if="showSubList[item.ykj_id]" class="down pt-15px pl-35px">
                 <ul class="subject-list">
                   <li v-for="items in item.lc" :key="items.ykl_id">
-                    <span class="sub-del cursor-pointer" @click="del_sub(item.ykj_id, items.ykl_id)" />
+                    <span v-if="item.btn_check.btn_edit == '1'" class="sub-del cursor-pointer" @click="del_sub(item.ykj_id, items.ykl_id)" />
                     <div>
                       <div class="subject-name m-auto">
                         {{ items.ykl_lc !== '' ? JSON.parse(items.ykl_lc).ze_xueke_name : '' }}

+ 130 - 133
src/pages/process/xgcj/[id].vue

@@ -1,44 +1,113 @@
+<script setup>
+import { useRouter } from 'vue-router'
+import request from '~/utils/request'
+
+const router = useRouter()
+const route = useRoute()
+function linkTo(name) {
+  router.push({ name })
+}
+let ze_id = $ref('')
+const sm_id = $ref('')
+const cm_id = $ref('')
+let school_list = $ref([])
+let classes_list = $ref([])
+const keyword = $ref('')
+let tableData = $ref([])
+const limit = $ref(10)
+let total = $ref(0)
+let cur_page = $ref(1)
+
+function getListData() {
+  const data = {
+    ze_id,
+    sm_id,
+    cm_id,
+    keyword,
+    page: cur_page,
+    limit,
+    from: 'xgcj',
+  }
+  request({
+    url: '/yzy/xsjjdtk/index',
+    data,
+  }).then((res) => {
+    if (res.code === '1') {
+      tableData = res.data.page_data
+      total = Number(res.data.total_rows)
+      cur_page = Number(res.data.page_now)
+    }
+  })
+}
+
+function getSchool() {
+  const data = {
+    ze_id,
+  }
+  request({
+    url: '/yzy/xsjjdtk/school_class',
+    data,
+  }).then((res) => {
+    if (res.code === '1')
+      school_list = res.data.list
+  })
+}
+
+function filterData() {
+  cur_page = 1
+  getListData()
+}
+
+function filterSchool() {
+  for (const i in school_list) {
+    if (school_list[i].sm_id === sm_id)
+      classes_list = school_list[i].classes
+  }
+  filterData()
+}
+function toRevise(item) {
+  router.push({ name: 'process-xgfs-ze_id-ysk_id', params: { ze_id: item.ze_id, ysk_id: item.ysk_id } })
+}
+function handleSelectionChange(val) {
+  cur_page = val
+  getListData()
+}
+if (route.params.id) {
+  ze_id = route.params.id
+  getListData()
+  getSchool()
+}
+</script>
+
 <template>
-  <NavHeader/>
-  <bread-crumb/>
+  <NavHeader />
+  <bread-crumb />
   <div class="w-1200px m-auto">
     <div class="relative -mt-40px flex justify-end">
-      <button type="button" class="back-btn" @click="linkTo('process')">返回</button>
+      <button type="button" class="back-btn" @click="linkTo('process')">
+        返回
+      </button>
     </div>
     <div class="mt-10px w-full bg-hex-fff py-20px px-15px">
       <div class="flex items-center">
         <el-select v-model="sm_id" placeholder="全部学校" size="large" @change="filterSchool">
-          <el-option label="全部" value=""
-          />
-          <el-option
-            v-for="item in school_list"
-            :key="item.sm_id"
-            :label="item.sm_name"
-            :value="item.sm_id"
-          />
+          <el-option label="全部" value="" />
+          <el-option v-for="item in school_list" :key="item.sm_id" :label="item.sm_name" :value="item.sm_id" />
         </el-select>
-        <el-select class="ml-20px" v-model="cm_id" :disabled="sm_id === ''" placeholder="全部班级" size="large"
-                   @change="filterData">
-          <el-option label="全部" value=""
-          />
-          <el-option
-            v-for="item in classes_list"
-            :key="item.cm_id"
-            :label="item.cm_name"
-            :value="item.cm_id"
-          />
+        <el-select
+          v-model="cm_id" class="ml-20px" :disabled="sm_id === ''" placeholder="全部班级" size="large"
+          @change="filterData"
+        >
+          <el-option label="全部" value="" />
+          <el-option v-for="item in classes_list" :key="item.cm_id" :label="item.cm_name" :value="item.cm_id" />
         </el-select>
         <el-input
-          v-model="keyword"
-          class="ml-20px"
-          style="width: 200px;"
-          size="large"
-          @keyup.enter="filterData"
-          @clear="filterData"
-          clearable
-          placeholder="请输入关键字"
+          v-model="keyword" class="ml-20px" style="width: 200px;" size="large" clearable
+          placeholder="请输入关键字" @keyup.enter="filterData" @clear="filterData"
         />
-        <el-button color="#003eee" class="ml-20px" type="primary" size="large" @click="filterData">搜索</el-button>
+        <el-button color="#003eee" class="ml-20px" type="primary" size="large" @click="filterData">
+          搜索
+        </el-button>
       </div>
       <div v-if="tableData.length > 0">
         <table class="mt-20px data-table" cellpadding="0" cellspacing="0">
@@ -54,128 +123,52 @@
           </tr>
           <tr v-for="item in tableData">
             <td>{{ item.sm_name }}</td>
-            <td>{{item.cm_name}}</td>
-            <td>{{item.student_no}}</td>
-            <td>{{item.user_realname}}</td>
-            <td>{{item.ysk_cj}}</td>
-            <td>{{item.ysk_cj_zg}}</td>
-            <td>{{item.ysk_cj_kg}}</td>
+            <td>{{ item.cm_name }}</td>
+            <td>{{ item.student_no }}</td>
+            <td>{{ item.user_realname }}</td>
+            <td>{{ item.ysk_cj }}</td>
+            <td>{{ item.ysk_cj_zg }}</td>
+            <td>{{ item.ysk_cj_kg }}</td>
             <td>
-               <button type="button" class="op-btn" @click="toRevise(item)">修改成绩</button>
+              <button type="button" class="op-btn" @click="toRevise(item)">
+                修改成绩
+              </button>
             </td>
           </tr>
         </table>
         <div class="mt-20px page-new flex justify-end">
-          <el-pagination v-model:current-page="cur_page" v-model:page-size="limit" layout="total,prev, pager, next"
-                         :total="total" :background="true" @current-change="handleSelectionChange"></el-pagination>
+          <el-pagination
+            v-model:current-page="cur_page" v-model:page-size="limit" layout="total,prev, pager, next"
+            :total="total" :background="true" @current-change="handleSelectionChange"
+          />
         </div>
       </div>
       <div v-else class="no-data">
         <div>
-          <h3 class="no-data-img"></h3>
-          <h4 class="mt-25px text-18px text-hex-0048e5 text-center">暂无数据</h4>
+          <h3 class="no-data-img" />
+          <h4 class="mt-25px text-18px text-hex-0048e5 text-center">
+            暂无数据
+          </h4>
         </div>
       </div>
     </div>
-
   </div>
 
-  <commonFooter/>
+  <commonFooter />
 </template>
+
 <route lang="json">
 {
-"meta":{
-"title":"修改成绩",
-"breadcrumb":true
-}
-}
-</route>
-<script setup>
-import {useRouter} from "vue-router";
-import request from "~/utils/request";
-import {REQUEST} from "~/utils/request";
-import {user} from "~/store";
-
-const router = useRouter();
-const route = useRoute();
-const linkTo = (name) => {
-  router.push({name});
-};
-let ze_id = $ref('')
-let sm_id = $ref('');
-let cm_id = $ref('');
-let school_list = $ref([]);
-let classes_list = $ref([]);
-let keyword = $ref('');
-let tableData = $ref([]);
-let limit = $ref(10);
-let total = $ref(0);
-let cur_page = $ref(1);
-
-function getListData() {
-  let data = {
-    ze_id: ze_id,
-    sm_id: sm_id,
-    cm_id: cm_id,
-    keyword: keyword,
-    page: cur_page,
-    limit: limit,
-  };
-  request({
-    url: "/yzy/xsjjdtk/index",
-    data: data,
-  }).then((res) => {
-    if (res.code === '1') {
-      tableData = res.data.page_data;
-      total = Number(res.data.total_rows);
-      cur_page = Number(res.data.page_now);
-    }
-  })
-}
-
-function getSchool() {
-  let data = {
-    ze_id: ze_id
-  };
-  request({
-    url: "/yzy/xsjjdtk/school_class",
-    data: data,
-  }).then((res) => {
-    if (res.code === '1') {
-      school_list = res.data.list;
-    }
-  })
-}
-
-function filterData() {
-  cur_page = 1;
-  getListData();
-}
-
-function filterSchool() {
-  for (let i in school_list) {
-    if (school_list[i].sm_id === sm_id) {
-      classes_list = school_list[i].classes;
-    }
+  "meta": {
+    "title": "修改成绩",
+    "breadcrumb": true
   }
-  filterData();
-}
-function toRevise(item) {
-  router.push({name:'process-xgfs-ze_id-ysk_id',params:{ze_id:item.ze_id,ysk_id:item.ysk_id}});
-}
-const handleSelectionChange = (val) => {
-  cur_page = val;
-  getListData();
-};
-if (route.params.id) {
-  ze_id = route.params.id;
-  getListData();
-  getSchool();
 }
-</script>
+</route>
 
 <style lang="scss" scoped>
 $color: #0048e5;
+
 ::v-deep .el-pagination.is-background .btn-next.is-active,
 ::v-deep .el-pagination.is-background .btn-prev.is-active,
 ::v-deep .el-pagination.is-background .el-pager li.is-active {
@@ -197,10 +190,12 @@ $color: #0048e5;
     text-align: center;
     font-size: 16px;
     color: #fff;
-    &:first-child{
+
+    &:first-child {
       border-radius: 6px 0 0 0;
     }
-    &:last-child{
+
+    &:last-child {
       border-radius: 0 6px 0 0;
     }
   }
@@ -226,6 +221,7 @@ $color: #0048e5;
     background: url("/images/no-data.png") center no-repeat;
   }
 }
+
 .op-btn {
   width: 82px;
   height: 30px;
@@ -235,7 +231,8 @@ $color: #0048e5;
   font-size: 14px;
   color: #003eee;
   text-align: center;
-  &:disabled{
+
+  &:disabled {
     background: #ccc;
     border-color: #ccc;
     color: #fff;