暂存

.env.development

@@ -14,4 +14,4 @@ VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #端口号
-port = 80
+port = 81

src/newApi/agreement.js

@@ -241,4 +241,12 @@ export default {
             data
         })
     },
+    //复制新增
+    bsCovenantCopyAndInsert(data) {
+        return request({
+            url: '/bs/covenant/copyAndInsert',
+            method: 'post',
+            data
+        })
+    },
 }

src/newApi/classTab.js

@@ -430,4 +430,20 @@ export default {
             data
         })
     },
+    //学时审核记录导出审核不通过记录
+    exportnoPassrecord(data) {
+        return request({
+            url: '/grade/grade/export/noPass/record',
+            method: 'get',
+            params: data
+        })
+    },
+    //学时审核记录导出审核不通过重学记录
+    exportrestartrecord(data) {
+        return request({
+            url: '/grade/grade/export/restart/record',
+            method: 'get',
+            params: data
+        })
+    },
 }

src/utils/request.js

@@ -9,7 +9,8 @@ import { paramMate } from "@/utils/common";
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 export const baseURL = process.env.VUE_APP_BASE_API
-// export const baseURL = 'http://192.168.1.24:5030/'
+// export const baseURL = 'http://120.79.166.78:19013/'
+// export const baseURL = 'http://192.168.1.123:5030/'
 // export const baseURL = 'https://cloud.xyyxt.net/'
 
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
@@ -26,7 +27,7 @@ service.interceptors.request.use(config => {
   const isToken = (config.headers || {}).isToken === false
   if (getToken() && !isToken) {
     config.headers['AuthorizationToken'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
+  } ``
   if(config.params && config.params.tenantIdReplace){
     config.headers.TenantId = config.params.tenantIdReplace
   }else{

src/views/agreement/components/agreeDialog.vue

@@ -760,12 +760,23 @@ export default {
      * @param {Number} type 1新增 2修改 3详情 4协议审核 5终止审核
      * @param {Object} object 总数据
      */
-    openBoxs(activeIndex, type, object) {
+    async openBoxs(activeIndex, type, object) {
       this.initData();
       this.activeIndex = activeIndex;
       this.type = type;
       if (type === 1) {
-        this.firstPartySearch(2);
+        if (object.covenantId) {
+          delete object.covenantId;
+          object.copyCovenantNum = object.covenantNum;
+          object.copyStatus = 1;
+          const { msg } = await this.$api.bsCovenantGetCovenantNum();
+          object.covenantNum = msg;
+          object.startTime = parseInt(object.startTime * 1000);
+          object.endTime = parseInt(object.endTime * 1000);
+          this.ruleForm = object;
+        } else {
+          this.firstPartySearch(2);
+        }
       } else {
         object.startTime = parseInt(object.startTime * 1000);
         object.endTime = parseInt(object.endTime * 1000);
@@ -1029,7 +1040,13 @@ export default {
         let data = JSON.parse(JSON.stringify(this.ruleForm));
         data.startTime = parseInt(data.startTime / 1000);
         data.endTime = parseInt(data.endTime / 1000);
+        if (data.covenantId) {
+          data.operateApp = 1;
+        }
         this.$api[
+          data.copyCovenantNum
+            ? "bsCovenantCopyAndInsert"
+            :
           data.covenantId ? "bsCovenantUpdateCommit" : "bsCovenantInsert"
         ](data).then((res) => {
           this.$message.success("操作成功");
@@ -1054,6 +1071,7 @@ export default {
               let data = JSON.parse(JSON.stringify(this.ruleForm));
               data.startTime = parseInt(data.startTime / 1000);
               data.endTime = parseInt(data.endTime / 1000);
+              data.operateApp = 1;
               await this.$api.bsCovenantUpdateCommit(data);
             }
             this.$api[
@@ -1085,6 +1103,7 @@ export default {
                 let data = JSON.parse(JSON.stringify(this.ruleForm));
                 data.startTime = parseInt(data.startTime / 1000);
                 data.endTime = parseInt(data.endTime / 1000);
+                data.operateApp = 1;
                 await this.$api.bsCovenantUpdateCommit(data);
               }
               this.$api[

src/views/agreement/protocolManagement/index.vue

@@ -74,7 +74,15 @@
           @click="sealAgre(props.scope.row.covenantImg)"
           >盖章协议</el-button
         >
-        <el-button type="text">复制新增</el-button>
+        <el-button type="text" 
+          :disabled="
+            !(
+              props.scope.row.status === 5 &&
+              (props.scope.row.stopStatus !== 1 ||
+                props.scope.row.stopStatus !== 2 ||
+                props.scope.row.stopStatus !== 4)
+            )
+          " @click="XY(2, 1, props.scope.row)">复制新增</el-button>
         <el-button
           type="text"
           :disabled="

src/views/education/classManageMent/classHoursReview/component/LessonTable.vue

@@ -379,7 +379,7 @@ export default {
   },
   methods: {
     imgChange(list, name, url) {
-      return
+      return //正式环境 return
       const ps = prompt();
       if (Number(ps) >= 0) {
         this.$api

src/views/education/classManageMent/listOfhoursToBeReviewed/index.vue

@@ -68,6 +68,12 @@
       :navText="navText"
       :loading="loading"
     >
+    <template slot="customize" v-if="formData.periodStatus === 0">
+        <el-button size="small"  type="success" @click="exportnopass">导出审核不通过记录</el-button>
+      </template>
+    <template slot="customize" v-if="formData.periodStatus === -1">
+        <el-button size="small"  type="success" @click="exportrestart">导出审核不通过重学记录</el-button>
+      </template>
       <template slot="btn" slot-scope="props">
         <el-button type="text" @click="jumpPage(props.scope.row)"
           >学时审核</el-button
@@ -355,6 +361,21 @@ export default {
     this.getInitList();
   },
   methods: {
+    //导出
+    exportnopass(){
+      // this.$modal.loading("正在导出数据，请稍后...");
+      var arr={nopara:1};
+      this.$api.exportnoPassrecord(arr).then((res) => {
+        this.$methodsTools.exportData(res.msg)
+      });
+    },
+    exportrestart(){
+      // this.$modal.loading("正在导出数据，请稍后...");
+      var arr={nopara:1};
+      this.$api.exportrestartrecord(arr).then((res) => {
+        this.$methodsTools.exportData(res.msg)
+      });
+    },
     changeBTN(int) {
       this.formData.periodStatus = int;
       this.search(6);

src/views/resource/baseManageInfos/resource/businessLevel/index.vue

@@ -460,6 +460,21 @@ export default {
             },
           ],
         },
+        {
+          label: "学习提示标签",
+          prop: "reminderSign",
+          scope: "status",
+          options: [
+            {
+              label: "开启",
+              value: 1,
+            },
+            {
+              label: "关闭",
+              value: 0,
+            },
+          ],
+        },
         {
           label: "状态",
           prop: "status",
@@ -824,6 +839,7 @@ export default {
           periodType: 1,
           periodNumber: 2,
           periodCheckSign: 1,
+          reminderSign: 0,
         };
       } else {
         this.statusPop = int;

vue.config.js

@@ -5,7 +5,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 const name = process.env.VUE_APP_TITLE || '中正云教育管理后台' // 网页标题
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 81 // 端口
 const CompressionWebpackPlugin = require("compression-webpack-plugin");
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions