13219261128 3 роки тому
батько
коміт
523947e0af

+ 1 - 1
.env

@@ -1,7 +1,7 @@
1 1
 # 所有环境默认
2 2
 
3 3
 # 页面 title 前缀
4
-VUE_APP_TITLE=物联网系统
4
+VUE_APP_TITLE=物联网平台
5 5
 
6 6
 # 网络请求公用地址
7 7
 VUE_APP_API=/api/

+ 1 - 1
.env.development

@@ -1,5 +1,5 @@
1 1
 # 开发环境
2 2
 
3 3
 # 页面 title 前缀
4
-VUE_APP_TITLE=物联网系统
4
+VUE_APP_TITLE=物联网平台
5 5
 

+ 1 - 1
public/index.html

@@ -48,7 +48,7 @@
48 48
             href="https://github.com/d2-projects/d2-admin"
49 49
             target="_blank">
50 50
             <!-- https://github.com/d2-projects/d2-admin -->
51
-            紫光软件 物联网系统
51
+            紫光软件 物联网平台
52 52
           </a>
53 53
         </div>
54 54
       </div>

BIN
src/assets/images/logo1.png


+ 1 - 1
src/libs/util.js

@@ -13,7 +13,7 @@ const util = {
13 13
  * @param {String} title 标题
14 14
  */
15 15
 util.title = function (titleText) {
16
-  const processTitle = process.env.VUE_APP_TITLE || '物联网系统'
16
+  const processTitle = process.env.VUE_APP_TITLE || '物联网平台'
17 17
   // window.document.title = `${processTitle}${titleText ? ` | ${titleText}` : ''}`
18 18
   //浏览器标题
19 19
   window.document.title = `${processTitle}`

+ 1 - 1
src/views/demo/alarmRecord/index.vue

@@ -726,7 +726,7 @@ export default {
726 726
       };
727 727
 
728 728
       api
729
-        .ckList(data)
729
+        .ckList()
730 730
         .then((res) => {
731 731
           if (res.code == 200) {
732 732
             this.ckLists = res.data;

+ 1 - 1
src/views/demo/equipmentManage/compontents/addDialog.vue

@@ -159,7 +159,7 @@ export default {
159 159
       };
160 160
 
161 161
       api
162
-        .ckList(data)
162
+        .ckList()
163 163
         .then((res) => {
164 164
           if (res.code == 200) {
165 165
             this.ckLists = res.data;

+ 1 - 1
src/views/demo/equipmentManage/equipment/index.vue

@@ -276,7 +276,7 @@ export default {
276 276
       };
277 277
 
278 278
       api
279
-        .ckList(data)
279
+        .ckList()
280 280
         .then((res) => {
281 281
           if (res.code == 200) {
282 282
             this.ckLists = res.data;

+ 2 - 2
src/views/demo/productManage/compontents/addDialog.vue

@@ -15,7 +15,7 @@
15 15
         <el-form-item label="产品图标:" prop="proIcons">
16 16
           <el-upload
17 17
             class="avatar-uploader"
18
-            action="minio/testupload"
18
+            action="smart-grp-basic/minio/testupload"
19 19
             :show-file-list="false"
20 20
             :on-success="handleAvatarSuccess"
21 21
           >
@@ -164,7 +164,7 @@ export default {
164 164
       };
165 165
 
166 166
       api
167
-        .ckList(data)
167
+        .ckList()
168 168
         .then((res) => {
169 169
           if (res.code == 200) {
170 170
             this.ckLists = res.data;

+ 17 - 13
src/views/demo/system/organization/index.vue

@@ -354,19 +354,23 @@ export default {
354 354
       return data.label.indexOf(value) !== -1;
355 355
     },
356 356
     search() {
357
-      // console.log(this.orgName, "this.Name");
358
-      api
359
-        .getOrganizationByName(this.orgName)
360
-        .then((res) => {
361
-          if (res.code == 200) {
362
-            this.$nextTick(() => {
363
-              this.tableData1 = res.data;
364
-            });
365
-          }
366
-        })
367
-        .catch((err) => {
368
-          console.log(err);
369
-        });
357
+      if(this.orgName){
358
+        api
359
+          .getOrganizationByName(this.orgName)
360
+          .then((res) => {
361
+            if (res.code == 200) {
362
+              this.$nextTick(() => {
363
+                this.tableData1 = res.data;
364
+              });
365
+            }
366
+          })
367
+          .catch((err) => {
368
+            console.log(err);
369
+          });
370
+      }else{
371
+       this.getPageInfo()
372
+      }
373
+
370 374
     },
371 375
     // 每页条数改变
372 376
     handleSizeChange(val) {

+ 1 - 1
src/views/demo/system/userManagement/index.vue

@@ -330,7 +330,7 @@ export default {
330 330
       };
331 331
 
332 332
       api
333
-        .ckList(data)
333
+        .ckList()
334 334
         .then((res) => {
335 335
           if (res.code == 200) {
336 336
             var that = this;

+ 1 - 1
src/views/demo/warehouseShow/warehouseInfo/warehouseInfo-check.vue

@@ -465,7 +465,7 @@ export default {
465 465
         storeTypeCode: 300002,
466 466
       };
467 467
       api
468
-        .ckList(data)
468
+        .ckList()
469 469
         .then((res) => {
470 470
           if (res.code == 200) {
471 471
             this.ckLists = res.data;

BIN
src/views/system/login/image/logo2.png