Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/ability/bsabilityservice-add-or-update.vue

@@ -271,8 +271,7 @@
               v-if="
                 item.attrType != '应用领域' &&
                 item.attrType != '应用类型' &&
-                item.attrType != '发布端' &&
+                item.attrType != '发布端'
-                item.attrType != '应用状态'
               "
             ></el-input>
             <el-select
@@ -368,30 +367,30 @@
 </template>
 
 <script>
-import debounce from "lodash/debounce";
+import debounce from 'lodash/debounce'
-import dictionaries from "@/utils/dictionaries";
+import dictionaries from '@/utils/dictionaries'
-import { mapState } from "vuex";
+import { mapState } from 'vuex'
-import { getIconList } from "@/utils";
+import { getIconList } from '@/utils'
-import Cookies from "js-cookie";
+import Cookies from 'js-cookie'
-import upload from "./upload.vue";
+import upload from './upload.vue'
-import bus from "@/views/bus.js";
+import bus from '@/views/bus.js'
-import qs from "qs";
+import qs from 'qs'
-import Vue from "vue";
+import Vue from 'vue'
 export default {
   components: {
-    upload,
+    upload
   },
-  data() {
+  data () {
     return {
       checkList: [],
       dialogVisibleImg: false,
-      previewImg: "", // 预览图片
+      previewImg: '', // 预览图片
       dialogVisible: false,
-      fileUploadUrl: window.SITE_CONFIG.apiURL + "/upload",
+      fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload',
       uploadUrl:
         window.SITE_CONFIG.apiURL +
-        "/sys/oss/upload?token=" +
+        '/sys/oss/upload?token=' +
-        Cookies.get("ucsToken"),
+        Cookies.get('ucsToken'),
       companyArr: dictionaries.companyArr,
       visible: false,
       sceneArr: dictionaries.sceneArr,
@@ -403,602 +402,602 @@ export default {
       menuListVisible: false,
       UpdateState: false,
       dataForm: {
-        id: "",
+        id: '',
-        deptId: "",
+        deptId: '',
-        deptContacts: "",
+        deptContacts: '',
-        deptPhone: "",
+        deptPhone: '',
-        dataVolume: "",
+        dataVolume: '',
-        shareCondition: "",
+        shareCondition: '',
-        shareType: "",
+        shareType: '',
-        shareMode: "",
+        shareMode: '',
         delFlag: 0,
-        description: "",
+        description: '',
         downloads: 0,
-        image: "",
+        image: '',
         showList: [],
         infoList: [],
-        link: "",
+        link: '',
-        name: "",
+        name: '',
-        note1: "",
+        note1: '',
-        note2: "",
+        note2: '',
-        note3: "",
+        note3: '',
-        note4: "",
+        note4: '',
-        note5: "",
+        note5: '',
-        score: "",
+        score: '',
-        type: "应用资源",
+        type: '应用资源',
-        apiMethodType: "",
+        apiMethodType: '',
-        apiUrl: "",
+        apiUrl: '',
-        visits: 0,
+        visits: 0
       },
-      deptId: "",
+      deptId: '',
-      fangwendizhi: "",
+      fangwendizhi: '',
-      mingzi: "",
+      mingzi: '',
       dataFormUpdate: {},
       dataFormShowDetails: {},
       infoList2: [],
       infoList3: [],
       typeOptions: [
-        { value: "有条件共享", label: "有条件共享" },
+        { value: '有条件共享', label: '有条件共享' },
-        { value: "无条件共享", label: "无条件共享" },
+        { value: '无条件共享', label: '无条件共享' }
       ],
       conditionOptions: [
-        { value: "申请", label: "申请" },
+        { value: '申请', label: '申请' },
-        { value: "免批申请", label: "免批申请" },
+        { value: '免批申请', label: '免批申请' }
       ],
 
       rules: {
         name: [
           {
             required: true,
-            message: "请输入应用名称",
+            message: '请输入应用名称',
-            trigger: "change",
+            trigger: 'change'
-          },
+          }
         ],
         description: [
           {
             required: true,
-            message: "请输入应用描述",
+            message: '请输入应用描述',
-            trigger: "change",
+            trigger: 'change'
-          },
+          }
         ],
         deptContacts: [
           {
             required: true,
-            message: "请输入部门联系人",
+            message: '请输入部门联系人',
-            trigger: "change",
+            trigger: 'change'
-          },
+          }
         ],
         deptPhone: [
           {
             required: true,
-            message: "请输入部门联系人电话",
+            message: '请输入部门联系人电话',
-            trigger: "change",
+            trigger: 'change'
-          },
+          }
         ],
         shareCondition: [
           {
             required: true,
-            message: "请选择共享条件",
+            message: '请选择共享条件',
-            trigger: "change",
+            trigger: 'change'
-          },
+          }
         ],
         shareType: [
           {
             required: true,
-            message: "请选择请输入共享类型",
+            message: '请选择请输入共享类型',
-            trigger: "change",
+            trigger: 'change'
-          },
+          }
         ],
         shareMode: [
           {
             required: true,
-            message: "请输入共享方式",
+            message: '请输入共享方式',
-            trigger: "change",
+            trigger: 'change'
-          },
+          }
-        ],
+        ]
-      },
+      }
-    };
+    }
   },
   props: {
     disabled: {
       type: Boolean,
-      default: false,
+      default: false
-    },
+    }
   },
   computed: {
-    ...mapState(["catalogueTree"]),
+    ...mapState(['catalogueTree']),
-    ...mapState(["departmentSelects"]),
+    ...mapState(['departmentSelects']),
-    dataRule() {
+    dataRule () {
       return {
         name: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         version: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         visitUrl: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         type: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         shareType: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         shareForm: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         field: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         scene: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         deptId: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         content: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         rank: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         useInfo: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         remarks: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
         ],
         isUp: [
           {
             required: true,
-            message: this.$t("validate.required"),
+            message: this.$t('validate.required'),
-            trigger: "blur",
+            trigger: 'blur'
-          },
+          }
-        ],
+        ]
-      };
+      }
-    },
+    }
   },
   methods: {
     // 上传图片
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       if (res.code !== 0) {
-        return this.$message.error("上传图片失败");
+        return this.$message.error('上传图片失败')
       }
-      debugger;
+      debugger
       this.dataForm.infoList.map((item, index) => {
-        if (item.attrType == "应用图片") {
+        if (item.attrType == '应用图片') {
           if (!this.dataForm.infoList[index].attrValue) {
-            this.dataForm.infoList[index].attrValue = res.data;
+            this.dataForm.infoList[index].attrValue = res.data
           } else {
-            this.dataForm.infoList[index].attrValue += ";" + res.data;
+            this.dataForm.infoList[index].attrValue += ';' + res.data
           }
-          console.log("上传图片", this.dataForm.infoList[index]);
+          console.log('上传图片', this.dataForm.infoList[index])
         }
-      });
+      })
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    handleAvatarSuccessone(res, file) {
+    handleAvatarSuccessone (res, file) {
       if (res.code !== 0) {
-        return this.$message.error("上传图片失败");
+        return this.$message.error('上传图片失败')
       }
-      debugger;
+      debugger
       this.dataForm.infoList.map((item, index) => {
-        if (item.attrType == "子系统一图片") {
+        if (item.attrType == '子系统一图片') {
           if (!this.dataForm.infoList[index].attrValue) {
-            this.dataForm.infoList[index].attrValue = res.data;
+            this.dataForm.infoList[index].attrValue = res.data
           } else {
-            this.dataForm.infoList[index].attrValue = "";
+            this.dataForm.infoList[index].attrValue = ''
-            this.dataForm.infoList[index].attrValue = res.data;
+            this.dataForm.infoList[index].attrValue = res.data
           }
-          console.log("上传图片", this.dataForm.infoList[index]);
+          console.log('上传图片', this.dataForm.infoList[index])
         }
-      });
+      })
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    handleAvatarSuccesstwo(res, file) {
+    handleAvatarSuccesstwo (res, file) {
       if (res.code !== 0) {
-        return this.$message.error("上传图片失败");
+        return this.$message.error('上传图片失败')
       }
-      debugger;
+      debugger
       this.dataForm.infoList.map((item, index) => {
-        if (item.attrType == "子系统二图片") {
+        if (item.attrType == '子系统二图片') {
           if (!this.dataForm.infoList[index].attrValue) {
-            this.dataForm.infoList[index].attrValue = res.data;
+            this.dataForm.infoList[index].attrValue = res.data
           } else {
-            this.dataForm.infoList[index].attrValue = "";
+            this.dataForm.infoList[index].attrValue = ''
-            this.dataForm.infoList[index].attrValue = res.data;
+            this.dataForm.infoList[index].attrValue = res.data
           }
-          console.log("上传图片", this.dataForm.infoList[index]);
+          console.log('上传图片', this.dataForm.infoList[index])
         }
-      });
+      })
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    handleAvatarSuccessthree(res, file) {
+    handleAvatarSuccessthree (res, file) {
       if (res.code !== 0) {
-        return this.$message.error("上传图片失败");
+        return this.$message.error('上传图片失败')
       }
-      debugger;
+      debugger
       this.dataForm.infoList.map((item, index) => {
-        if (item.attrType == "子系统三图片") {
+        if (item.attrType == '子系统三图片') {
           if (!this.dataForm.infoList[index].attrValue) {
-            this.dataForm.infoList[index].attrValue = res.data;
+            this.dataForm.infoList[index].attrValue = res.data
           } else {
-            this.dataForm.infoList[index].attrValue = "";
+            this.dataForm.infoList[index].attrValue = ''
-            this.dataForm.infoList[index].attrValue = res.data;
+            this.dataForm.infoList[index].attrValue = res.data
           }
-          console.log("上传图片", this.dataForm.infoList[index]);
+          console.log('上传图片', this.dataForm.infoList[index])
         }
-      });
+      })
       // this.imageUrl = URL.createObjectURL(file.raw);
     },
-    beforeAvatarUpload(file) {
+    beforeAvatarUpload (file) {
       const isImage =
-        file.type === "image/jpeg" ||
+        file.type === 'image/jpeg' ||
-        file.type === "image/jpg" ||
+        file.type === 'image/jpg' ||
-        file.type === "image/png";
+        file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 9999;
+      const isLt2M = file.size / 1024 / 1024 < 9999
 
       if (!isImage) {
-        this.$message.error("上传头像图片只能是 JPG 格式!");
+        this.$message.error('上传头像图片只能是 JPG 格式!')
       }
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error('上传头像图片大小不能超过 2MB!')
       }
-      return isImage && isLt2M;
+      return isImage && isLt2M
     },
-    addUploadRemoveFile(file, fileList) {
+    addUploadRemoveFile (file, fileList) {
-      this.$refs.addUpload.clearFiles();
+      this.$refs.addUpload.clearFiles()
-      this.addDataFrom.imageUrl = "";
+      this.addDataFrom.imageUrl = ''
     },
-    showView(file) {
+    showView (file) {
-      this.previewImg = file.url;
+      this.previewImg = file.url
-      this.dialogVisibleImg = true;
+      this.dialogVisibleImg = true
     },
     // 获取当前管理员信息
-    getUserInfo() {
+    getUserInfo () {
-      this.$http.get("/sys/user/info").then(({ data: res }) => {
+      this.$http.get('/sys/user/info').then(({ data: res }) => {
-        this.dataForm.deptId = res.data.deptId;
+        this.dataForm.deptId = res.data.deptId
-        this.deptId = res.data.deptId;
+        this.deptId = res.data.deptId
-        console.log("depid", this.dataForm);
+        console.log('depid', this.dataForm)
-      });
+      })
     },
-    guanbi() {
+    guanbi () {
       this.dataForm = {
-        id: "",
+        id: '',
-        deptId: "",
+        deptId: '',
-        deptContacts: "",
+        deptContacts: '',
-        deptPhone: "",
+        deptPhone: '',
-        dataVolume: "",
+        dataVolume: '',
-        shareCondition: "",
+        shareCondition: '',
-        shareType: "",
+        shareType: '',
-        shareMode: "",
+        shareMode: '',
         delFlag: 0,
-        description: "",
+        description: '',
         downloads: 0,
-        image: "",
+        image: '',
         showList: [],
         infoList: [],
-        link: "",
+        link: '',
-        name: "",
+        name: '',
-        note1: "",
+        note1: '',
-        note2: "",
+        note2: '',
-        note3: "",
+        note3: '',
-        note4: "",
+        note4: '',
-        note5: "",
+        note5: '',
-        score: "",
+        score: '',
-        type: "应用资源",
+        type: '应用资源',
-        apiMethodType: "",
+        apiMethodType: '',
-        apiUrl: "",
+        apiUrl: '',
-        visits: 0,
+        visits: 0
-      };
+      }
     },
-    handleRemove(file, fileList) {
+    handleRemove (file, fileList) {
-      console.log(file, fileList);
+      console.log(file, fileList)
     },
-    handlePictureCardPreview(file) {
+    handlePictureCardPreview (file) {
-      this.dialogImageUrl = file.url;
+      this.dialogImageUrl = file.url
-      this.dialogVisible = true;
+      this.dialogVisible = true
     },
     // 上传图片之前
-    uploadBeforeUploadHandle(file) {
+    uploadBeforeUploadHandle (file) {
       if (
-        file.type !== "image/jpg" &&
+        file.type !== 'image/jpg' &&
-        file.type !== "image/jpeg" &&
+        file.type !== 'image/jpeg' &&
-        file.type !== "image/png" &&
+        file.type !== 'image/png' &&
-        file.type !== "image/gif"
+        file.type !== 'image/gif'
       ) {
-        this.$message.error("只支持jpg、png、gif格式的图片！");
+        this.$message.error('只支持jpg、png、gif格式的图片！')
-        return false;
+        return false
       }
     },
-    imgUploadSuccess(res, file, fileList) {
+    imgUploadSuccess (res, file, fileList) {
-      console.log("zzzzzzz", res, file, fileList);
+      console.log('zzzzzzz', res, file, fileList)
 
       if (res.code !== 0) {
-        return this.$message.error(res.msg);
+        return this.$message.error(res.msg)
       }
     },
-    init() {
+    init () {
-      this.getInfoList();
+      this.getInfoList()
-      this.visible = true;
+      this.visible = true
       this.$nextTick(() => {
-        this.$refs.dataForm && this.$refs.dataForm.resetFields();
+        this.$refs.dataForm && this.$refs.dataForm.resetFields()
-        this.iconList = getIconList();
+        this.iconList = getIconList()
         if (this.dataForm.id) {
-          this.getInfo();
+          this.getInfo()
         }
-      });
+      })
     },
     // 获取属性信息
-    getInfoList() {
+    getInfoList () {
       const parms = {
-        topCategoryName: "应用资源",
+        topCategoryName: '应用资源'
-      };
+      }
-      this.infoList2 = [];
+      this.infoList2 = []
       this.$http
-        .get("/category/getAllFiledByTopCategory" + "?" + qs.stringify(parms))
+        .get('/category/getAllFiledByTopCategory' + '?' + qs.stringify(parms))
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
           res.data.map((item, index) => {
             if (
-              item.name.search("应用名称") == -1 &&
+              item.name.search('应用名称') == -1 &&
-              item.name.search("地址") == -1 &&
+              item.name.search('地址') == -1 &&
               // item.name.search("描述") == -1 &&
-              item.name !== "组件描述" &&
+              item.name !== '组件描述' &&
-              item.name !== "组件名称" &&
+              item.name !== '组件名称' &&
-              item.name !== "服务接口" &&
+              item.name !== '服务接口' &&
-              item.name !== "共享类型" &&
+              item.name !== '共享类型' &&
-              item.name !== "共享条件" &&
+              item.name !== '共享条件' &&
-              item.name !== "共享方式" &&
+              item.name !== '共享方式' &&
-              item.name !== "部门联系人电话" &&
+              item.name !== '部门联系人电话' &&
-              item.name !== "部门统一社会代码" &&
+              item.name !== '部门统一社会代码' &&
-              item.name !== "部门联系人" &&
+              item.name !== '部门联系人' &&
-              item.name !== "服务商统一社会信用代码" &&
+              item.name !== '服务商统一社会信用代码' &&
-              item.name !== "服务接口请求方式" &&
+              item.name !== '服务接口请求方式' &&
-              item.name !== "部门名称"
+              item.name !== '部门名称'
             ) {
               const duixiang = {
                 attrType: item.name,
-                attrValue: "",
+                attrValue: '',
-                delFlag: 0,
+                delFlag: 0
-              };
+              }
-              this.infoList2.push(item);
+              this.infoList2.push(item)
-              if (item.isLinkToDic != "false") {
+              if (item.isLinkToDic != 'false') {
                 const xinxi = {
                   page: 1,
                   limit: 99,
                   dictTypeId: item.linkValue,
-                  dictLabel: "",
+                  dictLabel: '',
-                  dictValue: "",
+                  dictValue: ''
-                };
+                }
                 this.$http
-                  .get("/sys/dict/data/page" + "?" + qs.stringify(xinxi))
+                  .get('/sys/dict/data/page' + '?' + qs.stringify(xinxi))
                   .then(({ data: res2 }) => {
                     // this.infoList2[index - 1].children = res2.data.list
                     this.infoList2.map((item3, index3) => {
                       if (item3.name == item.name) {
                         Vue.set(
                           this.infoList2[index3],
-                          "children",
+                          'children',
                           res2.data.list
-                        );
+                        )
                       }
-                    });
+                    })
                     this.dataFormUpdate.infoList.map((item3, index3) => {
                       if (item3.attrType == item.name) {
                         Vue.set(
                           this.dataFormUpdate.infoList[index3],
-                          "children",
+                          'children',
                           res2.data.list
-                        );
+                        )
                       }
-                    });
-                    console.log(
-                      "11111111111111111111111111110",
-                      this.dataFormUpdate
-                    );
-                  });
-              }
-              this.dataForm.infoList.push(duixiang);
-            }
-          });
-          console.log("this.infoList", this.dataFormUpdate);
                     })
-        .catch(() => {});
+                    console.log(
+                      '11111111111111111111111111110',
+                      this.dataFormUpdate
+                    )
+                  })
+              }
+              this.dataForm.infoList.push(duixiang)
+            }
+          })
+          console.log('this.infoList', this.dataFormUpdate)
+        })
+        .catch(() => {})
       this.$http
-        .get("/sys/dict/data/page" + "?" + qs.stringify(parms))
+        .get('/sys/dict/data/page' + '?' + qs.stringify(parms))
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          console.log("this.infoList", this.dataForm);
+          console.log('this.infoList', this.dataForm)
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 图标, 选中
-    iconListCurrentChangeHandle(icon) {
+    iconListCurrentChangeHandle (icon) {
-      this.dataForm.imgurl = icon;
+      this.dataForm.imgurl = icon
-      this.iconListVisible = false;
+      this.iconListVisible = false
     },
     // 上级菜单树, 选中
-    menuListTreeCurrentChangeHandle(data) {
+    menuListTreeCurrentChangeHandle (data) {
-      this.dataForm.pid = data.id;
+      this.dataForm.pid = data.id
-      this.dataForm.type = data.name;
+      this.dataForm.type = data.name
-      this.menuListVisible = false;
+      this.menuListVisible = false
     },
     // 上级菜单树, 设置默认值
-    deptListTreeSetDefaultHandle() {
+    deptListTreeSetDefaultHandle () {
-      this.dataForm.pid = "0";
+      this.dataForm.pid = '0'
-      this.dataForm.type = "目录级别";
+      this.dataForm.type = '目录级别'
     },
     // 获取信息
-    getInfo() {
+    getInfo () {
       this.$http
-        .get("/ability/bsabilityai/" + this.dataForm.id)
+        .get('/ability/bsabilityai/' + this.dataForm.id)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
           this.dataForm = {
             ...this.dataForm,
-            ...res.data,
+            ...res.data
-          };
+          }
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 表单提交
     dataFormSubmitHandle: debounce(
       function () {
         this.$refs.dataForm.validate((valid) => {
-          this.getUserInfo();
+          this.getUserInfo()
-          this.dataForm.deptId = this.deptId;
+          this.dataForm.deptId = this.deptId
           if (!valid) {
-            this.$message.error("请检查表单是否填写完整");
+            this.$message.error('请检查表单是否填写完整')
-            return false;
+            return false
           }
-          console.log("表单数据=======================》", this.dataForm);
+          console.log('表单数据=======================》', this.dataForm)
           if (!this.UpdateState) {
-            this.dataForm.infoList = [];
+            this.dataForm.infoList = []
             this.dataForm.showListAll.forEach((val) => {
-              if (val.name !== "必填信息") {
+              if (val.name !== '必填信息') {
-                if (val.name === "服务接口信息") {
+                if (val.name === '服务接口信息') {
                   val.children.forEach((item) => {
-                    if (item.name === "服务接口") {
+                    if (item.name === '服务接口') {
-                      this.dataForm.apiUrl = item.note1;
+                      this.dataForm.apiUrl = item.note1
                     }
-                    if (item.name === "接口请求方式") {
+                    if (item.name === '接口请求方式') {
-                      this.dataForm.apiMethodType = item.note1;
+                      this.dataForm.apiMethodType = item.note1
                     }
-                    if (item.name === "访问地址") {
+                    if (item.name === '访问地址') {
-                      this.dataForm.link = item.note1;
+                      this.dataForm.link = item.note1
                     }
-                  });
+                  })
                 } else {
                   val.children.forEach((item) => {
                     this.dataForm.infoList.push({
                       attrType: item.name,
                       attrValue: item.note1,
-                      delFlag: 0,
+                      delFlag: 0
-                    });
+                    })
-                  });
+                  })
                 }
               }
-            });
+            })
             this.$http
-              .post("/resource/insert?source= b", this.dataForm)
+              .post('/resource/insert?source= b', this.dataForm)
               .then(({ data: res }) => {
                 if (res.code !== 0) {
-                  return this.$message.error(res.msg);
+                  return this.$message.error(res.msg)
                 }
                 this.$message({
-                  message: this.$t("prompt.success"),
+                  message: this.$t('prompt.success'),
-                  type: "success",
+                  type: 'success',
                   duration: 500,
                   onClose: () => {
-                    this.visible = false;
+                    this.visible = false
-                    this.$emit("refreshDataList");
+                    this.$emit('refreshDataList')
-                  },
+                  }
-                });
                 })
-              .catch(() => {});
+              })
+              .catch(() => {})
           } else {
             this.$http
-              .put("/resource/update", this.dataFormUpdate)
+              .put('/resource/update', this.dataFormUpdate)
               .then(({ data: res }) => {
                 if (res.code !== 0) {
-                  return this.$message.error(res.msg);
+                  return this.$message.error(res.msg)
                 }
                 this.$message({
-                  message: this.$t("prompt.success"),
+                  message: this.$t('prompt.success'),
-                  type: "success",
+                  type: 'success',
                   duration: 500,
                   onClose: () => {
-                    this.visible = false;
+                    this.visible = false
-                    this.$emit("refreshDataList");
+                    this.$emit('refreshDataList')
-                  },
-                });
-              })
-              .catch(() => {});
                   }
-        });
+                })
+              })
+              .catch(() => {})
+          }
+        })
       },
       1000,
       { leading: true, trailing: false }
     ),
-    showListChagne() {
+    showListChagne () {
       this.dataForm.showList = this.dataForm.showListAll.filter(
         (item) => this.checkList.indexOf(item.name) > -1
-      );
+      )
       console.log(
-        "属性变更===================>",
+        '属性变更===================>',
         this.checkList,
         this.dataForm.showList,
         this.dataForm.showListAll
-      );
+      )
+    }
   },
+  mounted () {
+    this.getUserInfo()
   },
-  mounted() {
+  beforeDestroy () {
-    this.getUserInfo();
+    console.log('销毁~~~~~~~~~~~~~~~~~~~~')
-  },
+  }
-  beforeDestroy() {
+}
-    console.log("销毁~~~~~~~~~~~~~~~~~~~~");
-  },
-};
 </script>
 
 <style lang="scss" scoped>

back/src/views/modules/ability/bsabilityservice.vue

@@ -233,7 +233,7 @@ export default {
   mixins: [mixinViewModule],
   data () {
     return {
-      required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用状态', '应用类型'],
+      required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '应用名称', '应用描述', '应用类型'],
       notFilled: [],
       mixinViewModuleOptions: {
         getDataListURL: '/resource/page',
@@ -692,9 +692,9 @@ export default {
       if (!this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用领域')[0].attrValue) {
         this.notFilled.push('应用领域')
       }
-      if (!this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0].attrValue) {
+      // if (!this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用状态')[0].attrValue) {
-        this.notFilled.push('应用状态')
+      //   this.notFilled.push('应用状态')
-      }
+      // }
       if (!this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0] || !this.submitFrom.infoList.filter(val => val.attrType == '应用类型')[0].attrValue) {
         this.notFilled.push('应用类型')
       }

front/public/static/config/mapConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-26 14:34:24
+ * @LastEditTime: 2022-08-02 18:19:32
  * @Description: 地图静态参数配置
  */
 var _mapConfig = {}
@@ -12,7 +12,7 @@ var _mapConfig = {}
 
   // // 定义底图初始化化参数
   //  请在此处更改你的配置**********************************************
-  var CONFIGKEY = 'qingdao'
+  var CONFIGKEY = 'qingdao_highgo'
   // var CONFIGKEY = 'dev';
   // 请在上面更改你的配置***********************************************
   var BASECONFIGITEM = {

front/src/App.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-26 11:27:50
+ * @LastEditTime: 2022-08-03 10:13:59
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -68,4 +68,7 @@
     position: relative;
     background-color: #fff;
   }
+  body {
+    font-size: 0.14rem;
+  }
 </style>

front/src/views/capacityOnTheShelf/Algorithm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-02 11:28:00
+ * @LastEditTime: 2022-08-03 10:40:28
  * @Description: 算法上架
 -->
 <template>
@@ -841,25 +841,25 @@
 <style lang="less" scoped>
   .box {
     position: relative;
-    top: 64px;
+    top: 0.64rem;
-    margin: 15px 400px;
+    margin: 0.15rem 4rem;
-    padding: 10px;
+    padding: 0.1rem;
     background: #fff;
     .header {
-      font-size: 28px;
+      font-size: 0.28rem;
       font-weight: 600;
     }
     .vue-box {
-      padding: 0 100px;
+      padding: 0 1rem;
     }
     .top {
-      margin: 10px 20px 0;
+      margin: 0.1rem 0.2rem 0;
-      padding: 15px 30px;
+      padding: 0.15rem 0.3rem;
       background: #edf4fc;
       display: flex;
       justify-content: space-between;
       div {
-        font-size: 18px;
+        font-size: 0.18rem;
         color: #999;
         display: flex;
         justify-content: center;
@@ -868,26 +868,26 @@
           display: flex;
           justify-content: center;
           align-items: center;
-          width: 45px;
+          width: 0.45rem;
-          height: 45px;
+          height: 0.45rem;
           border-radius: 50%;
-          border: 1px solid rgb(214, 214, 214);
+          border: 0.01rem solid rgb(214, 214, 214);
-          margin-right: 10px;
+          margin-right: 0.1rem;
           transition: all 0.3s ease;
           span {
             display: flex;
             justify-content: center;
             align-items: center;
-            width: 30px;
+            width: 0.3rem;
-            height: 30px;
+            height: 0.3rem;
             border-radius: 50%;
-            border: 1px solid #999;
+            border: 0.01rem solid #999;
           }
         }
         .line {
-          margin-left: 10px;
+          margin-left: 0.1rem;
-          width: 130px;
+          width: 1.3rem;
-          height: 1px;
+          height: 0.01rem;
           background: #999;
         }
       }
@@ -896,10 +896,10 @@
         .bg-box {
           background: #9ccefa;
           color: #fff;
-          border: 1px solid #9ccefa;
+          border: 0.01rem solid #9ccefa;
           span {
             background: #0087ff;
-            border: 1px solid #0087ff;
+            border: 0.01rem solid #0087ff;
           }
         }
         .line {
@@ -909,17 +909,18 @@
       .btn {
         display: flex;
         justify-content: space-around;
-        padding: 10px 350px 0;
+        padding: 0.1rem 3.5rem 0;
         button {
           cursor: pointer;
-          width: 80px;
+          font-size: 0.14rem;
-          height: 35px;
+          width: 0.8rem;
+          height: 0.35rem;
           text-align: center;
           color: #fff;
-          border: 1px solid #9ccefa;
+          border: 0.01rem solid #9ccefa;
           span {
             background: #0087ff;
-            border: 1px solid #0087ff;
+            border: 0.01rem solid #0087ff;
           }
         }
         .line {
@@ -940,15 +941,16 @@
     .btn {
       display: flex;
       justify-content: space-between;
-      padding: 10px 350px 0;
+      padding: 0.1rem 3.5rem 0;
       button {
         cursor: pointer;
-        width: 80px;
+        font-size: 0.14rem;
-        height: 35px;
+        width: 0.8rem;
+        height: 0.35rem;
         text-align: center;
         color: #fff;
         border: none;
-        border-radius: 6px;
+        border-radius: 0.06rem;
         background: #0087ff;
       }
       button:nth-of-type(1) {

front/src/views/capacityOnTheShelf/Application.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-13 10:22:27
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-02 11:40:41
+ * @LastEditTime: 2022-08-04 16:11:50
  * @Description: 应用上架
 -->
 <template>
@@ -299,7 +299,6 @@
     '共享条件',
     '应用名称',
     '应用描述',
-    '应用状态',
     '应用类型',
   ])
   const notFilled = ref([])
@@ -347,15 +346,15 @@
     ) {
       notFilled.value.push('应用领域')
     }
-    if (
+    // if (
-      !dataFrom.value.infoList.filter(
+    //   !dataFrom.value.infoList.filter(
-        (val) => val.attrType === '应用状态'
+    //     (val) => val.attrType === '应用状态'
-      )[0] ||
+    //   )[0] ||
-      !dataFrom.value.infoList.filter((val) => val.attrType === '应用状态')[0]
+    //   !dataFrom.value.infoList.filter((val) => val.attrType === '应用状态')[0]
-        .attrValue
+    //     .attrValue
-    ) {
+    // ) {
-      notFilled.value.push('应用状态')
+    //   notFilled.value.push('应用状态')
-    }
+    // }
     if (
       !dataFrom.value.infoList.filter(
         (val) => val.attrType === '应用类型'

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-02 11:31:43
+ * @LastEditTime: 2022-08-03 11:47:41
  * @Description: 上架
 -->
 <template>
@@ -1223,6 +1223,7 @@
 
         .submit {
           margin-top: 0.4rem;
+          font-size: 0.14rem;
           display: flex;
           justify-content: flex-end;
 

front/src/views/home/DetailsPageconetent.vue

@@ -772,7 +772,7 @@
         type: Cardsname.value,
         name: '',
         infoList: [],
-        orderField: 'total', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+        orderField: 'visits', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
         orderType: 'DESC', // ASC 升序  DESC 降序
       }
       //西海岸查询参数

front/src/views/home/components/AbilityToRecommend.vue

@@ -447,13 +447,15 @@
     height: 0.24rem;
     width: 0.24rem;
     background: url('~@/assets/home/shenqing.png') no-repeat;
-    background-size: cover;
+    background-size: contain;
     background-position: center;
   }
   .fixedmount div:nth-child(2) p:nth-child(1) {
     height: 0.24rem;
     width: 0.24rem;
     background: url('~@/assets/home/shangjia.png') no-repeat;
+    background-size: contain;
+    background-position: center;
   }
   .ability-to-recommend-bottom {
     width: 100%;

front/src/views/newHome/components/WorkDynamics.vue

@@ -560,7 +560,7 @@
     height: 0.24rem;
     width: 0.24rem;
     background: url('~@/assets/home/shenqing.png') no-repeat;
-    background-size: cover;
+    background-size: contain;
     background-position: center;
   }
 
@@ -568,5 +568,7 @@
     height: 0.24rem;
     width: 0.24rem;
     background: url('~@/assets/home/shangjia.png') no-repeat;
+    background-size: contain;
+    background-position: center;
   }
 </style>