Browse Source

adm:feat > 修改详情页相关inputMode输入类型,端口号

shaun-sheep 4 năm trước cách đây
mục cha
commit
7998e381be

+ 5 - 5
config/index.js

@@ -210,7 +210,7 @@ module.exports = {
         }
       },
       '/api': {
-        target: 'http://60.205.177.43:8080',
+        target: 'http://60.205.177.43:28888',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"
@@ -295,7 +295,7 @@ module.exports = {
       '/scanbuilding': {
         // 目标 API 地址
         // target: 'http://192.168.12.238:8080/',
-        target: 'http://60.205.177.43:8080',
+        target: 'http://60.205.177.43:28888',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -303,7 +303,7 @@ module.exports = {
       },
       '/image-service': {
         // 目标 API 地址
-        target: 'http://60.205.177.43:8080/',
+        target: 'http://60.205.177.43:28888/',
         // target: 'http://api.sagacloud.cn',
         // 如果要代理 websockets
         ws: true,
@@ -318,7 +318,7 @@ module.exports = {
       },
       '/modelapi': {
         // target: 'http://172.16.42.210:8082',
-        target: 'http://60.205.177.43:8080/',
+        target: 'http://60.205.177.43:28888/',
         // target: 'http://192.168.20.218:8082',//景灏
         changeOrigin: true,
         pathRewrite: {
@@ -326,7 +326,7 @@ module.exports = {
         }
       },
       '/schedulerapi': {
-        target: 'http://60.205.177.43:8080/',
+        target: 'http://60.205.177.43:28888/',
         // target: 'http://mbi.sagacloud.cn:8080',
         changeOrigin: true,
         pathRewrite: {

+ 0 - 2
src/components/dialogs/list/batchDialog.vue

@@ -317,8 +317,6 @@ export default {
       // dpSupplierId 供应商 dpManufacturerId 生产商 dpBrandId 品牌
       // dpSpecificationId 型号 dpInsurerId 保险商 dpMaintainerId 维修商
       this.multipleSelection.forEach(item => {
-        // let equipId = item.id
-        // arr.push({ equipId })
         let id = item.id
         arr.push({ id })
       })

+ 5 - 28
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -23,18 +23,10 @@
               <span>{{ value.Value }}</span>
             </div>
           </div>
-          <div style="text-align: center; margin: 0">
-            <el-button
-              type="text"
-              size="mini"
-              v-if="value.Value &&value.InputMode != 'F2'&& value.InputMode!='N2' "
-              @click="handleCopy(value.Value)">复制
-            </el-button>
-          </div>
-          <!--        <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>-->
+
           <el-button slot="reference" type="text">有</el-button>
         </el-popover>
-        <span v-else-if="Array.isArray(value.Value) && value.InputMode== 'F2' ">
+        <span v-else-if="Array.isArray(value.Value) && value.dataType== 'ATTACHMENT' ">
         <el-popover
           v-if="value.Value.length "
           placement="right"
@@ -42,35 +34,20 @@
           trigger="hover">
           <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ value.InfoPointName }}</p>
           <div v-for="(pic,index) in value.Value">
-            <div>图纸名称:{{ pic.Name }}
-              <!--              <el-button style="" type="text" size="mini" @click="downloadFile(pic.Key)">下载</el-button>-->
+            <div>图纸名称:{{ pic.name }}
               <a
                 style="cursor: pointer;color: #409eff"
-                :href="`/image-service/common/file_get/${pic.Key}?systemId=dataPlatform`"
-                :download="pic.Name"
+                :href="`/image-service/common/file_get/${pic.key}?systemId=dataPlatform`"
+                :download="pic.name"
               >下载</a>
             </div>
           </div>
-          <!--          <el-button slot="reference" type="text">{{value.Value.length >0 ? '有':'-'}}</el-button>-->
           <el-button slot="reference" type="text">有</el-button>
         </el-popover>
         <span v-else>-</span>
       </span>
 
         <el-popover
-          v-else-if="Array.isArray(value.Value) && value.InputMode=='N2'"
-          placement="right"
-          width="400"
-          trigger="hover">
-          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ value.InfoPointName }}</p>
-          <p style="height: 250px;overflow: auto">{{ value.Value }}</p>
-          <div style="text-align: center; margin: 0">
-            <el-button type="text" size="mini" @click="handleCopy(value.Value)">复制</el-button>
-          </div>
-          <!--        <el-button slot="reference" type="text">{{value.Value.length >0  ? '有' :'-'}}</el-button>-->
-          <el-button slot="reference" type="text">有</el-button>
-        </el-popover>
-        <el-popover
           v-else-if="value.Value && value.Value.length  && `${value.InfoPointName}:${value.Value}`.length>21 "
           placement="right"
           width="160"

+ 7 - 19
src/components/ledger/details/detail/exhibitionCrux.vue

@@ -32,31 +32,20 @@
           <el-button slot="reference" type="text">{{item.value ? '有' :'-'}}</el-button>
         </el-popover>
         <el-popover
-          v-else-if="Array.isArray(item.value) && item.InputMode== 'F2'"
+          v-else-if="Array.isArray(item.value) && item.dataType== 'ATTACHMENT'"
           placement="right"
           width="250"
           trigger="hover">
           <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{item.InfoPointName}}</p>
           <div v-for="(pic,index) in item.value">
-            <div>图纸名称:{{pic.Name}}
-                <el-button style="" type="text" size="mini" @click="downloadFile(pic.Key)">下载</el-button>
+            <div>图纸名称:{{ pic.name }}
+              <el-button size="mini" style="" type="text" @click="downloadFile(pic.key)">下载</el-button>
             </div>
           </div>
           <el-button slot="reference" type="text">{{item.value? '有':'-'}}</el-button>
         </el-popover>
-        <el-popover
-          v-else-if="Array.isArray(item.value) && item.InputMode=='N2'"
-          placement="right"
-          width="600"
-          trigger="hover">
-          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{item.InfoPointName}}</p>
-          <p style="height: 300px;overflow: auto">{{item.value}}</p>
-          <div style="text-align: center; margin: 0">
-            <el-button type="text" size="mini" @click="handleCopy(item.value)">复制</el-button>
-          </div>
-          <el-button slot="reference" type="text">{{item.value ? '有' :'-'}}</el-button>
-        </el-popover>
-        <el-popover
+
+          <el-popover
           v-else-if="item.value && item.value.length && `${item.InfoPointName}:${item.value}`.length>21"
           placement="top"
           width="160"
@@ -71,7 +60,6 @@
         <span v-else>{{item.value}}</span>
         </div>
       </div>
-      <!-- <div style="text-align: center" v-else>暂无数据</div> -->
     </div>
     <cruxDialog
       ref="setting"
@@ -84,9 +72,9 @@
 </template>
 
 <script>
-  import cruxDialog from "./cruxDialog";
+import cruxDialog from "./cruxDialog";
 
-  export default {
+export default {
     name: "exhibition-crux",
     props: ['exhibitionCrux','type'],
     components: {cruxDialog},

+ 13 - 1
src/components/ledger/details/detail/exhibitionEnergy.vue

@@ -36,7 +36,19 @@
     props: ['exhibitionEnergy'],
     methods:{
       formatDate(str) {
-        return str ? str.substr(0,4)+"-"+str.substr(4,2)+"-"+str.substr(6,2)+" "+str.substr(8,2) + ":" +str.substr(10,2) + ":"+str.substr(12,2) :'--'
+        if (str) {
+          if (str.includes('-')) {
+            return str
+          } else {
+            if (str.length > 8) {
+              return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+            } else {
+              return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+            }
+          }
+        } else {
+          return '--'
+        }
       },
       handleCopy(data) {
         let oInput = document.createElement('input')

+ 14 - 2
src/components/ledger/details/detail/exhibitionEnergyO.vue

@@ -25,8 +25,20 @@
     props: ['exhibitionEnergy'],
     methods:{
       formatDate(str) {
-        return str ? str.substr(0,4)+"-"+str.substr(4,2)+"-"+str.substr(6,2)+" "+str.substr(8,2) + ":" +str.substr(10,2) + ":"+str.substr(12,2) :'--'
-      }
+        if (str) {
+          if (str.includes('-')) {
+            return str
+          } else {
+            if (str.length > 8) {
+              return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+            } else {
+              return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+            }
+          }
+        } else {
+          return '--'
+        }
+      },
     }
   }
 </script>

+ 12 - 15
src/views/ledger/cenotelist/cenoteDetail/index.vue

@@ -185,7 +185,11 @@ export default {
         if (str.includes('-')) {
           return str
         } else {
-          return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          if (str.length > 8) {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          } else {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+          }
         }
       } else {
         return '--'
@@ -197,7 +201,7 @@ export default {
         if (this.instance.hasOwnProperty(i.path) && this.currentRadio != 2) {
           i.value = this.instance[i.path]
         }
-        if (i.inputMode == 'C5') {
+        if (i.dataType == 'DATETIME') {
           if (this.instance.hasOwnProperty(i.path)) {
             let time = this.instance[i.path]
             i.value = this.formatDate(time)
@@ -207,7 +211,7 @@ export default {
           // let source = JSON.parse(i.dataSource)
           let source = i.dataSource
           //判断输入类型
-          if (i.inputMode == 'D1L') {
+          if (i.dataType == 'ENUM') {
             let d1l = tools.formatDataSource(i.dataSource)
             d1l.forEach(k => {
               if (k.code == this.instance[i.path]) {
@@ -228,13 +232,8 @@ export default {
             }
           })
         }
-        switch (i.inputMode) {
-          case "L":
-          case "L1":
-          case "L2":
-          case "M":
-            break;
-          default:
+        switch (i.category) {
+          case "STATIC":
             if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
               result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.path,
@@ -243,7 +242,7 @@ export default {
                 Value: i.value,
                 Visible: i.visible,
                 KeyWord: i.keyWord,
-                InputMode: i.inputMode,
+                dataType: i.dataType
               })
             } else {
               result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
@@ -254,14 +253,12 @@ export default {
                   Value: i.value,
                   Visible: i.visible,
                   KeyWord: i.keyWord,
-                  InputMode: i.inputMode,
+                  dataType: i.dataType
                 }]
               }
             }
-
+            break
         }
-
-
       })
       this.exhibitionBaseInformation.information = result
     },

+ 45 - 47
src/views/ledger/facility/details/index.vue

@@ -218,7 +218,7 @@ export default {
         }
         this.instance = obj;
         this.pointData.forEach(item => {
-          if (item.inputMode == "L" || item.inputMode == "L1" || item.inputMode == "L2" || item.inputMode == "M") {
+          if (item.category != "STATIC") {
             let cur = tools.dataForKey(this.exampleData, item.path);
             if (cur) {
               this.criterias.push({
@@ -330,7 +330,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.inputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.path) {
             case 'infos.drawing':
             case 'infos.installPic':
@@ -379,7 +379,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.inputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.path) {
             case 'infos.insuranceFile':
             case 'infos.archive':
@@ -425,7 +425,11 @@ export default {
         if (str.includes('-')) {
           return str
         } else {
-          return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          if (str.length > 8) {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          } else {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+          }
         }
       } else {
         return '--'
@@ -438,7 +442,7 @@ export default {
         if (this.instance.hasOwnProperty(i.path) && this.currentRadio != 2) {
           i.value = this.instance[i.path]
         }
-        if (i.inputMode == 'C5') {
+        if (i.dataType == 'DATETIME') {
           if (this.instance.hasOwnProperty(i.path)) {
             let time = this.instance[i.path]
             i.value = this.formatDate(time)
@@ -448,7 +452,7 @@ export default {
           // let source = JSON.parse(i.dataSource)
           let source = i.dataSource
           //判断输入类型
-          if (i.inputMode == 'D1L') {
+          if (i.dataType == 'ENUM') {
             let d1l = tools.formatDataSource(i.dataSource)
             d1l.forEach(k => {
               if (k.code == this.instance[i.path]) {
@@ -470,81 +474,75 @@ export default {
           })
         }
         // 动态信息点处理
-        switch (i.inputMode) {
-          case "L":
-          case "L1":
-          case "L2":
-          case "M":
-            if (resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
-              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
+        switch (i.category) {
+          case "STATIC":
+            if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.path,
                 InfoPointName: i.name,
                 InfoPointCode: i.code,
-                value: i.svalue,
+                Value: i.value,
                 Visible: i.visible,
                 KeyWord: i.keyWord,
-                InputMode: i.inputMode,
-                data: i.data,
-                receivetime: i.receivetime,
-                error: i.error,
-                Unit: i.unit,
-                FirstName: i.firstName,
+                classCode: i.classCode,
+                id: i.id,
+                groupCode: i.groupCode,
+                type: i.type,
+                dataType: i.dataType
               })
             } else {
-              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
                 paths: [{
                   Path: i.path,
                   InfoPointName: i.name,
                   InfoPointCode: i.code,
-                  value: i.svalue,
+                  Value: i.value,
                   Visible: i.visible,
                   KeyWord: i.keyWord,
-                  InputMode: i.inputMode,
-                  data: i.data,
-                  receivetime: i.receivetime,
-                  error: i.error,
-                  Unit: i.unit,
-                  FirstName: i.firstName,
+                  classCode: i.classCode,
+                  id: i.id,
+                  groupCode: i.groupCode,
+                  type: i.type,
+                  dataType: i.dataType
                 }]
               }
             }
-            break;
+            break
           default:
-            if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
-              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
+            if (resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.path,
                 InfoPointName: i.name,
                 InfoPointCode: i.code,
-                Value: i.value,
+                value: i.svalue,
                 Visible: i.visible,
                 KeyWord: i.keyWord,
-                InputMode: i.inputMode,
-                classCode: i.classCode,
-                id: i.id,
-                groupCode: i.groupCode,
-                type: i.type
+                data: i.data,
+                receivetime: i.receivetime,
+                error: i.error,
+                Unit: i.unit,
+                FirstName: i.firstName,
+                dataType: i.dataType
               })
             } else {
-              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
+              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
                 paths: [{
                   Path: i.path,
                   InfoPointName: i.name,
                   InfoPointCode: i.code,
-                  Value: i.value,
+                  value: i.svalue,
                   Visible: i.visible,
                   KeyWord: i.keyWord,
-                  InputMode: i.inputMode,
-                  classCode: i.classCode,
-                  id: i.id,
-                  groupCode: i.groupCode,
-                  type: i.type
+                  data: i.data,
+                  receivetime: i.receivetime,
+                  error: i.error,
+                  Unit: i.unit,
+                  FirstName: i.firstName,
+                  dataType: i.dataType
                 }]
               }
             }
-
         }
-
-
       })
       this.exhibitionBaseInformation.information = result
       this.exhibitionCrux.allMessage = result

+ 5 - 1
src/views/ledger/facility/details/index_old.vue

@@ -406,7 +406,11 @@ export default {
         if (str.includes('-')) {
           return str
         } else {
-          return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          if (str.length > 8) {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          } else {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+          }
         }
       } else {
         return '--'

+ 87 - 42
src/views/ledger/property/details/index.vue

@@ -254,7 +254,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.inputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.path) {
             case 'infos.drawing':
             case 'infos.installPic':
@@ -303,7 +303,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.inputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.path) {
             case 'infos.insuranceFile':
             case 'infos.archive':
@@ -350,7 +350,11 @@ export default {
         if (str.includes('-')) {
           return str
         } else {
-          return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          if (str.length > 8) {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          } else {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+          }
         }
       } else {
         return '--'
@@ -362,7 +366,7 @@ export default {
         if (this.instance.hasOwnProperty(i.path) && this.currentRadio != 2) {
           i.value = this.instance[i.path]
         }
-        if (i.inputMode == 'C5') {
+        if (i.dataType == 'DATETIME') {
           if (this.instance.hasOwnProperty(i.path)) {
             let time = this.instance[i.path]
             i.value = this.formatDate(time)
@@ -372,7 +376,7 @@ export default {
           // let source = JSON.parse(i.DataSource)
           let source = i.dataSource
           //判断输入类型
-          if (i.inputMode == 'D1L') {
+          if (i.dataType == 'ENUM') {
             let d1l = tools.formatDataSource(i.dataSource)
             d1l.forEach(k => {
               if (k.code == this.instance[i.path]) {
@@ -393,22 +397,35 @@ export default {
             }
           })
         }
-        switch (i.inputMode) {
-          case "L":
-          case "L1":
-          case "L2":
-          case "M":
-            break;
-          default:
-            if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
-              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
-                Path: i.Path,
+        if (i.category == 'STATIC') {
+          if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+            result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
+              Path: i.Path,
+              InfoPointName: i.name,
+              InfoPointCode: i.code,
+              Value: i.value,
+              Visible: i.visible,
+              KeyWord: i.keyWord,
+              data: i.data,
+              receivetime: i.receivetime,
+              error: i.error,
+              Unit: i.unit,
+              FirstName: i.firstName,
+              classCode: i.classCode,
+              id: i.id,
+              groupCode: i.groupCode,
+              type: i.type,
+              dataType: i.dataType
+            })
+          } else {
+            result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
+              paths: [{
+                Path: i.path,
                 InfoPointName: i.name,
                 InfoPointCode: i.code,
                 Value: i.value,
                 Visible: i.visible,
                 KeyWord: i.keyWord,
-                InputMode: i.inputMode,
                 data: i.data,
                 receivetime: i.receivetime,
                 error: i.error,
@@ -417,35 +434,63 @@ export default {
                 classCode: i.classCode,
                 id: i.id,
                 groupCode: i.groupCode,
-                type: i.type
-              })
-            } else {
-              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
-                paths: [{
-                  Path: i.path,
-                  InfoPointName: i.name,
-                  InfoPointCode: i.code,
-                  Value: i.value,
-                  Visible: i.visible,
-                  KeyWord: i.keyWord,
-                  InputMode: i.inputMode,
-                  data: i.data,
-                  receivetime: i.receivetime,
-                  error: i.error,
-                  Unit: i.unit,
-                  FirstName: i.firstName,
-                  classCode: i.classCode,
-                  id: i.id,
-                  groupCode: i.groupCode,
-                  type: i.type
-                }]
-              }
+                type: i.type,
+                dataType: i.dataType
+              }]
             }
-
+          }
         }
-
-
       })
+      // switch (i.inputMode) {
+      //   case "L":
+      //   case "L1":
+      //   case "L2":
+      //   case "M":
+      //     break;
+      //   default:
+      //     if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+      //       result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
+      //         Path: i.Path,
+      //         InfoPointName: i.name,
+      //         InfoPointCode: i.code,
+      //         Value: i.value,
+      //         Visible: i.visible,
+      //         KeyWord: i.keyWord,
+      //         InputMode: i.inputMode,
+      //         data: i.data,
+      //         receivetime: i.receivetime,
+      //         error: i.error,
+      //         Unit: i.unit,
+      //         FirstName: i.firstName,
+      //         classCode: i.classCode,
+      //         id: i.id,
+      //         groupCode: i.groupCode,
+      //         type: i.type
+      //       })
+      //     } else {
+      //       result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
+      //         paths: [{
+      //           Path: i.path,
+      //           InfoPointName: i.name,
+      //           InfoPointCode: i.code,
+      //           Value: i.value,
+      //           Visible: i.visible,
+      //           KeyWord: i.keyWord,
+      //           InputMode: i.inputMode,
+      //           data: i.data,
+      //           receivetime: i.receivetime,
+      //           error: i.error,
+      //           Unit: i.unit,
+      //           FirstName: i.firstName,
+      //           classCode: i.classCode,
+      //           id: i.id,
+      //           groupCode: i.groupCode,
+      //           type: i.type
+      //         }]
+      //       }
+      //     }
+      // }
+
       this.exhibitionBaseInformation.information = result
       this.exhibitionCrux.allMessage = result
     },

+ 46 - 38
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -223,7 +223,7 @@ export default {
         }
         this.instance = obj;
         this.pointData.forEach(item => {
-          if (item.inputMode == "L" || item.inputMode == "L1" || item.inputMode == "L2" || item.inputMode == "M") {
+          if (item.category != "STATIC") {
             let cur = tools.dataForKey(this.exampleData, item.path);
             if (cur) {
               this.criterias.push({
@@ -329,7 +329,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.inputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.Path) {
             case 'infos.drawing':
             case 'infos.installPic':
@@ -379,7 +379,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.inputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.path) {
             case 'infos.insuranceFile':
             case 'infos.archive':
@@ -426,7 +426,11 @@ export default {
         if (str.includes('-')) {
           return str
         } else {
-          return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          if (str.length > 8) {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          } else {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+          }
         }
       } else {
         return '--'
@@ -439,7 +443,7 @@ export default {
         if (this.instance && this.instance.hasOwnProperty(i.path) && this.currentRadio != 2) {
           i.value = this.instance[i.path]
         }
-        if (i.inputMode == 'C5') {
+        if (i.dataType == 'DATETIME') {
           if (this.instance && this.instance.hasOwnProperty(i.path)) {
             let time = this.instance[i.path]
             i.value = this.formatDate(time)
@@ -449,7 +453,7 @@ export default {
           // let source = JSON.parse(i.DataSource)
           let source = i.dataSource
           //判断输入类型
-          if (i.inputMode == 'D1L') {
+          if (i.dataType == 'ENUM') {
             let d1l = tools.formatDataSource(i.dataSource)
             d1l.forEach(k => {
               if (k.code == this.instance[i.path]) {
@@ -457,7 +461,7 @@ export default {
               }
             })
           } else if (i.inputMode == 'D2' || i.inputMode == 'C6') {
-            if (this.instance && this.instance.hasOwnProperty(i.path)) {
+            if (this.instance.hasOwnProperty(i.path)) {
               if (!Array.isArray(this.instance[i.path])) {
                 let transArray = this.instance[i.path].split(',')
                 i.value = source.filter(item => transArray.includes(item.code)).map(item => item.name).join(',')
@@ -470,70 +474,74 @@ export default {
             }
           })
         }
-        switch (i.inputMode) {
-          case "L":
-          case "L1":
-          case "L2":
-          case "M":
-            if (resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
-              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
+        switch (i.category) {
+          case "STATIC":
+            if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.path,
                 InfoPointName: i.name,
                 InfoPointCode: i.code,
-                value: i.svalue,
+                Value: i.value,
                 Visible: i.visible,
                 KeyWord: i.keyWord,
-                InputMode: i.inputMode,
-                data: i.data,
-                receivetime: i.receivetime,
-                error: i.error,
-                Unit: i.unit,
-                FirstName: i.firstName,
+                classCode: i.classCode,
+                id: i.id,
+                groupCode: i.groupCode,
+                type: i.type,
+                dataType: i.dataType
               })
             } else {
-              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
+              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
                 paths: [{
                   Path: i.path,
                   InfoPointName: i.name,
                   InfoPointCode: i.code,
-                  value: i.svalue,
+                  Value: i.value,
                   Visible: i.visible,
                   KeyWord: i.keyWord,
-                  InputMode: i.inputMode,
-                  data: i.data,
-                  receivetime: i.receivetime,
-                  error: i.error,
-                  Unit: i.unit,
-                  FirstName: i.firstName,
+                  classCode: i.classCode,
+                  id: i.id,
+                  groupCode: i.groupCode,
+                  type: i.type,
+                  dataType: i.dataType
                 }]
               }
             }
-            break;
+            break
           default:
-            if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
-              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
+            if (resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
+              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.path,
                 InfoPointName: i.name,
                 InfoPointCode: i.code,
-                Value: i.value,
+                value: i.svalue,
                 Visible: i.visible,
                 KeyWord: i.keyWord,
-                InputMode: i.inputMode,
+                data: i.data,
+                receivetime: i.receivetime,
+                error: i.error,
+                Unit: i.unit,
+                FirstName: i.firstName,
+                dataType: i.dataType
               })
             } else {
-              result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
+              resultEnergy[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
                 paths: [{
                   Path: i.path,
                   InfoPointName: i.name,
                   InfoPointCode: i.code,
-                  Value: i.value,
+                  value: i.svalue,
                   Visible: i.visible,
                   KeyWord: i.keyWord,
-                  InputMode: i.inputMode,
+                  data: i.data,
+                  receivetime: i.receivetime,
+                  error: i.error,
+                  Unit: i.unit,
+                  FirstName: i.firstName,
+                  dataType: i.dataType
                 }]
               }
             }
-
         }
       })
       this.exhibitionBaseInformation.information = result

+ 16 - 25
src/views/ledger/system/systemDetail/index.vue

@@ -59,13 +59,7 @@
 
 <script>
 import { mapGetters } from "vuex";
-import {
-  // buildingQuery,
-  deleteGeneralSys,
-  // getDataDictionary,
-  queryDictionaryHead,
-  queryLinkSys
-} from '@/api/scan/request';
+import { deleteGeneralSys, queryLinkSys } from '@/api/scan/request';
 import { getDataDictionary, queryPhysicsAllType } from "@/api/dict";
 import { buildingQuery } from '@/api/object/build';
 import cenoteTable from '@/components/ledger/system/table/cenoteTable';
@@ -347,7 +341,7 @@ export default {
       let picObject = {}
       //处理数据格式
       arr.map(i => {
-        if (i.InputMode == 'F2') {
+        if (i.dataType == 'ATTACHMENT') {
           switch (i.Path) {
             case 'infos.insuranceFile':
             case 'infos.archive':
@@ -394,7 +388,11 @@ export default {
         if (str.includes('-')) {
           return str
         } else {
-          return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          if (str.length > 8) {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2) + ":" + str.substr(10, 2) + ":" + str.substr(12, 2)
+          } else {
+            return str.substr(0, 4) + "-" + str.substr(4, 2) + "-" + str.substr(6, 2) + " " + str.substr(8, 2)
+          }
         }
       } else {
         return '--'
@@ -406,7 +404,7 @@ export default {
         if (this.instance.hasOwnProperty(i.path) && this.currentRadio != 2) {
           i.value = this.instance[i.path]
         }
-        if (i.inputMode == 'C5') {
+        if (i.dataType == 'DATETIME') {
           if (this.instance.hasOwnProperty(i.path)) {
             let time = this.instance[i.path]
             i.value = this.formatDate(time)
@@ -416,7 +414,7 @@ export default {
           // let source = JSON.parse(i.DataSource)
           let source = i.dataSource
           //判断输入类型
-          if (i.inputMode == 'D1L') {
+          if (i.dataType == 'ENUM') {
             let d1l = tools.formatDataSource(i.dataSource)
             d1l.forEach(k => {
               if (k.code == this.instance[i.path]) {
@@ -437,13 +435,8 @@ export default {
             }
           })
         }
-        switch (i.inputMode) {
-          case "L":
-          case "L1":
-          case "L2":
-          case "M":
-            break;
-          default:
+        switch (i.category) {
+          case "STATIC":
             if (result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`]) {
               result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`].paths.push({
                 Path: i.Path,
@@ -452,7 +445,6 @@ export default {
                 Value: i.value,
                 Visible: i.visible,
                 KeyWord: i.keyWord,
-                InputMode: i.inputMode,
                 data: i.data,
                 receivetime: i.receivetime,
                 error: i.error,
@@ -461,7 +453,8 @@ export default {
                 classCode: i.classCode,
                 id: i.id,
                 groupCode: i.groupCode,
-                type: i.type
+                type: i.type,
+                dataType: i.dataType
               })
             } else {
               result[`${i.firstName}${i.secondName ? '/' + i.secondName : ''}`] = {
@@ -472,7 +465,6 @@ export default {
                   Value: i.value,
                   Visible: i.visible,
                   KeyWord: i.keyWord,
-                  InputMode: i.inputMode,
                   data: i.data,
                   receivetime: i.receivetime,
                   error: i.error,
@@ -481,14 +473,13 @@ export default {
                   classCode: i.classCode,
                   id: i.id,
                   groupCode: i.groupCode,
-                  type: i.type
+                  type: i.type,
+                  dataType: i.dataType
                 }]
               }
             }
-
+            break
         }
-
-
       })
       this.exhibitionBaseInformation.information = result
       this.exhibitionCrux.allMessage = result