Browse Source

Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType

zhangyu 3 years ago
parent
commit
641456abfe

+ 1 - 1
config/index.js

@@ -11,7 +11,7 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: proxyTable["14"],
-    
+
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 28080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

+ 2 - 2
src/api/relation/api.js

@@ -176,6 +176,6 @@ export function addSource(param, success) {
 
 //查看源设备
 export function sourceQuery(param, success) {
-  let url = `${baseUrl}${dataCenter}/mep-system-calc/source/query`
-  httpUtil.postJson(url, param, success)
+  let url = `${baseUrl}${dataCenter}/mep-system-calc/source/query?calcName=${param.calcName}`
+  httpUtil.getJson(url, {}, success)
 }

+ 2 - 2
src/components/dialogs/changeRea.vue

@@ -19,12 +19,12 @@
             <el-table-column label="资产名称" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-radio :label="scope.row.id" :ref="scope.row.id" :value="scope.row.localName || scope.row.name">
-                  {{ scope.row.localName || scope.row.name }}
+                  {{ scope.row.localName }}
                 </el-radio>
               </template>
             </el-table-column>
             <el-table-column label="本地编码">
-              <template slot-scope="scope">{{ scope.row.localId || scope.row.id }}</template>
+              <template slot-scope="scope">{{ scope.row.localId }}</template>
             </el-table-column>
             <el-table-column prop="name" label="所在楼层">
               <template slot-scope="scope">

+ 1 - 1
src/components/ledger/details/detail/cruxDialog.vue

@@ -56,7 +56,7 @@ export default {
           tmp[key] = [
             ...element.paths.map(i => ({
               InfoPointCode: i.InfoPointCode,
-              KeyWord: i.KeyWord,
+              KeyWord: i.KeyWord || false,
               type: i.type,
               code: i.InfoPointCode,
               classCode: i.classCode,

+ 105 - 102
src/components/ledger/details/detail/exhibitionCrux.vue

@@ -2,62 +2,62 @@
   <section class="exhibition-crux">
     <p class="title">
       <span class="iconfont icon-juxing"></span>
-      {{exhibitionCrux.title}}
+      {{ exhibitionCrux.title }}
       <span class="icon-shezhi iconfont setting" @click="setting"></span></p>
     <div>
       <div v-if="exhibitionCrux.cruxArray.length">
-        <div class="crux-list" v-for="(item,index) in exhibitionCrux.cruxArray" :key="index">{{item.name}}:
+        <div class="crux-list" v-for="(item,index) in exhibitionCrux.cruxArray" :key="index">{{ item.name }}:
 
-        <el-popover
-          v-if="item.Path == 'equipQRCode' || item.Path == 'roomQRCode' || item.Path == 'shaftQRCode'"
-          placement="top"
-          width="360"
-          trigger="hover">
-          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{item.InfoPointName}}</p>
-          <div style="overflow:hidden;">
-            <div style="float:left;width: 60%">
-              <img
-                style="width:200px;height:200px;"
-                :src="'/image-service/common/file_get/'+ item.value +'?systemId=dataPlatform'"
-                alt="二维码"
-              >
+          <el-popover
+            v-if="item.Path == 'equipQRCode' || item.Path == 'roomQRCode' || item.Path == 'shaftQRCode'"
+            placement="top"
+            width="360"
+            trigger="hover">
+            <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ item.InfoPointName }}</p>
+            <div style="overflow:hidden;">
+              <div style="float:left;width: 60%">
+                <img
+                  style="width:200px;height:200px;"
+                  :src="'/image-service/common/file_get/'+ item.value +'?systemId=dataPlatform'"
+                  alt="二维码"
+                >
+              </div>
+              <div style="float:right;width: 40%;margin-top: 30px">
+                <span>{{ item.value }}</span>
+              </div>
             </div>
-            <div style="float:right;width: 40%;margin-top: 30px">
-              <span>{{item.value}}</span>
+            <div style="text-align: center; margin: 0">
+              <el-button type="text" size="mini" @click="handleCopy(item.value)">复制</el-button>
             </div>
-          </div>
-          <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
-          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 size="mini" style="" type="text" @click="downloadFile(pic.key)">下载</el-button>
+            <el-button slot="reference" type="text">{{ item.value ? '有' : '-' }}</el-button>
+          </el-popover>
+          <el-popover
+            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 size="mini" style="" type="text" @click="downloadFile(pic.key)">下载</el-button>
+              </div>
             </div>
-          </div>
-          <el-button slot="reference" type="text">{{item.value? '有':'-'}}</el-button>
-        </el-popover>
+            <el-button slot="reference" type="text">{{ item.value ? '有' : '-' }}</el-button>
+          </el-popover>
 
           <el-popover
-          v-else-if="item.value && item.value.length && `${item.InfoPointName}:${item.value}`.length>21"
-          placement="top"
-          width="160"
-          trigger="hover">
-          <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{item.InfoPointName}}</p>
-          <p>{{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">{{handleName(item.InfoPointName, item.value)}}</el-button>
-        </el-popover>
-        <span v-else>{{item.value}}</span>
+            v-else-if="item.value && item.value.length && `${item.InfoPointName}:${item.value}`.length>21"
+            placement="top"
+            width="160"
+            trigger="hover">
+            <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">{{ item.InfoPointName }}</p>
+            <p>{{ 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">{{ handleName(item.InfoPointName, item.value) }}</el-button>
+          </el-popover>
+          <span v-else>{{ item.value }}</span>
         </div>
       </div>
     </div>
@@ -75,70 +75,73 @@
 import cruxDialog from "./cruxDialog";
 
 export default {
-    name: "exhibition-crux",
-    props: ['exhibitionCrux','type'],
-    components: {cruxDialog},
-    data() {
-      return {
-        list: []
-      }
+  name: "exhibition-crux",
+  props: ['exhibitionCrux', 'type'],
+  components: { cruxDialog },
+  data() {
+    return {
+      list: []
+    }
+  },
+  methods: {
+    downloadFile(key) {
+      window.open("/image-service/common/file_get/" + key + "?systemId=dataPlatform")
+    },
+    setting() {
+      this.$refs.setting.dialogOpen()
+    },
+    cruxSuccess() {
+      this.$emit('cruxSuccess')
+    },
+    handleCopy(data) {
+      let oInput = document.createElement('input')
+      oInput.value = data
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('Copy')
+      this.$message.success('复制成功')
+      oInput.remove()
     },
-    methods: {
-      downloadFile(key) {
-        window.open("/image-service/common/file_get/" + key + "?systemId=dataPlatform")
-      },
-      setting() {
-        this.$refs.setting.dialogOpen()
-      },
-      cruxSuccess() {
-        this.$emit('cruxSuccess')
-      },
-      handleCopy(data) {
-        let oInput = document.createElement('input')
-        oInput.value = data
-        document.body.appendChild(oInput)
-        oInput.select()
-        document.execCommand('Copy')
-        this.$message.success('复制成功')
-        oInput.remove()
-      },
-      handleName(infoPoint, val) {
-        let value = val;
-        if (Array.isArray(value)) {
-          value = JSON.stringify(val)
-        }
-        let text = `${infoPoint}:${value}`;
-        return text.length > 21 ? value.substring(0, 21-`${infoPoint}:`.length) + '...' : value;
+    handleName(infoPoint, val) {
+      let value = val;
+      if (Array.isArray(value)) {
+        value = JSON.stringify(val)
       }
+      let text = `${infoPoint}:${value}`;
+      return text.length > 21 ? value.substring(0, 21 - `${infoPoint}:`.length) + '...' : value;
     }
   }
+}
 </script>
 
 <style lang="less" scoped>
-  .exhibition-crux {
-    padding: 10px 0;
-    /deep/ .el-button--text {
-      color: #555 !important;
-      font-size: 14px;
-    }
-    .title {
-      /*border-left: 8px solid black;*/
-      margin: 0 20px 0 10px;
-      font-weight: 600;
-      /*text-indent: 10px;*/
-      display: block;
-      overflow: hidden;
+.exhibition-crux {
+  padding: 10px 0;
 
-      .setting {
-        float: right;
-      }
+  /deep/ .el-button--text {
+    color: #555 !important;
+    font-size: 14px;
+  }
+
+  .title {
+    /*border-left: 8px solid black;*/
+    margin: 0 20px 0 10px;
+    font-weight: 600;
+    /*text-indent: 10px;*/
+    display: block;
+    overflow: hidden;
 
+    .setting {
+      float: right;
     }
-      .crux-list {
-        display: inline-block;
-        width: 315px;
-        margin-left: 20px;
-        vertical-align: text-top;
-      }
+
+  }
+
+  .crux-list {
+    display: inline-block;
+    width: 315px;
+    margin-left: 20px;
+    vertical-align: text-top;
   }
+}
 </style>

+ 15 - 13
src/components/ledger/system/dialog/addSpaceDialog.vue

@@ -24,7 +24,8 @@
             {{ scope.row.localName || scope.row.name || '' }}
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
+                         min-width="100"></el-table-column>
         <el-table-column prop :label="`所属建筑楼层`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             {{
@@ -87,7 +88,7 @@ export default {
       inSpaceType: "业务空间",
       Buildfloor: ["all"], // 选中的建筑楼层
       Spacecategory: null, // 选中的业务空间类型
-			spaceValue: [""], //记录切换成功的业务空间值
+      spaceValue: [""], //记录切换成功的业务空间值
       tableData: [],
       floorData: {}, //楼层
       spaceData: {}, //业务空间分区
@@ -122,28 +123,29 @@ export default {
     },
     //修改建筑楼层
     changeFloor(value) {
+      this.page.pageNumber = 1;
       this.Buildfloor = value;
       this.getTableData();
     },
     //修改空间类型
     changeSpace(val, space, value) {
-			if (this.selections.length) {
-				this.$confirm('关联的业务空间未保存, 是否继续?', '提示', {
+      if (this.selections.length) {
+        this.$confirm('关联的业务空间未保存, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
           this.Spacecategory = val;
-					this.spaceValue = value;
-      		this.getTableData();
+          this.spaceValue = value;
+          this.getTableData();
         }).catch(() => {
-          this.$refs.spacesel.value = this.spaceValue;  
+          this.$refs.spacesel.value = this.spaceValue;
         });
-			} else {
-				this.Spacecategory = val;
-				this.spaceValue = value;
-      	this.getTableData();
-			}
+      } else {
+        this.Spacecategory = val;
+        this.spaceValue = value;
+        this.getTableData();
+      }
     },
     getTableData() {
       let params = {
@@ -170,7 +172,7 @@ export default {
         params.data.filters += `;classCode='${this.Spacecategory}'`;
       }
       if (this.keycode != "") {
-        params.data.filters += `;name contain '${this.keycode}' or localName contain '${this.keycode}'`;
+        params.data.filters += `;localId contain '${this.keycode}' or localName contain '${this.keycode}'`;
       }
 
       unSysZoneSpace(params, res => {

+ 2 - 1
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -341,7 +341,8 @@ export default {
     //查询原末端回显数据
     handleSourceQuery() {
       let param = {
-        filters: `projectId='${this.projectId}';calcName='${this.RelationTypeName}'`
+        // filters: `projectId='${this.projectId}';calcName='${this.RelationTypeName}'`
+        calcName: this.RelationTypeName
       }
       sourceQuery(param, res => {
         this.value = []

+ 2 - 1
src/components/relation/overview/Modal/getCascader.vue

@@ -124,7 +124,8 @@ export default {
         }
       }
       let param3 = {
-        Filters: `ProjectId='${this.projectId}';CalcName='${this.RelationTypeName}'`
+        // Filters: `ProjectId='${this.projectId}';CalcName='${this.RelationTypeName}'`
+        calcName: this.RelationTypeName
 
       }
       let promise2 = new Promise((resolve, reject) => {

+ 2 - 1
src/components/relation/overview/Modal/setCascader.vue

@@ -116,7 +116,8 @@ export default {
         }
       }
       let param3 = {
-        Filters: `ProjectId='${this.projectId}';CalcName='${this.RelationTypeName}'`
+        // Filters: `ProjectId='${this.projectId}';CalcName='${this.RelationTypeName}'`
+        calcName: this.RelationTypeName
 
       }
       let promise2 = new Promise((resolve, reject) => {

+ 4 - 4
src/views/ledger/report/index.vue

@@ -386,7 +386,7 @@ export default {
             text: this.toPercent(i.gatherDynamicInfoPointCounts / i.gatherInfoPointCounts),
             val: this.dynamic
           })
-    
+
           // this.$set(this.deviceMessageData, 2, {
           //   contentValueO: '总数:',
           //   contentValueT: '自定义:',
@@ -496,10 +496,10 @@ export default {
         })
       })
 
-      // 现场验证状态占比
+      // 现场验证状态占比 taskState = 1 待验证
       let par = {
         projectId: this.projectId,
-        filters: "taskState = 0 or taskState = 1"
+        filters: "taskState = 0 or taskState = -1"
       }
       let promise2 = new Promise(resolve => {
         countEquip(par, res => {
@@ -770,7 +770,7 @@ export default {
           needCountT: this.shaftCount - res1.count,
           text: text
         })
-        console.log(this.shaft,'88888888888');
+        console.log(this.shaft, '88888888888');
       })
     }
   },