huangtao 3 gadi atpakaļ
vecāks
revīzija
0829ad1a59
29 mainītis faili ar 341 papildinājumiem un 84 dzēšanām
  1. 7 1
      src/api/modules/article.js
  2. 3 1
      src/api/modules/file.js
  3. BIN
      src/assets/image/logo.png
  4. 1 1
      src/common/Constant.js
  5. 0 1
      src/router/index.js
  6. 4 0
      src/router/menu.js
  7. 7 0
      src/router/modules/articleManagement.js
  8. 1 1
      src/styles/index.js
  9. 2 2
      src/views/Home.vue
  10. 2 2
      src/views/answerManagement/answerManagementDay.vue
  11. 3 3
      src/views/answerManagement/answerManagementSpecial.vue
  12. 2 2
      src/views/answerManagement/answerManagementWeek.vue
  13. 247 0
      src/views/articleManagement/articleCarouselUpload.vue
  14. 2 2
      src/views/articleManagement/articleCreate.vue
  15. 11 11
      src/views/articleManagement/articleList.vue
  16. 2 2
      src/views/engineeringWorkManagement/engineeringWorkList.vue
  17. 5 6
      src/views/examManagement/examAutomaticVolumeFormation.vue
  18. 4 4
      src/views/examManagement/examManagementDetail.vue
  19. 3 3
      src/views/examManagement/examManagementList.vue
  20. 6 6
      src/views/examManagement/examManualVolumeFormation.vue
  21. 10 17
      src/views/examQuestionManagement/examQuestionBatchImport.vue
  22. 3 3
      src/views/examQuestionManagement/examQuestionList.vue
  23. 2 2
      src/views/examQuestionManagement/examQuestionTypeCondition.vue
  24. 2 2
      src/views/examQuestionManagement/examQusetionCreateGapFilling.vue
  25. 2 2
      src/views/examQuestionManagement/examQusetionCreateMultiple.vue
  26. 2 2
      src/views/examQuestionManagement/examQusetionCreateSingle.vue
  27. 2 2
      src/views/examQuestionManagement/examQusetionCreateTrueOrFalse.vue
  28. 4 4
      src/views/login/login.vue
  29. 2 2
      src/views/user/userManagementList.vue

+ 7 - 1
src/api/modules/article.js

@@ -13,7 +13,13 @@ export default {
     INTERFACE_POST_ADMIN_MATERIALS: "admin/materials",
     // 更新文章
     INTERFACE_PUT_ADMIN_MATERIALS: "admin/materials/{materialId}",
-    // 获取文章
+    // 获取文章详情
     INTERFACE_GET_MATERIALS: "materials/{materialId}",
+    // 获取最新的N张轮播图
+    INTERFACE_GET_CAROUSELS_LIST: "carousels",
+    // 新增一张轮播图
+    INTERFACE_POST_CAROUSELS_ADD: "admin/carousels",
+    // 删除一张轮播图
+    INTERFACE_DELETE_CAROUSELS_DELETE: "admin/carousels/{carouselId}",
   }
 };

+ 3 - 1
src/api/modules/file.js

@@ -1,6 +1,8 @@
 export default {
     API_LIST_FILE: {
       // 上传文件
-      INTERFACE_POST_IMAGE_UPLOAD: "admin/questions/upload",
+      INTERFACE_POST_FILE_UPLOAD_CSV: "admin/questions/upload",
+      // 上传图片
+      INTERFACE_POST_FILE_UPLOAD_IMAGE: 'image/upload'
     }
   };

BIN
src/assets/image/logo.png


+ 1 - 1
src/common/Constant.js

@@ -35,7 +35,7 @@ export const UPLOAD_IMAGE_MAX_SIZE = 10;
 // 正则表达式:身份证号
 export const REGULAR_EXPRESSION_IDNUMBER = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
 // 项目的标题文字
-export const PROGRAM_Title = '京学堂';
+export const PROGRAM_Title = '京学堂';
 // 项目的副标题文字
 export const PROGRAM_Title_Little = '北京高铁工务段';
 // 试题类型

+ 0 - 1
src/router/index.js

@@ -20,7 +20,6 @@ const commonFiles = require.context("./common", true, /\.js$/);
 commonFiles.keys().forEach(modulePath => {
   routes.push(...commonFiles(modulePath).default);
 });
-console.log(routes)
 
 export default new Router({
   mode: "history",

+ 4 - 0
src/router/menu.js

@@ -28,6 +28,10 @@ export default [
       {
         path: '/articleManagement/create',
         meta: { title: '新建文章' },
+      },
+      {
+        path: '/articleManagement/carouselUploda',
+        meta: { title: '轮播图管理' },
       }
     ],
   },

+ 7 - 0
src/router/modules/articleManagement.js

@@ -19,5 +19,12 @@ export default {
       component: () =>
         import('@/views/articleManagement/articleCreate'),
     },
+    {
+      path: 'carouselUploda',
+      name: 'articleManagement-carouselUploda',
+      meta: { title: '轮播图管理' },
+      component: () =>
+        import('@/views/articleManagement/articleCarouselUpload'),
+    },
   ],
 };

+ 1 - 1
src/styles/index.js

@@ -12,7 +12,7 @@ import 'ant-design-vue/dist/antd.css';
 import { Icon } from 'ant-design-vue';
 import Vue from 'vue'
 const IconFont = Icon.createFromIconfontCN({
-  scriptUrl: '//at.alicdn.com/t/font_2605334_2lerxnjz19t.js',
+  scriptUrl: '//at.alicdn.com/t/font_2605334_1qo67s1vjpz.js',
 });
 
 Vue.use(less);

+ 2 - 2
src/views/Home.vue

@@ -54,11 +54,11 @@
           <EchartsDoughnut ref="echartsPieTwoRef" width="100%" height="360px" />
         </div>
       </div>
-      <div class="company-info">
+      <!-- <div class="company-info">
         <span>
           copyright © 浮游科技有限公司出品
         </span>
-      </div>
+      </div> -->
     </a-spin>
   </div>
 </template>

+ 2 - 2
src/views/answerManagement/answerManagementDay.vue

@@ -64,11 +64,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 3 - 3
src/views/answerManagement/answerManagementSpecial.vue

@@ -198,11 +198,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
     <QuestionDetailDialog
       :questionDetail.sync="questionDetail"
       :isVisible.sync="isVisible"
@@ -515,7 +515,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 2 - 2
src/views/answerManagement/answerManagementWeek.vue

@@ -64,11 +64,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 247 - 0
src/views/articleManagement/articleCarouselUpload.vue

@@ -0,0 +1,247 @@
+<template>
+  <div class="app-container article-carousel-upload">
+    <a-spin :spinning="loading">
+      <!-- 上传 -->
+      <div class="common-card basic-information-box">
+        <div class="basic-information-title">上传轮播图</div>
+        <div class="basic-information-form">
+          <a-upload
+            name="file"
+            accept=".jpg,.png,.jpeg"
+            :headers="headers"
+            :show-upload-list="false"
+            multiple
+            :before-upload="beforeUpload"
+            @change="uploadFileFun"
+          >
+            <a-button>
+              <a-icon type="upload" /> <span>点击上传</span>
+            </a-button>
+          </a-upload>
+        </div>
+      </div>
+      <!-- 轮播图列表 -->
+      <div class="common-card a-card-margin-top basic-information-box">
+        <div class="basic-information-title">轮播图列表</div>
+        <div class="carousel-list">
+          <div
+            :class="{
+              'carousel-item': true,
+              'carousel-item-margin': (index + 1) % 3 !== 0,
+            }"
+            v-for="(item, index) in carouselList"
+            :key="index"
+          >
+            <img class="carousel-item-img" :src="item.url" fit="contain" />
+            <a title="删除">
+              <a-icon
+                class="carousel-item-delete"
+                type="delete"
+                @click="handleDeleteCarousel(item)"
+              />
+            </a>
+          </div>
+        </div>
+      </div>
+    </a-spin>
+    <!-- <div class="company-info">
+      <span>
+        copyright © 浮游科技有限公司出品
+      </span>
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { formatePathParams } from '@/filters';
+export default {
+  name: 'examQuestionBatchImport',
+  props: {},
+  components: {},
+  data() {
+    return {
+      loading: false, // 是否显示加载动画
+      headers: {
+        authorization: 'authorization-text',
+      },
+      carouselList: [
+        {
+          id: 1,
+          url:
+            'https://jtxt-material-images-public.oss-cn-beijing.aliyuncs.com/f843e819a41048f3b21a86eea4d61120.png',
+          materialId: '',
+        },
+        {
+          id: 2,
+          url:
+            'https://jtxt-material-images-public.oss-cn-beijing.aliyuncs.com/f843e819a41048f3b21a86eea4d61120.png',
+          materialId: '',
+        },
+        {
+          id: 3,
+          url:
+            'https://jtxt-material-images-public.oss-cn-beijing.aliyuncs.com/f843e819a41048f3b21a86eea4d61120.png',
+          materialId: '',
+        },
+      ], // 已有轮播图列表
+    };
+  },
+  created() {
+    this.initDataFun(); //初始化数据
+  },
+  mounted() {},
+  beforeDestroy() {},
+  watch: {},
+  computed: {},
+  methods: {
+    //初始化数据
+    initDataFun() {
+      // this.getCarouselListFun(); // 查询:轮播图列表
+    },
+    // 查询:轮播图列表
+    getCarouselListFun() {
+      let params = {
+        num: 10,
+      };
+      this.$_http
+        .get(this.$_API.INTERFACE_GET_CAROUSELS_LIST, { params })
+        .then((res) => {
+          console.log(res);
+          this.carouselList = res.data;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 上传前的校验
+    beforeUpload(file) {
+      console.log(file);
+      let isJpgOrPng =
+        file.type === 'image/jpeg' ||
+        file.type === 'image/png' ||
+        file.type === 'image/jpg';
+      if (!isJpgOrPng) {
+        this.$message.error('上传图片只能是 .jpeg, .jpg, .png, 格式!');
+      }
+      let isLtHalf1M = file.size / 1024 / 1024 < 0.5;
+      if (!isLtHalf1M) {
+        this.$message.error(`${file.name} 文件必须小于 0.5M !`);
+      }
+      let bySelf = false;
+      return isJpgOrPng && isLtHalf1M && bySelf;
+    },
+    // 确认上传图片
+    uploadFileFun(data) {
+      console.log(data);
+      this.loading = true;
+      const formData = new FormData();
+      formData.append('image-file', data.file);
+      this.$_http
+        .post(this.$_API.INTERFACE_POST_FILE_UPLOAD_IMAGE, formData, {
+          headers: {
+            'Content-Type': 'multipart/form-data;',
+          },
+        })
+        .then((res) => {
+          console.log(res);
+          this.loading = false;
+          // this.carouselAddFun(res.data); // 新增一个轮播图
+        })
+        .catch((err) => {
+          this.$message.error(`${err.response.data}`);
+          this.loading = false;
+        });
+    },
+    // 新增一个轮播图
+    carouselAddFun(item) {
+      if (!item || !item.url) {
+        return;
+      }
+      let params = {
+        materialId: '',
+        imageUrl: item.url,
+      };
+      this.$_http
+        .post(this.$_API.INTERFACE_POST_CAROUSELS_ADD, params)
+        .then((res) => {
+          if (res.success && res.data) {
+            this.$message.success(`成功上传一张轮播图`);
+          } else {
+            this.$message.error(`${res.data || res.message}`);
+          }
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.$message.error(`${err.response.data}`);
+          this.loading = false;
+        });
+    },
+    // 操作:删除一个轮播图
+    handleDeleteCarousel(item) {
+      console.log(item);
+      if (!item || !item.id) {
+        return;
+      }
+      let params = {
+        carouselId: item.id,
+      };
+      this.$_http
+        .delete(
+          formatePathParams(
+            this.$_API.INTERFACE_DELETE_CAROUSELS_DELETE,
+            params
+          )
+        )
+        .then((res) => {
+          console.log(res);
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="less">
+@import '~@/styles/common/variable.less';
+</style>
+
+<style lang="less" scoped>
+@import '~@/styles/common/variable.less';
+.article-carousel-upload {
+  .carousel-list {
+    margin-top: @paddingMarginVal;
+    display: flex;
+    flex-wrap: wrap;
+    .carousel-item {
+      width: 32%;
+      position: relative;
+      .carousel-item-img {
+        width: 100%;
+        height: 300px;
+      }
+      .carousel-item-delete {
+        padding: 3px 3px;
+        border-radius: 3px;
+        border: 1px solid @mainColorBorder;
+        background-color: @mainColorWhite;
+        position: absolute;
+        right: @paddingMarginVal;
+        top: @paddingMarginVal;
+        font-size: 20px;
+        color: @mainColorBlack25;
+        cursor: pointer;
+        &:hover {
+          color: @mainColorBlueNormal;
+        }
+      }
+    }
+    .carousel-item-margin {
+      margin-right: 2%;
+    }
+  }
+}
+</style>

+ 2 - 2
src/views/articleManagement/articleCreate.vue

@@ -150,11 +150,11 @@
     >
       <p v-html="content">{{ content }}</p>
     </a-drawer>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 11 - 11
src/views/articleManagement/articleList.vue

@@ -66,7 +66,9 @@
         >
           <div class="article-list-item-title">{{ item.name }}</div>
           <div class="article-list-item-contgents">
-            <p class="p-content" v-html="item.contentsShow">{{ item.contentsShow }}</p>
+            <p class="p-content" v-html="item.contentsShow">
+              {{ item.contentsShow }}
+            </p>
           </div>
           <div class="article-list-item-createtime">
             {{ item.createdTime | formatDateTime }}
@@ -126,11 +128,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -158,10 +160,10 @@ export default {
       }, // 分页参数
     };
   },
-  created() {
+  created() {},
+  mounted() {
     this.initDataFun(); //初始化数据
   },
-  mounted() {},
   beforeDestroy() {},
   watch: {},
   computed: {
@@ -223,8 +225,6 @@ export default {
     getArticleListFun() {
       this.loading = true;
       let params = {
-        // categoryId: this.articleArticleType, // 文章类型-父类ID
-        // categoryIdChildren: this.checkedArticleTypeChildren, // 文章类型-子类ID
         categoryid: this.checkedArticleTypeChildren,
         engineertypeid: this.engineeringWorkChooseValue, // 工种ID
         page: this.pagination.current - 1,
@@ -246,7 +246,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }
@@ -349,9 +349,9 @@ export default {
 
 <style lang="less">
 .p-content img {
-    max-width: 100%;
-    width: auto;
-    height: auto;
+  max-width: 100%;
+  width: auto;
+  height: auto;
 }
 </style>
 

+ 2 - 2
src/views/engineeringWorkManagement/engineeringWorkList.vue

@@ -44,11 +44,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 5 - 6
src/views/examManagement/examAutomaticVolumeFormation.vue

@@ -320,12 +320,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
-
+    </div> -->
     <QuestionDetailDialog
       :questionDetail.sync="questionDetail"
       :isVisible.sync="isVisible"
@@ -592,7 +591,7 @@ export default {
               this.engineeringWorkList,
               resData.engineerTypes[0]
             );
-            resData.engineerTypeTxt = findItem.name;
+            resData.engineerTypeTxt = findItem ? findItem.name : '';
           } else {
             resData.engineerTypeTxt = '不限';
           }
@@ -650,7 +649,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }
@@ -974,7 +973,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 4 - 4
src/views/examManagement/examManagementDetail.vue

@@ -118,11 +118,11 @@
         </div>
       </a-spin>
     </div>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
     <QuestionDetailDialog
       :questionDetail.sync="questionDetail"
       :isVisible.sync="isVisible"
@@ -281,7 +281,7 @@ export default {
               this.engineeringWorkList,
               resData.engineerTypes[0]
             );
-            resData.engineerTypeTxt = findItem.name;
+            resData.engineerTypeTxt = findItem ? findItem.name : '';
           } else {
             resData.engineerTypeTxt = '不限';
           }
@@ -334,7 +334,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 3 - 3
src/views/examManagement/examManagementList.vue

@@ -115,11 +115,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -292,7 +292,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 6 - 6
src/views/examManagement/examManualVolumeFormation.vue

@@ -395,11 +395,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
     <QuestionDetailDialog
       :questionDetail.sync="questionDetail"
       :isVisible.sync="isVisible"
@@ -700,7 +700,7 @@ export default {
               this.engineeringWorkList,
               resData.engineerTypes[0]
             );
-            resData.engineerTypeTxt = findItem.name;
+            resData.engineerTypeTxt = findItem ? findItem.name : '';
           } else {
             resData.engineerTypeTxt = '不限';
           }
@@ -758,7 +758,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }
@@ -795,7 +795,7 @@ export default {
       let that = this;
       this.$confirm({
         title: '删除',
-        content: `确认删除编号为 ${record.questionCode} 的试题吗?`,
+        content: '确认删除该试题吗吗?',
         okText: '确认',
         cancelText: '取消',
         onOk() {
@@ -953,7 +953,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 10 - 17
src/views/examQuestionManagement/examQuestionBatchImport.vue

@@ -13,25 +13,21 @@
             :before-upload="beforeUpload"
             @change="uploadFileFun"
           >
-            <!-- ,.jpg,.png,.jpeg -->
-            <!-- <a-button>
-              <a-icon type="upload" /> <span>点击上传</span>
-            </a-button> -->
             <div class="uploadButton">
               <a-icon :type="loading ? 'loading' : 'upload'" />
               <div class="uploadText">
-                Upload
+                点击上传
               </div>
             </div>
           </a-upload>
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -61,15 +57,12 @@ export default {
     // 上传前
     beforeUpload(file) {
       let isJpgOrPng = file.type === 'application/vnd.ms-excel';
-      // file.type === 'image/jpeg' ||
-      // file.type === 'image/png' ||
-      // file.type === 'image/jpg';
       if (!isJpgOrPng) {
-        this.$message.error('上传图片只能是 .csv 格式!');
+        this.$message.error('上传文件只能是 .csv 格式!');
       }
       let isLtHalf1M = file.size / 1024 / 1024 < 0.5;
       if (!isLtHalf1M) {
-        this.$message.error('文件必须小于 0.5M !');
+        this.$message.error(`${file.name} 文件必须小于 0.5M !`);
       }
       let bySelf = false;
       return isJpgOrPng && isLtHalf1M && bySelf;
@@ -80,7 +73,7 @@ export default {
       const formData = new FormData();
       formData.append('file', data.file);
       this.$_http
-        .post(this.$_API.INTERFACE_POST_IMAGE_UPLOAD, formData, {
+        .post(this.$_API.INTERFACE_POST_FILE_UPLOAD_CSV, formData, {
           headers: {
             'Content-Type': 'multipart/form-data;',
           },
@@ -104,6 +97,10 @@ export default {
 
 <style lang="less">
 @import '~@/styles/common/variable.less';
+</style>
+
+<style lang="less" scoped>
+@import '~@/styles/common/variable.less';
 .question-batch-import {
   .uploadButton {
     margin: @navTopHight 0;
@@ -136,7 +133,3 @@ export default {
   }
 }
 </style>
-
-<style lang="less" scoped>
-@import '~@/styles/common/variable.less';
-</style>

+ 3 - 3
src/views/examQuestionManagement/examQuestionList.vue

@@ -153,11 +153,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -354,7 +354,7 @@ export default {
                 this.engineeringWorkList,
                 item.engineerTypes[0]
               );
-              item.engineerTypeTxt = findItem.name;
+              item.engineerTypeTxt = findItem ? findItem.name : '';
             } else {
               item.engineerTypeTxt = '不限';
             }

+ 2 - 2
src/views/examQuestionManagement/examQuestionTypeCondition.vue

@@ -104,11 +104,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 2 - 2
src/views/examQuestionManagement/examQusetionCreateGapFilling.vue

@@ -152,11 +152,11 @@
         </a-form>
       </a-spin>
     </div>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 2 - 2
src/views/examQuestionManagement/examQusetionCreateMultiple.vue

@@ -177,11 +177,11 @@
         </a-form>
       </a-spin>
     </div>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 2 - 2
src/views/examQuestionManagement/examQusetionCreateSingle.vue

@@ -192,11 +192,11 @@
         </a-form>
       </a-spin>
     </div>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 2 - 2
src/views/examQuestionManagement/examQusetionCreateTrueOrFalse.vue

@@ -168,11 +168,11 @@
         </a-form>
       </a-spin>
     </div>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 4 - 4
src/views/login/login.vue

@@ -60,9 +60,9 @@
             >
           </a-form-item>
         </a-form>
-        <div class="login-enterprise">
+        <!-- <div class="login-enterprise">
           <span>copyright © 浮游科技有限公司出品</span>
-        </div>
+        </div> -->
       </div>
     </a-spin>
   </div>
@@ -231,8 +231,8 @@ export default {
         width: 45px;
       }
       .login-description-txt {
-        margin-left: 45px;
-        width: 132px;
+        margin-left: 35px;
+        // width: 132px;
         font-size: 14px;
         text-align: center;
       }

+ 2 - 2
src/views/user/userManagementList.vue

@@ -130,11 +130,11 @@
         </div>
       </div>
     </a-spin>
-    <div class="company-info">
+    <!-- <div class="company-info">
       <span>
         copyright © 浮游科技有限公司出品
       </span>
-    </div>
+    </div> -->
   </div>
 </template>