Browse Source

Merge branch 'dataType' of http://39.106.8.246:3003/web/adm into dataType

YaolongHan 4 years ago
parent
commit
007366de9c

+ 4 - 3
config/index.js

@@ -211,7 +211,8 @@ module.exports = {
       },
       '/api': {
         // target: 'http://192.168.64.17:28888/',
-        target: 'http://192.168.64.14:28888/',
+        // target: 'http://192.168.64.14:28888/',
+        target: 'http://39.102.40.239:8080/',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"
@@ -478,8 +479,8 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    // assetsPublicPath: '/adm/',// 39 配置
-    assetsPublicPath: '/',
+    assetsPublicPath: '/adm/',// 39 配置
+    // assetsPublicPath: '/',
 
 
     /**

+ 2 - 2
config/prod.env.js

@@ -1,9 +1,9 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_URL: '"http://192.168.64.14"', //测试iframe地址
+  // BASE_URL: '"http://192.168.64.14"', //测试iframe地址
   // BASE_URL: '"http://192.168.64.18"', //测试iframe地址
-//   BASE_URL: '"http://39.102.40.239"', //测试iframe地址
+  BASE_URL: '"http://39.102.40.239"', //测试iframe地址
   SSO_SERVER: '"http://mbi.sagacloud.cn"', //测试环境
   // MQTT_SERVICE: '"ws://39.102.40.239:61614/stomp/"' //MQ测试环境地址
   MQTT_SERVICE: '"ws://192.168.64.14:61614/stomp/"' //MQ测试环境地址

+ 6 - 0
src/components/dialogs/list/filesDialog.vue

@@ -121,6 +121,12 @@ export default {
           case 'infos.supplierContract': //供应合同
             this.$emit("changeFile", info, this.firmDataType, file)
             break
+          case 'infos.designIDGraph': //安装图纸
+            this.$emit("changeFile", info, this.firmDataType, file)
+            break
+          case 'infos.fanCharacterCurve': //供应合同
+            this.$emit("changeFile", info, this.firmDataType, file)
+            break
         }
       } else {
         this.$emit("changeFile", file, this.firmDataType)

+ 13 - 37
src/components/ledger/handsontables/device.vue

@@ -42,7 +42,7 @@
          v-show="!mess.deviceId && (!tableData || !tableData.length)">
       <p>
         <i class="icon-wushuju iconfont"></i>
-        请选择设备
+        请选择设备类别
       </p>
     </div>
 
@@ -958,6 +958,8 @@ export default {
       arr.map(i => {
         if (i.path == val) {
           enclosure = i.value;
+        } else {
+          enclosure = []
         }
       });
       return enclosure;
@@ -967,123 +969,99 @@ export default {
       switch (val) {
         case "infos.insuranceFile": //保险文件
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.archive": //设备文档
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.checkReport": //安装质检报告
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.maintainManual": //维修保养手册
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.approachingAcceptance": //进场验收单
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.acceptanceReport": //验收报告
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.operationManual": //操作说明书
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.originalCertificate": //原厂证明
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.testReport": //检测报告
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.productCertification": //产品合格证
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.installInstruction": //安装说明书
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.drawing": //设备图纸
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.installDrawing": //安装图纸
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.supplierContract": //供应合同
           this.filesArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadFiles = true;
           break;
         case "infos.installPic"://安装照片
           this.imgsArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadImgs = true;
           break;
         case "infos.nameplate"://设备铭牌照片
           this.imgsArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.uploadImgs = true;
           break;
         case "infos.pic"://设备照片
           this.picsArr = this.forValue(this.newEnclosure, val)
-            ? this.forValue(this.newEnclosure, val)
-            : [];
           this.infoType = val;
           this.myDialog.pic = true;
           break;
+        case "infos.designIDGraph": //设计工况空调机组处理过程焓湿图(F2)
+          this.filesArr = this.forValue(this.newEnclosure, val)
+          this.infoType = val;
+          this.myDialog.uploadFiles = true;
+          break;
+        case "infos.fanCharacterCurve": //风机性能曲线(F1)
+          this.filesArr = this.forValue(this.newEnclosure, val)
+          this.infoType = val;
+          this.myDialog.uploadFiles = true;
+          break;
       }
     },
     getInfors(infos, row, el) {
@@ -1310,7 +1288,6 @@ export default {
     //上传文件弹窗触发事件
     fileChange(keys, type, file) {
       if (type === "dialog") {
-        // this.information = keys
         this.newEnclosure.forEach(i => {
           if (i.path == keys) {
             this.$set(i, "value", file);
@@ -1324,7 +1301,6 @@ export default {
     //上传图片弹窗触发事件
     imgChange(keys, type, file) {
       if (type === "dialog") {
-        // this.information = keys
         this.newEnclosure.forEach(i => {
           if (i.path == keys) {
             this.$set(i, "value", file);

+ 1 - 1
src/components/model/file/changeFolderName.vue

@@ -66,7 +66,7 @@ export default {
               { Name: this.ruleForm.name, Id: this.currentFolderId },
               () => {
                 this.$message({
-                  message: "模型文件夹创建成功",
+                  message: "模型文件夹修改成功",
                   type: "success"
                 });
                 // 重新获取文件夹列表

+ 2 - 2
src/components/relation/overview/CardList.vue

@@ -100,7 +100,7 @@
                   <span
                     v-show="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{relation.computingTime}}</span>
                   <el-tooltip
-                    content="启动计算"
+                    :content="relation.computationalState === 2 ? '关系变更,清重新计算':'启动计算'"
                     placement="top"
                   >
                     <el-badge
@@ -109,7 +109,7 @@
                     >
                       <el-button
                         @click="computed(relation)"
-                        :disabled="!relation.source && !relation.automatic"
+                        :disabled="!relation.source && !relation.automatic "
                         circle
                         type="primary"
                         plain

+ 7 - 69
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -29,43 +29,6 @@
       >
         <p class="font-big">{{values.existComputed}}</p>
         <p class="exist-title">{{values.existTitle}}</p>
-
-        <!--        <getCascader :RelationTypeName="RelationTypeName" :number="number"/>-->
-        <!--        <el-row :span="24" style="margin-top: 10px">-->
-        <!--          <el-col :span="8">-->
-        <!--            <p class="demonstration">{{values.originEquipment}}</p>-->
-        <!--            <el-select v-model="deviceValue" multiple placeholder="请选择">-->
-        <!--              <el-option-->
-        <!--                v-for="item in deviceGroup"-->
-        <!--                :key="item.value"-->
-        <!--                :label="item.label"-->
-        <!--                :value="item.value">-->
-        <!--              </el-option>-->
-        <!--            </el-select>-->
-        <!--            <el-cascader-->
-        <!--                :key="isResouceShow"-->
-        <!--                :options="list"-->
-        <!--                v-model="ops"-->
-        <!--                :props="props"-->
-        <!--                @change="sourceOptions"-->
-        <!--                collapse-tags-->
-        <!--                clearable-->
-        <!--            />-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--            <p class="demonstration">{{values.endEquipment}}</p>-->
-
-        <!--            <el-cascader-->
-        <!--                :options="list"-->
-        <!--                v-model="filterOps"-->
-        <!--                :key="isResouceShow"-->
-        <!--                :props="props"-->
-        <!--                @change="endOptions"-->
-        <!--                collapse-tags-->
-        <!--                clearable-->
-        <!--            />-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
         <el-row :gutter="20" style="margin-bottom: 20px">
           <el-col :span="12">
             <p>源端设备类:</p>
@@ -77,8 +40,8 @@
               disabled
             >
               <el-option
-                v-for="item in setOriginOption"
-                :key="item.value"
+                v-for="(item,index) in setOriginOption"
+                :key="index"
                 :label="item.label"
                 :value="item.value"
                 disabled
@@ -93,8 +56,8 @@
               :props="props"
             >
               <el-option
-                v-for="item in setEndOptions"
-                :key="item.value"
+                v-for="(item,index) in setEndOptions"
+                :key="index"
                 :label="item.label"
                 :value="item.value"
                 disabled
@@ -116,23 +79,6 @@
         </footer>
       </div>
     </el-dialog>
-    <!--设定设备对象源/末端-->
-    <!--    <el-dialog-->
-    <!--        :title="values.title"-->
-    <!--        :visible.sync="dialogEquipment"-->
-    <!--    >-->
-    <!--      <span class="font-big">{{values.underDesign}}</span>-->
-    <!--      <footer-->
-    <!--          slot="footer"-->
-    <!--          class="dialog-footer"-->
-    <!--      >-->
-    <!--        <el-button-->
-    <!--            type="primary"-->
-    <!--            @click="dialogEquipment = false"-->
-    <!--        >{{values.confirm}}-->
-    <!--        </el-button>-->
-    <!--      </footer>-->
-    <!--    </el-dialog> -->
     <el-dialog
       :title="values.title"
       :visible.sync="dialogEquipment"
@@ -171,17 +117,6 @@
           </el-select>
         </el-col>
       </el-row>
-      <!--      <setCascader @change="changeCader" :RelationTypeName="RelationTypeName"/>-->
-      <!--      <el-row :span="24" style="margin-top: 15px">-->
-      <!--        <el-col :span="8">-->
-      <!--          <p class="">{{values.originEquipment}}</p>-->
-      <!--          <el-select v-model="assetValue" placeholder="请选择" clearable filterable size="small" @change="changeVal">-->
-      <!--            <el-option v-for="item in assetOptions" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>-->
-      <!--          </el-select>-->
-
-      <!--        </el-col>-->
-      <!--      </el-row>-->
-
       <footer
         slot="footer"
         class="dialog-footer"
@@ -443,10 +378,13 @@
       },
 
       handleAddSource() { //保存设备类
+        debugger
+        console.log(this.sourceList)
         if (this.sourceList.length) {
           let params = {
             content: this.sourceList
           }
+          return
           addSource(params, res => {
             this.$message.success('保存成功')
           })

+ 16 - 4
src/components/relation/relationShip/Modal/addRelationShip.vue

@@ -65,7 +65,7 @@
               :key="index"
               :prop="`codeList.${index}.value`"
               :rules="rules.codeList"
-              :error="fromError"
+              :error="item.fromError"
             >
               <el-input
                 v-model="item.value"
@@ -157,7 +157,9 @@ export default {
         ruleForm: {
           main: '',
           codeList: [{
-            value: ''
+            value: '',
+            fromError: '',
+            key: +new Date()
           }]
         },
         rules: {
@@ -187,7 +189,8 @@ export default {
       addCode() {
         this.ruleForm.codeList.push({
           value: '',
-          key: Date.now()
+          key: Date.now(),
+          fromError: ''
         })
       },
       removeCode(item) {
@@ -202,6 +205,7 @@ export default {
           if (valid) {
             let arr = []
             for(let item  of this.ruleForm.codeList) {
+              item.fromError = ''
               if(item.value) {
                 arr = arr.concat(item.value)
               }
@@ -220,7 +224,15 @@ export default {
                   // this.mainError = res.data.Message
                   this.$nextTick(()=>{this.mainError = res.data.message})
                 } else if(res.data.errorType == 2) {
-                  this.$nextTick(()=>{this.fromError = res.data.message})
+                  const str = res.data.message.split(':')
+                  this.$nextTick(()=>{
+                    this.ruleForm.codeList.forEach(t => {
+                      if (str.length > 1 && t.value == str[0]) {
+                        t.fromError = res.data.message;
+                        t.key = +new Date()
+                      }
+                    })
+                  })
                 } else {
                   this.$message.error(res.data.message);
                 }

+ 1 - 1
src/framework/layout/layout-store.js

@@ -26,7 +26,7 @@ export default {
     },
     projectId: 'Pj1101051029',
     group_code: '',
-    projects: project["14"],
+    projects: project["39"],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     secret: "saga123456", //项目密码

+ 5 - 0
src/framework/layout/project.js

@@ -6,6 +6,11 @@ const project = {
       pwd: "saga123456",
       group_code: "HR"
     }, {
+      id: "Pj3702120002",
+      name: "青岛港务局航运中心",
+      pwd: "saga123456",
+      group_code: "QD"
+    }, {
       id: "Pj4403050002",
       name: "深圳万象天地",
       pwd: "saga123456",

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

@@ -22,7 +22,7 @@
       </div>
     </div>
     <el-row class="center">
-      <el-button type="primary" size="medium" @click.prevent.once="handleCreateTableData" class="create_button">创建设备</el-button>
+      <el-button type="primary" size="medium" @click.once="handleCreateTableData" class="create_button" :disabled="createDisable">创建设备</el-button>
     </el-row>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
@@ -122,6 +122,7 @@ export default {
       firmId: "", //品牌型号所需字段--族id三位编码(传设备类id或部件类id)
       buildFloorData: [],
       floorFlag: true,
+      createDisable: false
     };
   },
   computed: {
@@ -267,12 +268,14 @@ export default {
       //     });
       //   }
       // }
+      this.createDisable = true;
       //待接口修改为关联创建即可修改
       let param = {
         cascade: [],
         content: newData
       }
       createEquipAndProperty(param, res => {
+        this.createDisable = false;
         this.$message.success('创建成功')
         session.remove("deviceAddData")
         this.$router.push({
@@ -335,7 +338,7 @@ export default {
         type: "checkbox",
         checkedTemplate: 1,
         uncheckedTemplate: 0,
-        data: "Checked",
+        data: "checked",
         label: {
           position: "after"
         }
@@ -473,6 +476,9 @@ export default {
             this.$message("此设备没有设备二维码");
           }
           break;
+        // 同时创建资产
+        case 'checked':
+          return
         //关联系统
         case 'linkSystem':
           if (!this.onlyRead) {