Quellcode durchsuchen

修改bug,添加需采集信息点

zhangyu vor 4 Jahren
Ursprung
Commit
fff1a951fd

+ 29 - 1
src/api/dict/index.js

@@ -1,4 +1,4 @@
-import {baseUrl, dict} from "@/api/scan/config";
+import {baseUrl, dict, component_dict} from "@/api/scan/config";
 import http from "@/api/scan/httpUtil";
 
 //头部信息查询(查询所有设备类型-所有部件类型-所有系统类型-所有专业类型)
@@ -24,3 +24,31 @@ export function setDataDictionary(param, success) {
   let url = `${baseUrl}${dict}/setting-dic-project`;
   http.postJson(url, param, success)
 }
+
+/**
+ * 字典统一配置(切换到equip-component服务上)
+ */
+
+// 头部信息查询(查询所有设备类型-所有部件类型-所有系统类型-所有专业类型)
+export function dictCategory(param, success) {
+    let url = `${baseUrl}${component_dict}/category`;
+    http.postJson(url, param, success);
+}
+
+//查询项目下类型的信息点
+export function dictQuery(param, success) {
+    let url = `${baseUrl}${component_dict}/query`;
+    http.postJson(url, param, success);
+}
+
+//设置-项目定制化字典
+export function setDicProject(param, success) {
+    let url = `${baseUrl}${component_dict}/setting-dic-project`;
+    http.postJson(url, param, success)
+}
+
+//需采集信息同步到所有项目
+export function synDicProject(param, success) {
+    let url = `${baseUrl}${component_dict}/syn-dic-project`;
+    http.getJson(url, param, success)
+}

+ 1 - 0
src/api/scan/config.js

@@ -21,6 +21,7 @@ export const shaft = object + '/shaft'
 export const tenant = dataCenter + '/tenant'
 export const floor = object + '/floor'
 export const dict = dataCenter + '/dict'
+export const component_dict = component + '/dict'
 export const classDef = dataCenter + '/class-def'
 export const locationPoint = object + '/location-point'
 export const modelScanTask = dataCenter + '/model-scan-task'

+ 2 - 0
src/components/ledger/handsontables/device.vue

@@ -1192,6 +1192,8 @@ export default {
         case "infos.supplierContract": //供应合同(F2)
         case "infos.drawing": //设备图纸(F2)
         case "infos.installDrawing": //安装图纸(F2)
+        case "infos.designIDGraph": //设计工况空调机组处理过程焓湿图(F2)
+        case "infos.fanCharacterCurve": //风机性能曲线(F1)
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           if (!this.onlyRead || this.filesArr.length) {

+ 1 - 1
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -71,7 +71,7 @@
       <!-- <a :href="downloadProject('report')">
         <el-button>{{values.downloadFile}}</el-button>
       </a> -->
-      <a @click="downloadProject('report')">
+      <a :href="downloadProject('report')">
         <el-button>{{values.downloadFile}}</el-button>
       </a>
       <footer

+ 6 - 2
src/utils/handsontable/notShow.js

@@ -374,7 +374,9 @@ const showTools = {
       item.code == "installInstruction" ||
       item.code == "supplierContract" ||
       item.code == "drawing" ||
-      item.code == "installDrawing"
+      item.code == "installDrawing" ||
+      item.code == "designIDGraph" ||
+      item.code == "fanCharacterCurve"
     ) {
       return {
         data: item.path,
@@ -480,7 +482,9 @@ const showTools = {
       item.code == "installInstruction" ||
       item.code == "supplierContract" ||
       item.code == "drawing" ||
-      item.code == "installDrawing"
+      item.code == "installDrawing" ||
+      item.code == "designIDGraph" ||
+      item.code == "fanCharacterCurve"
     ) {
       return {
         data: item.path,

+ 3 - 3
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -17,11 +17,11 @@
         <el-table ref="multipleTable" :data="tableData" v-loading='loading' stripe height="100%"
                   @selection-change="handleSelectionChange" :header-cell-style="headerStyle">
           <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column label="所属建筑楼层" width="200">
+          <el-table-column label="所属建筑楼层" width="300">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.building ? scope.row.building.localName ? scope.row.Building.localName : '' : '' }} -
-                {{ scope.row.floor ? scope.row.floor.localName ? scope.row.Floor.localName : '' : '' }}
+                {{ scope.row.building ? scope.row.building.localName ? scope.row.building.localName : '' : '' }} -
+                {{ scope.row.floor ? scope.row.floor.localName ? scope.row.floor.localName : '' : '' }}
               </div>
             </template>
           </el-table-column>

+ 2 - 0
src/views/ledger/facility/addfacility.vue

@@ -525,6 +525,8 @@ export default {
         case 'infos.supplierContract': //供应合同
         case 'infos.drawing': //设备图纸
         case 'infos.installDrawing': //安装图纸
+        case "infos.designIDGraph": //设计工况空调机组处理过程焓湿图(F2)
+        case "infos.fanCharacterCurve": //风机性能曲线(F1)
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;

+ 2 - 2
src/views/ledger/facility/details/index.vue

@@ -329,7 +329,6 @@ export default {
 
       })
       //展示图片
-      this.exhibitionImage.list = picObject
       let isArray = [] //获取图片数组
       for (let i in picObject) {
         if (Array.isArray(picObject[i])) {
@@ -341,8 +340,9 @@ export default {
           })
         }
       }
+      this.exhibitionImage.list = picObject
       this.exhibitionImage.arr = isArray
-      let video = isArray.filter(i => i.Type != 'image' && i.type != 'image')
+      let video = isArray.filter(i => i.type === 'video')
       this.exhibitionVideo.list = video
       //判断是否显示图片组件
       this.isShowImage = isArray.length ? true : false

+ 1 - 1
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -98,7 +98,7 @@ export default {
           : [{ Checked: 1 }]
         : [{ Checked: 1 }],
       showTypes: [
-        { value: "partInfo", label: '隐藏信息点' },
+        // { value: "partInfo", label: '隐藏信息点' },
         { value: "all", label: '全部' },
         { value: "Visible", label: '只看采集信息' }
       ],

+ 2 - 2
src/views/ledger/facility/partsmanage/index.vue

@@ -112,11 +112,11 @@ export default {
       spaceList: "",
       onlyRead: false,
       showTypes: [
-        { value: "partInfo", label: '隐藏信息点' },
+        // { value: "partInfo", label: '隐藏信息点' },
         { value: "all", label: '全部' },
         { value: "Visible", label: '只看采集信息' }
       ],
-      showType: "partInfo",
+      showType: "Visible",
       tableHeader: [],
       page: {
         pageSize: 50,

+ 13 - 9
src/views/ledger/property/addpropertys.vue

@@ -204,16 +204,20 @@ export default {
       let list = this.multipleSelection.map((item) => {
         return item.id
       })
-      let param = {
-        Filters: `EquipID in ${JSON.stringify(list)}`
-      }
-      createPropertys(param, res => {
-        this.$message.success("创建成功!")
-        this.$router.push({
-          name: "propertyLedger",
-          params: { Family: this.params.Family }
+      if (list && list.length) {
+        let param = {
+					filters: `id in ${JSON.stringify(list)}`
+        }
+        createPropertys(param, res => {
+					this.$message.success("创建成功!")
+					this.$router.push({
+					name: "propertyLedger",
+					params: { Family: this.params.Family }
+					})
         })
-      })
+      } else {
+				this.$message.info("请选择设备!")
+      }
     }
   }
 };

+ 2 - 1
src/views/ready/buildfloor/addFloor/index.vue

@@ -42,7 +42,7 @@ export default {
     showDialog(data) {
       this.floorData = data || {};
       this.floorData = tools.desFormatData(this.floorData)
-      // this.floorData.Outline = this.floorData.Outline ? JSON.stringify(this.floorData.Outline) : null
+      this.floorData.outline = this.floorData.outline ? JSON.stringify(this.floorData.outline) : undefined;
       //===测试代码===
       // this.floorData.DefaultQRCode = 'Eq1101080004a93a45ce15e948dda155e9683803cf46QR'
       // this.floorData.QRCodePic = 'Eq1101080004a93a45ce15e948dda155e9683803cf46QR'
@@ -67,6 +67,7 @@ export default {
     },
     save() {
       let form = this.$refs.formItems.form
+      if (form.outline) form.outline = JSON.parse(form.outline);
       let newform = tools.formatData(form)
       newform.buildingId = this.curBuildId
       let Param = {

Datei-Diff unterdrückt, da er zu groß ist
+ 26 - 7
src/views/ready/collectsetting/index.vue


Datei-Diff unterdrückt, da er zu groß ist
+ 1200 - 0
src/views/ready/collectsetting/index_old.vue