Merge branch 'master' of http://gcls-git.helxsoft.cn/GCLS/eep_page

src/views/book/courseware/create/components/question/dialogue_article/Article.vue

@@ -624,7 +624,7 @@ export default {
           }
         } else {
           obj.roleIndex = this.curRole;
-          obj.para = content;
+          obj.para = item;
           obj.type = 'text';
           this.$set(obj, 'segList', []);
         }

src/views/personal_workbench/project/ProductionResourceManage.vue

@@ -9,12 +9,12 @@
       <div class="textbook-chapter">
         <div class="textbook-chapter__header">
           <div class="search-left">
+            <label class="label-btn" :class="[search_scope === 1 ? 'active' : '']" @click="changeScope(1)">
+              全局
+            </label>
             <label class="label-btn" :class="[search_scope === 0 ? 'active' : '']" @click="changeScope(0)">
               当前节点
             </label>
-            <label class="label-btn" :class="[search_scope === 1 ? 'active' : '']" @click="changeScope(1)">
-              本节点以及所有子节点
-            </label>
           </div>
           <div class="courseware">
             <div class="operator flex">
@@ -351,7 +351,7 @@ export default {
         },
       ], // 类型分类
       type_index: 0, // 类型索引
-      search_scope: 0, // 搜索范围
+      search_scope: 1, // 搜索范围
       sort_list: [
         {
           value: 'name',