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

package-lock.json

@@ -1666,12 +1666,15 @@
       "resolved": "https://registry.npmmirror.com/@types/parse5/-/parse5-6.0.3.tgz",
       "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g=="
     },
+<<<<<<< HEAD
+=======
     "@types/q": {
       "version": "1.5.5",
       "resolved": "https://registry.npmmirror.com/@types/q/-/q-1.5.5.tgz",
       "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
       "dev": true
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "@types/qs": {
       "version": "6.9.7",
       "resolved": "https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz",
@@ -2034,6 +2037,8 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+<<<<<<< HEAD
+=======
       },
       "dependencies": {
         "@vue/vue-loader-v15": {
@@ -2057,6 +2062,7 @@
             }
           }
         }
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
       }
     },
     "@vue/cli-shared-utils": {
@@ -2206,6 +2212,30 @@
         }
       }
     },
+<<<<<<< HEAD
+    "@vue/vue-loader-v15": {
+      "version": "npm:vue-loader@15.10.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
+      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+      "dev": true,
+      "requires": {
+        "@vue/component-compiler-utils": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+          "dev": true
+        }
+      }
+    },
+=======
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -2521,6 +2551,8 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -2549,6 +2581,7 @@
         "is-array-buffer": "^3.0.1"
       }
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "array-flatten": {
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-2.1.2.tgz",
@@ -2561,6 +2594,8 @@
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmmirror.com/array-unique/-/array-unique-0.3.2.tgz",
@@ -2586,6 +2621,7 @@
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
       "dev": true
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "async": {
       "version": "2.6.4",
       "resolved": "https://registry.npmmirror.com/async/-/async-2.6.4.tgz",
@@ -2614,12 +2650,15 @@
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "autoprefixer": {
       "version": "10.4.8",
       "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.8.tgz",
@@ -2634,12 +2673,15 @@
         "postcss-value-parser": "^4.2.0"
       }
     },
+<<<<<<< HEAD
+=======
     "available-typed-arrays": {
       "version": "1.0.5",
       "resolved": "https://registry.npmmirror.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "axios": {
       "version": "0.27.2",
       "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
@@ -2750,6 +2792,8 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmmirror.com/base/-/base-0.11.2.tgz",
@@ -2765,6 +2809,7 @@
         "pascalcase": "^0.1.1"
       }
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
@@ -3018,6 +3063,8 @@
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/cache-base/-/cache-base-1.0.1.tgz",
@@ -3035,6 +3082,7 @@
         "unset-value": "^1.0.0"
       }
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
@@ -10242,12 +10290,15 @@
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true
     },
+<<<<<<< HEAD
+=======
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
       "dev": true
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
@@ -10259,6 +10310,8 @@
         "strip-ansi": "^6.0.1"
       }
     },
+<<<<<<< HEAD
+=======
     "string.prototype.trim": {
       "version": "1.2.7",
       "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
@@ -10292,6 +10345,7 @@
         "es-abstract": "^1.20.4"
       }
     },
+>>>>>>> 33a1a8d1a265418b200ca2c39eb854da215a9986
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",

src/views/codeManagement/components/addDialog.vue

@@ -136,6 +136,14 @@
       // this.getrecipientDep()
     },
     methods: {
+      handleClose(){
+         this.addRoleDialog = false
+         this.addForm = {
+           name: '',
+           code: '',
+           remark: ''
+         }
+      },
       open(type, row) {
         if (type == 'add') {
           this.dialogTitle = '新建编码规则';
@@ -152,23 +160,6 @@
         this.addRoleDialog = true;
         this.openType = type;
       },
-      data() {
-        return {
-          addRoleDialog: false,
-          dialogTitle: '新建编码规则',
-          addForm: {
-            name: '',
-            code: '',
-            remark: ''
-          },
-          addFormRules: {
-            name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-            code: [{ required: true, message: '请输入编码', trigger: 'blur' }]
-          },
-          codeConfigurationList: [],
-          openType: 'add'
-        };
-      },
       submitAdd() {
         const a1 = new Promise((resolve, reject) => {
           this.$refs.addForm.validate((valid) => {
@@ -214,77 +205,6 @@
             });
         });
       },
-      methods: {
-        open(type, row) {
-          if (type == 'add') {
-            this.dialogTitle = '新建编码规则';
-            this.codeConfigurationList = [];
-          } else if (type == 'edit') {
-            this.dialogTitle = '编辑编码规则';
-            getCodeDetail(row.id).then((res) => {
-              this.addForm = { ...res };
-              if (this.addForm.codeConfigurationList)
-                delete this.addForm.codeConfigurationList;
-              this.codeConfigurationList = res.codeConfigurationList;
-            });
-          }
-          this.addRoleDialog = true;
-          this.openType = type;
-        },
-        handleClose() {
-          this.restForm();
-          this.addRoleDialog = false;
-        },
-        restForm() {
-          this.$refs.myTable.handleReset(); //清空表格校验
-          this.$refs.addForm.resetFields();
-          this.addForm = {
-            name: '',
-            code: '',
-            remark: ''
-          };
-        },
-        submitAdd() {
-          const a1 = new Promise((resolve, reject) => {
-            this.$refs.addForm.validate((valid) => {
-              if (valid) resolve();
-            });
-          });
-          const a2 = new Promise((resolve, reject) => {
-            this.$refs.myTable.validateForm((valid) => {
-              if (valid) resolve();
-            });
-          });
-          Promise.all([a1, a2]).then(() => {
-            const codeConfigurationList = this.$refs.myTable.getTableValue();
-            // codeConfigurationList.map(item=>{
-            //    item.type = item.type.code
-            // })
-            let par = {
-              code: this.addForm.code,
-              name: this.addForm.name,
-              remark: this.addForm.remark,
-              codeConfigurationList: codeConfigurationList,
-              codeManageTreeId: 1
-            };
-            if (this.openType == 'edit') {
-              par.id = this.addForm.id;
-            }
-            saveNew(par)
-              .then((res) => {
-                console.log('res', res);
-                this.loading = false;
-                this.addRoleDialog = false;
-                this.$message.success(res);
-                this.$emit('done');
-              })
-              .catch((e) => {
-                this.loading = false;
-                // this.$message.error(e.message);
-              });
-          });
-        }
-      }
     }
   };
 </script>

src/views/codeManagement/components/myTable.vue

@@ -185,19 +185,19 @@
               label: '年'
             },
             {
-              value: 'yyyymm',
+              value: 'yyyyMM',
               label: '年月'
             },
             {
-              value: 'yyyymmdd',
+              value: 'yyyyMMdd',
               label: '年月日'
             },
             {
-              value: 'yyyymmddhh',
+              value: 'yyyyMMddHH',
               label: '年月日时'
             },
             {
-              value: 'yyyymmddhhmmss',
+              value: 'yyyyMMddHHmmss',
               label: '年月日时分秒'
             }
           ]

src/views/ledgerAssets/boat/index.vue

@@ -1,15 +1,41 @@
 <template>
   <div class="ele-body">
-    舟皿台账
+     <el-card shadow="never" v-loading="loading">
+       <ele-split-layout
+         width="266px"
+         allow-collapse
+         :right-style="{ overflow: 'hidden' }"
+       >
+         <div>
+           <div class="ele-border-lighter sys-organization-list">
+             <AssetTree
+               @handleNodeClick="handleNodeClick"
+               @setDefault="setDefaultList"
+               :id="'2'"
+               ref="treeList"
+             />
+           </div>
+         </div>
+         <template v-slot:content>
+           <!-- <org-user-list
+             v-if="current"
+             :organization-list="data"
+             :organization-id="current.id"
+           /> -->
+         </template>
+       </ele-split-layout>
+     </el-card>
   </div>
 </template>
 
 <script>
+  import AssetTree from '@/components/AssetTree';
   export default {
-    // name: 'boatLedger',
-    components: {},
+    components: { AssetTree },
     data () {
       return {
+        // 加载状态
+        loading: false,
 
       };
     },
@@ -17,6 +43,16 @@
 
     },
     methods: {
+      handleNodeClick (info) {
+        // this.chooseId = info.id
+        // this.searchForm.classificationIds = [info.id]
+        // this.handleList()
+      },
+
+      setDefaultList(id){
+        // this.searchForm.classificationIds = [id]
+        // this.handleList()
+      },
 
     }
   };

vue.config.js

@@ -21,11 +21,10 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.3.51:86', // 测试
-
-        target: 'http://192.168.3.35:8080', // kang杨威
+        // target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
-        // target: 'http://192.168.3.33:8080', // 谢一平
+        target: 'http://192.168.3.33:8080', // 谢一平
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {