Quellcode durchsuchen

增添开发人员打包本地前端
修改设备上传图片公共上传

Xiahai vor 1 Jahr
Ursprung
Commit
5ba6b6b695
3 geänderte Dateien mit 37 neuen und 11 gelöschten Zeilen
  1. 17 0
      .env.test
  2. 1 0
      package.json
  3. 19 11
      src/views/iot/device/instance/component/edit.vue

+ 17 - 0
.env.test

@@ -0,0 +1,17 @@
+VITE_SERVER_PROTOCOL = 'http:'
+VITE_SERVER_HOSTNAME = '127.0.0.1:8200'
+
+# 基础服务路径
+VITE_SERVER_URL = ''
+# 基础接口路径
+VITE_API_URL = '/api/v1'
+# 指数管理页面用到的
+VITE_ASSESS_URL = '/assess/v1'
+# 大屏前端
+VITE_SCREEN_URL = '/plugin/screen/'
+# 组态图前端
+VITE_TOPO_URL = '/plugin/topo/'
+# modbus服务
+VITE_MODBUS_API = '/modbus'
+# ice104协议网关服务
+VITE_ICE104_API = '/ice104'

+ 1 - 0
package.json

@@ -8,6 +8,7 @@
     "dev": "vite --force",
     "build": "vite build",
     "build:open": "vite build --mode open",
+    "build:test": "vite build --mode test",
     "deploy:zip": "npm run build && npm run zipAndUpload && npm run unzip && npm run success",
     "zipAndUpload": "cd dist && rm -rf zhgy.sagoo.cn.zip && zip -r -q zhgy.sagoo.cn.zip ./ && ssh iot 'sudo rm /www/wwwroot/zhgy.sagoo.cn-old.zip' | ssh iot 'sudo mv /www/wwwroot/zhgy.sagoo.cn.zip /www/wwwroot/zhgy.sagoo.cn-old.zip' | scp -r -O zhgy.sagoo.cn.zip iot:/www/wwwroot",
     "unzip": "ssh iot 'cd /www/wwwroot/ && sudo unzip -q -o -d ./zhgy.sagoo.cn zhgy.sagoo.cn.zip'",

+ 19 - 11
src/views/iot/device/instance/component/edit.vue

@@ -66,10 +66,12 @@
           <el-input v-model="intro" type="textarea" placeholder="请输入设备说明"></el-input>
         </el-form-item>
         <el-form-item label="设备图片">
-					<upload-vue :imgs="phone" @set-imgs="setImgsPhone" :limit="deviceImgLimit"></upload-vue>
+<!--					<upload-vue :imgs="phone" @set-imgs="setImgsPhone" :limit="deviceImgLimit"></upload-vue>-->
+          <uploadVue :img="phone" @set-imgs="setImgsPhone"></uploadVue>
 				</el-form-item>
         <el-form-item label="证书图片">
-					<upload-vue :imgs="certificate" @set-imgs="setImgsCertificate" :limit="deviceImgLimit"></upload-vue>
+<!--					<upload-vue :imgs="certificate" @set-imgs="setImgsCertificate" :limit="deviceImgLimit"></upload-vue>-->
+          <uploadVue :img="certificate" @set-imgs="setImgsCertificate"></uploadVue>
 				</el-form-item>
       </el-form>
       <template #footer>
@@ -88,7 +90,7 @@
 import { reactive, toRefs, defineComponent, ref, unref, nextTick, onMounted } from 'vue';
 import api from '/@/api/device';
 import apiSystem from '/@/api/system';
-import { ElMessage } from "element-plus";
+import {ElMessage, UploadProps} from "element-plus";
 import tagVue from './tag.vue';
 import Map from './map.vue';
 import UploadVue from '/@/components/upload/index.vue';
@@ -140,8 +142,8 @@ interface DicState {
   rules: {};
   deviceImgLimit: number;
   certificateLimit: number;
-  phone: any[];
-  certificate: any[];
+  phone: string;
+  certificate: string;
   intro: string;
 }
 interface Tag {
@@ -180,8 +182,8 @@ export default defineComponent({
       },
       deviceImgLimit: 0,
       certificateLimit: 0,
-      phone: [],
-      certificate: [],
+      phone: "",
+      certificate: "",
       intro: ""
     });
 
@@ -226,12 +228,18 @@ export default defineComponent({
       }
     };
     // 上传设备图
-    const setImgsPhone = (res:any) => {
-      state.phone = res;
+    // const setImgsPhone = (res:any) => {
+    //   state.phone = res;
+    // }
+    const setImgsPhone: UploadProps['onSuccess'] = (response) => {
+      state.phone = response
     }
     // 上传设备资格证书
-    const setImgsCertificate = (res:any) => {
-      state.certificate = res;
+    // const setImgsCertificate = (res:any) => {
+    //   state.certificate = res;
+    // }
+    const setImgsCertificate: UploadProps['onSuccess'] = (response) => {
+      state.certificate = response
     }
     // 关闭弹窗
     const closeDialog = () => {