Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eam into dev

src/store/modules/user.js

@@ -17,6 +17,9 @@ const formatRouter = (list) => {
         p.children = [];
         authorities.push(p);
       } else {
+        if (p.source === 2 && p.extend) {
+          p.path = p.path + '/' + p.extend;
+        }
         if (p.children?.length) {
           p.children = fn(p.children);
         } else {
@@ -122,8 +125,8 @@ export default {
       if (!list.length) {
         return {};
       }
-
       const { menuList, authorities } = formatRouter(list[0].children);
+      console.log('menuList', menuList);
 
       // 用户权限
       // const authorities =
@@ -144,6 +147,7 @@ export default {
             parentIdField: 'parentId'
           })
       );
+      console.log(menus, 'mens')
       // 用户路由按钮
       const { menus: authoritiesRouter } = formatMenus(
         USER_MENUS ??

src/views/ledgerAssets/components/equipmentTag.vue

@@ -9,7 +9,7 @@
           size="medium"
           border
           style="edit"
-          :label-style="labelStyle"
+          :label-style="labelStyle"W
      
           class="descriptions"
         >
@@ -136,6 +136,17 @@
             </el-form-item>
           </el-descriptions-item>
 
+          <el-descriptions-item>
+            <template slot="label">  烧结设备</template>
+            <el-form-item label-width="0">
+              <el-radio v-model="tagInfo.equipmentLabelJson[0].SJSB" label="1"
+                >是</el-radio
+              >
+              <el-radio v-model="tagInfo.equipmentLabelJson[0].SJSB" label="2"
+                >否</el-radio
+              >
+            </el-form-item>
+          </el-descriptions-item>
         </el-descriptions>
       </div>
     </el-form>

src/views/ledgerAssets/equipment/edit.vue

@@ -24,7 +24,9 @@
       >
         <div class="content">
           <basicInfoVue ref="basicInfoVueRef" />
+          <!-- 设备标签 -->
           <equipmentTag :form="form" ref="equipmentTagRef" />
+          
           <businessInformation ref="businessInformationRef" :form="form" />
           <assetInformation ref="assetInformationRef" :form="form" />
           <!-- <warehouseConfigVue ref="warehouseConfigRef" class="ims" /> -->

src/views/reportForms/sourceLink/index.vue

@@ -0,0 +1,44 @@
+<template>
+    <div class="ele-body">
+        <jimureportBrowse :url="fileUrl"></jimureportBrowse>
+    </div>
+  </template>
+  
+  <script>
+  import jimureportBrowse from '@/components/jimureport/browse.vue';
+  import { getServiceurl } from '@/components/jimureport/api.js';
+  import { getToken } from '@/utils/token-util';
+  export default {
+    components: {
+        jimureportBrowse
+    },
+  
+    data() {
+      return {
+        fileUrl: ''
+      };
+    },
+    computed: {},
+    watch: {
+      '$route'(to, from) {
+        if (to.path) {
+          this.getJmPrintBrowse();  // 重新加载数据
+        }
+      }
+    },
+    created() {
+        this.getJmPrintBrowse()
+    },
+    methods: {
+       async getJmPrintBrowse(){
+        let id = this.$route.path.split('/').pop()
+        let url = await getServiceurl();
+        this.fileUrl = `${url}/jmreport/view/${id}?token=${getToken()}`;
+       }
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+
+  </style>
+  

src/views/sparePartsApply/components/AssetsDialog.vue

@@ -512,7 +512,7 @@
         // }
 
         this.selectionList = this.selectionList.filter((item) => {
-          if (item.warehouseList.length > 0) {
+          if (item.warehouseList?.length > 0) {
             item['warehouseId'] = item.warehouseList[0].warehouse_id;
             item['warehouseName'] = item.warehouseList[0].warehouse_name;
           }

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐
-        target: 'http://192.168.1.116:18086', //本
+        target: 'http://192.168.1.125:18086', //本
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''