Merge branch 'dev-coop-phase2-0808' into release

package-lock.json

@@ -7945,6 +7945,11 @@
         "is-plain-obj": "^1.0.0"
       }
     },
+    "sortablejs": {
+      "version": "1.10.0-rc3",
+      "resolved": "http://192.168.110.93:4873/sortablejs/-/sortablejs-1.10.0-rc3.tgz",
+      "integrity": "sha1-L+Y0Y6OLXNEuyRT8PgNYMEhJb0I="
+    },
     "source-list-map": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",

package.json

@@ -28,6 +28,7 @@
     "node-sass": "^4.9.2",
     "qrcode": "^1.3.3",
     "showdown": "^1.6.4",
+    "sortablejs": "^1.10.0-rc3",
     "vue": "^2.1.0",
     "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^2.1.1",

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'A97A609C1A98467C9372ACF55DD3BA35';
+      config.headers['token'] = 'D2E29BE9FF794703A482518A04D344E2';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/operation.js

@@ -572,3 +572,10 @@ export function getAvgTime(data) {
   }
   return list;
 }
+export function getComponent(data) {
+  let list = [];
+  for(let i=0;i<data.length;i++) {
+    list.push(data[i].value);
+  }
+  return list;
+}
\ No newline at end of file

src/views/education/create-component.vue

@@ -1094,7 +1094,9 @@ export default {
             vm.$nextTick(() => {
                 for(let i=0;i<vm.componentList.moduleModelList.length;i++) {
                     if(!vm.componentList.moduleModelList[i].name) {
-                        return
+                        if(flag == 2) {
+                            return
+                        }
                     }
                 }
               console.log(vm.componentList.moduleModelList)

src/views/system/item-role.vue

@@ -109,12 +109,22 @@
         ></el-pagination>
       </div>
       <el-dialog title :visible.sync="dialog.show" width="30%" center>
-        <p v-if="numL3 > 1" class="dialog-p">
+        <!-- <p v-if="numL3 > 1" class="dialog-p">
           确认将{{ dialog.role }}
           <span class="user-name">"{{ dialog.name }}"</span>
           {{ dialog.option }}吗?"
         </p>
-        <p v-else >该用户为此机构仅有的次级负责人，确认需要降级吗？</p>
+        <p v-else >该用户为此机构仅有的次级负责人，确认需要降级吗？</p> -->
+
+        <p v-if="numL3 <= 1 && scopeRow.projeceRole == 'L3'" class="dialog-p">
+          该用户为此机构仅有的次级负责人，确认需要降级吗？
+        </p>
+        <p v-else>
+          确认将{{ dialog.role }}
+          <span class="user-name">"{{ dialog.name }}"</span>
+          {{ dialog.option }}吗?"
+        </p>
+
         <span slot="footer" class="dialog-footer">
           <el-button type="default" size="small" @click="dialog.show = false">取消</el-button>
           <el-button type="primary" size="small" @click="changeRole()">确定</el-button>