Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

package.json

@@ -17,6 +17,7 @@
     "moment": "^2.29.1",
     "qs": "^6.9.4",
     "sass-resources-loader": "^2.1.1",
+    "video.js": "^7.14.3",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
     "vue-wechat-title": "^2.0.7",

src/api/xsjsdb.js

 /*
  * @Author: your name
  * @Date: 2021-09-01 10:46:56
- * @LastEditTime: 2021-09-11 13:33:49
+ * @LastEditTime: 2021-09-11 17:56:48
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\api\bkwpxx.js

src/components/form.vue

@@ -70,7 +70,11 @@
                       :disabled="item.disabled"
                       :class="item.input"
                     >
-                    <template slot="append"><span @click="ajTq(formLabelAlign[item.id])">提取</span></template>
+                      <template slot="append"
+                        ><span @click="ajTq(formLabelAlign[item.id])"
+                          >提取</span
+                        ></template
+                      >
                     </el-input>
                   </div>
                   <div
@@ -184,7 +188,7 @@
                       :disabled="item.disabled"
                     >
                       <el-option
-                        v-for="(item2,itemIndex) in item.codeOptions"
+                        v-for="(item2, itemIndex) in item.codeOptions"
                         :key="itemIndex"
                         :label="item2.label"
                         :value="item2.value"
@@ -1258,12 +1262,22 @@ export default {
                       } else {
                         if(item.id == 'jsrXm'){
                          let arr = item.codeOptions.filter(items=> self.formLabelAlign[item.id] == items.value)
-                         debugger
                          for(var index in arr[0] ){
-                           params.append(
+                           debugger
+                           if(index == 'label'){
+                             params.append(
+                          itemData.objStr + "." + jsrXm,
+                          arr[0][index])
+                           }else if(index == 'value'){
+                             params.append(
+                          itemData.objStr + "." + jsrZjhm,
+                          arr[0][index])
+                           }else{
+                            params.append(
                           itemData.objStr + "." + index,
-                          arr[0][index]
-                        );
+                          arr[0][index])
+                           }
+                           
                          }
                         }else{
                           params.append(

src/main.js

 /*
  * @Author: your name
  * @Date: 2021-08-30 10:08:52
- * @LastEditTime: 2021-08-30 11:01:16
- * @LastEditors: your name
+ * @LastEditTime: 2021-09-11 17:05:37
+ * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\main.js
  */
@@ -41,7 +41,9 @@ Vue.prototype.$rules = rules;
 Vue.prototype.$moment = moment;
 import Nsloading from "./components/Loading.vue";
 Vue.prototype.$store = store;
-
+import Video from 'video.js'
+import 'video.js/dist/video-js.css'
+Vue.prototype.$video = Video;
 const LoadingCons = Vue.extend(Nsloading);
 // 常用工具函数
 Vue.prototype.$util = Util;

src/utils/http.js

@@ -307,7 +307,6 @@ export function postJson(url, data) {
       resolve(response);
     });
   }).catch(err => {
-    debugger
     reject(err.data);
   });
 }