merge

src/components/project/ProjectClass.vue

@@ -1,46 +1,54 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:48
+ * @FilePath: /fe-manage/src/components/project/ProjectClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <!-- 评估管理-创建评估页面 -->
 <template>
   <a-select
-      :getPopupContainer="
+    :getPopupContainer="
-                          (triggerNode) => {
+      (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
+        return triggerNode.parentNode || document.body;
-                          }
+      }
-                        "
+    "
-      v-model:value="id"
+    v-model:value="id"
-      placeholder="请选择分类"
+    placeholder="请选择分类"
-      style="width: 100%"
+    style="width: 100%"
-      :options="options"
+    :options="options"
-      allowClear
+    allowClear
-      @change="change"
+    @change="change"
-      :disabled="disabled"
+    :disabled="disabled"
   >
   </a-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 
 const store = useStore();
 
 const props = defineProps({
   value: String,
-  disabled: String
+  disabled: String,
-})
+});
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
+  store.state.projectClass.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 const id = computed(() => {
-  return props.value
+  return props.value;
-})
+});
-
-onMounted(() => {
-  options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
 
 function change(key, obj) {
-  emit('update:name', obj[0])
+  emit("update:name", obj[0]);
-  emit('update:value', key)
+  emit("update:value", key);
 }
-
 </script>

src/components/project/ProjectLevel.vue

@@ -1,27 +1,34 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:21
+ * @FilePath: /fe-manage/src/components/project/ProjectLevel.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options?.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options?.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
-        :getPopupContainer="
+      :getPopupContainer="
-                          (triggerNode) => {
+        (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
+          return triggerNode.parentNode || document.body;
-                          }
+        }
-                        "
+      "
-        v-model:value="id"
+      v-model:value="id"
-        :options="options"
+      :options="options"
-        style="width: 100%"
+      style="width: 100%"
-        placeholder="请选择项目级别"
+      placeholder="请选择项目级别"
-        @change="change"
+      @change="change"
-        :disabled="disabled"
+      :disabled="disabled"
     />
   </template>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
-
 
 const store = useStore();
 const props = defineProps({
@@ -29,23 +36,24 @@ const props = defineProps({
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
+    default: false,
-  }
+  },
-})
+});
 
 const id = computed(() => {
-  return props.value || null
+  return props.value || null;
-})
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
-
+  store.state.projectLevel.map((e) => ({
-onMounted(() => {
+    value: parseInt(e.dictCode),
-  options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    label: e.dictName,
-})
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
 </script>

src/components/project/TrainClass.vue

@@ -1,27 +1,34 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:46
+ * @FilePath: /fe-manage/src/components/project/TrainClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
-        :getPopupContainer="
+      :getPopupContainer="
-                          (triggerNode) => {
+        (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
+          return triggerNode.parentNode || document.body;
-                          }
+        }
-                        "
+      "
-        v-model:value="id"
+      v-model:value="id"
-        :options="options"
+      :options="options"
-        style="width: 100%"
+      style="width: 100%"
-        placeholder="请选择分类"
+      placeholder="请选择分类"
-        @change="change"
+      @change="change"
-        :disabled="disabled"
+      :disabled="disabled"
     />
   </template>
-
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 
 const store = useStore();
 
@@ -30,24 +37,24 @@ const props = defineProps({
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
+    default: false,
-  }
+  },
-})
+});
 
 const id = computed(() => {
-  return props.value
+  return props.value;
-})
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
-
+  store.state.projectSys.map((e) => ({
-onMounted(() => {
+    value: parseInt(e.dictCode),
-  options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    label: e.dictName,
-})
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
-
 </script>

src/views/courselibrary/components/seeModal.vue

@@ -156,7 +156,7 @@
               <div class="mbl_items12">
                 <div
                   class="i12_box1"
-                  style="position:relative;"
+                  style="position: relative"
                   v-for="(item, index) in detail.attach"
                   :key="index"
                 >
@@ -207,21 +207,43 @@
                   <div class="file_detail">
                     <div class="file_name">
                       <!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
-                      <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
+                      <span
-                        {{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}  
+                        style="
+                          color: #6f6f6f;
+                          width: 200px;
+                          display: block;
+                          overflow: hidden;
+                          white-space: nowrap;
+                          text-overflow: ellipsis;
+                          position: absolute;
+                          top: 4px;
+                          left: 72px;
+                        "
+                      >
+                        {{
+                          item.indexOf("-") !== -1
+                            ? item.slice(
+                                item.lastIndexOf("/") + 1,
+                                item.lastIndexOf("-")
+                              ) + item.slice(item.lastIndexOf("."))
+                            : item
+                        }}
                       </span>
                     </div>
 
                     <div class="file_updata">
                       <div class="updatabox">
                         <div class="updatacolor"></div>
-                        <div class="updataxq" style="right:-62px;">上传完成</div>
+                        <div class="updataxq" style="right: -62px">
+                          上传完成
+                        </div>
                       </div>
                       <div class="upjd">
                         <span style="margin: auto 5px">100%</span>
                       </div>
                     </div>
                   </div>
+                  <a :href="item" style="margin-left: 5px">下载</a>
                 </div>
               </div>
             </div>
@@ -262,134 +284,140 @@ export default defineComponent({
     },
   },
   setup(props, { emit }) {
-    console.log(props);
+    console.log("props", props);
     const state = reactive({
       imgList: [],
       options2222: [
         {
-          title: '领导力',
+          title: "领导力",
-          value: '100',
+          value: "100",
-          selectable:false,
+          selectable: false,
           children: [
             {
-              title: '领导业务',
+              title: "领导业务",
-              value: '1001',
+              value: "1001",
             },
             {
-              title: '领导团队',
+              title: "领导团队",
-              value: '1002',
+              value: "1002",
             },
             {
-              title: '领导自我',
+              title: "领导自我",
-              value: '1003',
+              value: "1003",
             },
           ],
         },
         {
-          title: '专业力',
+          title: "专业力",
-          value: '200',
+          value: "200",
-          selectable:false,
+          selectable: false,
           children: [
             {
-              title: '研发',
+              title: "研发",
-              value: '2001',
+              value: "2001",
             },
             {
-              title: '产品和解决方案',
+              title: "产品和解决方案",
-              value: '2002',
+              value: "2002",
             },
             {
-              title: '生产技术与制造',
+              title: "生产技术与制造",
-              value: '2003',
+              value: "2003",
             },
             {
-              title: '供应链',
+              title: "供应链",
-              value: '2004',
+              value: "2004",
             },
             {
-              title: '营销',
+              title: "营销",
-              value: '2005',
+              value: "2005",
             },
             {
-              title: '品质',
+              title: "品质",
-              value: '2006',
+              value: "2006",
             },
             {
-              title: '战略与企划',
+              title: "战略与企划",
-              value: '2007',
+              value: "2007",
             },
             {
-              title: '流程管理',
+              title: "流程管理",
-              value: '2008',
+              value: "2008",
             },
             {
-              title: '业绩管理',
+              title: "业绩管理",
-              value: '2009',
+              value: "2009",
             },
             {
-              title: '项目管理',
+              title: "项目管理",
-              value: '20010',
+              value: "20010",
             },
             {
-              title: '信息技术',
+              title: "信息技术",
-              value: '20011',
+              value: "20011",
             },
             {
-              title: '环境与安全',
+              title: "环境与安全",
-              value: '20012',
+              value: "20012",
             },
             {
-              title: '人力资源',
+              title: "人力资源",
-              value: '20013',
+              value: "20013",
             },
             {
-              title: '企业文化',
+              title: "企业文化",
-              value: '20014',
+              value: "20014",
             },
             {
-              title: '品牌',
+              title: "品牌",
-              value: '20015',
+              value: "20015",
             },
             {
-              title: '财务',
+              title: "财务",
-              value: '20016',
+              value: "20016",
             },
             {
-              title: '法务',
+              title: "法务",
-              value: '20017',
+              value: "20017",
             },
             {
-              title: '行政',
+              title: "行政",
-              value: '20018',
+              value: "20018",
             },
             {
-              title: '医工',
+              title: "医工",
-              value: '20019',
+              value: "20019",
-            }
+            },
           ],
         },
         {
-          title: '通用力',
+          title: "通用力",
-          value: '300',
+          value: "300",
-          selectable:false,
+          selectable: false,
           children: [
             {
-              title: '职业操守与道德',
+              title: "职业操守与道德",
-              value: '3001',
+              value: "3001",
             },
             {
-              title: '职业素养与技能',
+              title: "职业素养与技能",
-              value: '3002',
+              value: "3002",
             },
             {
-              title: '规章制度',
+              title: "规章制度",
-              value: '3003',
+              value: "3003",
             },
           ],
-        }
+        },
-      ]
+      ],
+      ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
+      ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
     });
 
+    // item.slice(
+    //                             item.lastIndexOf("/") + 1,
+    //                             item.indexOf("-")
+    //                           ) + item.slice(item.lastIndexOf("."))
     const filterTxt = (txt) => {
       if (txt) {
         return txt;
@@ -400,8 +428,8 @@ export default defineComponent({
     const filterClassTxt = (txt) => {
       let str = "-";
       if (txt) {
-        for(let i =0; i<options2.value.length;i++){
+        for (let i = 0; i < options2.value.length; i++) {
-          for(let j=0;j<options2.value[i].children.length;j++){
+          for (let j = 0; j < options2.value[i].children.length; j++) {
             if (String(options2.value[i].children[j].value) === String(txt)) {
               str = options2.value[i].children[j].title;
             }

src/views/projectcenter/LibraryAdd.vue

@@ -538,24 +538,6 @@
                       }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{
-                        projectInfo.remark
-                      }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
@@ -568,14 +550,32 @@
                       <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.boeFlag"
+                      <a-radio v-model:checked="projectInfo.boeFlag"  :disabled="true"
                         ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{
+                          projectInfo.remark
+                        }}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
             </a-tab-pane>

src/views/projectcenter/TaskPage.vue

@@ -1146,29 +1146,13 @@
                       <span style="color: #999999">{{ sourceBelong }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{ remark }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty" :disabled="true"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
                         ><ProjectLevel
                           v-model:value="level"
-                          :disabled="true"
+                          :tag="true"
                         ></ProjectLevel
                       ></span>
                     </div>
@@ -1179,11 +1163,21 @@
                       <span style="color: #999999"
                         ><TrainClass
                           v-model:value="systemId"
-                          :disabled="true"
+                          :tag="true"
                         ></TrainClass
                       ></span>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="checkedSty" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
@@ -1192,6 +1186,12 @@
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ remark }}</span>
+                    </div>
+                  </div>
                   <div class="set_content" v-if="isPass">
                     <div class="setc_name"><span>审核意见：</span></div>
                     <div class="setc_main">

src/views/projectcenter/templateAdd.vue

@@ -31,18 +31,6 @@
             />
           </div>
         </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
-          </div>
-        </div>
         <div class="name" style="align-items: flex-start">
           <div class="namebox" style="margin-top: 10px">
             <img
@@ -132,37 +120,6 @@
             ></OrgClass>
           </div>
         </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">模板说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="projectInfo.remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
-            >
-          </div>
-        </div>
         <div class="name">
           <div class="namebox">
             <img
@@ -202,6 +159,39 @@
             </a-radio-group>
           </div>
         </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
+            >
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">模板说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+            />
+          </div>
+        </div>
       </div>
     </div>
     <div class="footer">
@@ -220,7 +210,7 @@ import { ref, onMounted, watch } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import * as api from "../../api/indexTemplate";
-import ProjectClass from "@/components/project/ProjectClass";
+// import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -231,7 +221,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-
+const courseSyncFlag = ref(false);
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -255,6 +245,7 @@ const getDetail = () =>
       projectInfo.value.beginTime,
       projectInfo.value.endTime,
     ];
+    projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag;
   });
 
 const backPage = () => {
@@ -290,6 +281,7 @@ const createProject = () => {
       return;
     }
   }
+  projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
   api
     .templateEdit({
       ...projectInfo.value,
@@ -311,6 +303,7 @@ function managerChange(e, l, d, t) {
 .active {
   border: 2px solid rgba(78, 166, 255, 1);
 }
+
 .projectAdd {
   width: 100%;
   // height: inherit;