Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/main.js

@@ -22,8 +22,8 @@ import "quill/dist/quill.bubble.css";
 import { ColorPicker } from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
 Vue.use(ColorPicker);
-// import { VueJsonp } from "vue-jsonp";
-// Vue.use(VueJsonp);
+import { VueJsonp } from "vue-jsonp";
+Vue.use(VueJsonp);
 // 公共样式
 import "@/assets/css/common.css";
 Vue.use(VueQuillEditor);

base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue

@@ -306,7 +306,6 @@
 import { modelList, siteSave } from "@/services/basicsetFun";
 import YCheckbox from "@/components/ycheckbox/YCheckbox.vue";
 import YSwitch from "@/components/yswitch/YSwitch.vue";
-import axios from "axios";
 // import options from "@/utils/city";
 import { regionData } from "element-china-area-data";
 export default {
@@ -725,16 +724,15 @@ export default {
     getAddress(address) {
       this.$refs.ruleForm.validateField("detailAddress", (errVal) => {
         if (errVal !== "中心详细地址不能为空") {
-          axios
-            .get("https://restapi.amap.com/v3/geocode/geo", {
-              params: {
+          this.$jsonp(`https://restapi.amap.com/v3/geocode/geo`, {
+            //官方接口
+            output: "jsonp",
             key: "21e7ac78b448640e516f1eddc3ffd720", //key
             address: address, //获取输入的位置
-              },
           })
             .then((res) => {
-              if (res.data.status == 1) {
-                let { location } = res.data.geocodes[0];
+              if (res.status == 1) {
+                let { location } = res.geocodes[0];
                 [
                   this.formInfo.longitude,
                   this.formInfo.latitude,
@@ -744,7 +742,7 @@ export default {
               }
             })
             .catch((err) => {
-              this.$message.error(err);
+              console.log(err);
             });
         }
       });

base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue

@@ -449,7 +449,7 @@ export default {
         idCard: "", // 身份证
         userpost: "", // 职务
         posttitle: "", // 职称
-        politicalstatus: undefined, // 政治面貌
+        politicalstatus: 4, // 政治面貌
         dangyuan: undefined, // 称号
         dangyuanext: "", // 自定义称号
         phone: "", // 电话

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/components/FormDetails.vue

@@ -93,6 +93,12 @@
                   :key="index"
                   :src="baseUrl + item"
                 ></video>
+                <audio
+                  controls
+                  v-if="/\.(mp3|wav|)$/.test(item)"
+                  :key="index"
+                  :src="baseUrl + item"
+                ></audio>
                 <a-button
                   :href="baseUrl + item"
                   v-else
@@ -292,7 +298,7 @@ export default {
   data() {
     return {
       fromData: {},
-      baseUrl: process.env.VUE_APP_API_BASE_URL + "/zwfw_api/",
+      baseUrl: process.env.VUE_APP_API_PHP_URL,
     };
   },
   computed: {