Browse Source

修改客户提出功能优化

tengmingxue 2 years ago
parent
commit
4f0924b3ff

+ 10 - 3
src/views/mbsys/collaborative/cfgFields.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2022-05-28 15:10:56
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-02-21 15:35:48
+ * @FilePath: \mbWaterService\src\views\mbsys\collaborative\cfgFields.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 const cfgFields = {
     //行文分类
     docType: [
@@ -12,9 +20,8 @@ const cfgFields = {
     ],
     //密级
     secrets: [
-        { key: 1, value: '秘密' },
-        { key: 2, value: '机密' },
-        { key: 3, value: '绝密' }
+        { key: 1, value: '公开' },
+        { key: 2, value: '不公开' }
     ]
 }
 export default cfgFields

+ 20 - 9
src/views/mbsys/collaborative/collectDocument/collectDocRegist/registerForm.vue

@@ -93,7 +93,7 @@
                 ></el-input>
               </el-descriptions-item> -->
 
-              <el-descriptions-item :span="3">
+              <!-- <el-descriptions-item :span="3">
                 <template slot="label">
                   <span style="color: red">*</span>主题内容
                 </template>
@@ -104,7 +104,7 @@
                   size="small"
                   :disabled="isOpt ? (optionType == 0 ? true : false) : true"
                 ></el-input>
-              </el-descriptions-item>
+              </el-descriptions-item> -->
 
               <el-descriptions-item :span="3" v-if="false">
                 <template slot="label"> 主送 </template>
@@ -124,8 +124,8 @@
                 ></el-input>
               </el-descriptions-item>
 
-              <el-descriptions-item>
-                <template slot="label"> 拟稿单位 </template>
+              <!-- <el-descriptions-item>
+                <template slot="label"> 来文单位 </template>
                 <el-select
                   v-model="form.useDept"
                   filterable
@@ -141,17 +141,28 @@
                     :value="item.id"
                   />
                 </el-select>
-              </el-descriptions-item>
+              </el-descriptions-item> -->
               <el-descriptions-item>
+                <template slot="label">
+                  来文单位
+                </template>
+                <el-input
+                  v-model="form.personLiable"
+                  size="small"
+                  maxlength="20"
+                  :disabled="isOpt ? (optionType == 0 ? true : false) : true"
+                ></el-input>
+              </el-descriptions-item>
+              <!-- <el-descriptions-item>
                 <template slot="label"> 拟稿人 </template>
                 <el-input
                   v-model="form.personLiable"
                   size="small"
                   disabled
                 ></el-input>
-              </el-descriptions-item>
+              </el-descriptions-item> -->
               <el-descriptions-item>
-                <template slot="label"> 拟稿时间 </template>
+                <template slot="label"> 来文时间 </template>
                 <el-date-picker
                   v-model="form.registerTime"
                   type="datetime"
@@ -302,7 +313,7 @@ export default {
         secret: "", //密级
         title: "", //标题
         fileCount: 0, //文件份数
-        themeContent: "", //主题内容
+        themeContent: "", //主题内容
         personLiable: "",
         useDept: "",
         registerTime: "",
@@ -334,7 +345,7 @@ export default {
     //如果当前状态为可编辑状态获取当前申购部门和申购人
     if (this.isOpt && JSON.stringify(this.editData) === "{}") {
       this.curUser = this.$store.state.user;
-      this.form.personLiable = this.curUser.realName;
+      //this.form.personLiable = this.curUser.realName;
       this.form.useDept = parseInt(this.curUser.departmentId);
       this.form.registerTime = parseTime(new Date(), "{y}-{m}-{d} {h}:{i}:{s}");
     } else {

+ 3 - 3
src/views/mbsys/collaborative/sendDocument/sendDocRegist/registerForm.vue

@@ -93,7 +93,7 @@
                 ></el-input>
               </el-descriptions-item> -->
 
-              <el-descriptions-item :span="3">
+              <!-- <el-descriptions-item :span="3">
                 <template slot="label">
                   <span style="color: red">*</span>主题内容
                 </template>
@@ -104,7 +104,7 @@
                   size="small"
                   :disabled="isOpt ? (optionType == 0 ? true : false) : true"
                 ></el-input>
-              </el-descriptions-item>
+              </el-descriptions-item> -->
 
               <el-descriptions-item :span="3" v-if="false">
                 <template slot="label"> 主送 </template>
@@ -302,7 +302,7 @@ export default {
         secret: "", //密级
         title: "", //标题
         fileCount: 0, //文件份数
-        themeContent: "", //主题内容
+        themeContent: "", //主题内容
         personLiable: "",
         useDept: "",
         registerTime: "",

+ 2 - 2
src/views/mbsys/components/upload.vue

@@ -9,7 +9,7 @@
             <div slot="tip" class="el-upload__tip" style="width: calc(100% - 200px); display: inline-block" v-clock>
               支持上传{{fileTypes.join(',')}}等文件,单个文件大小不超过{{
                 maxFileSize
-              }}M。
+              }}M,最多可上传{{ limit }}份附件
             </div>
           </el-upload>
         </el-col>
@@ -38,7 +38,7 @@ export default {
   data() {
     return {
       limit: 5, //限制文件个数
-      maxFileSize: 10, //最大文件大小
+      maxFileSize: 20, //最大文件大小
       //fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}],
       fileList: [],
       form: {},

+ 9 - 1
src/views/mbsys/projectmanage/config.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: tengmingxue 1473375109@qq.com
+ * @Date: 2022-05-18 09:52:59
+ * @LastEditors: tengmingxue 1473375109@qq.com
+ * @LastEditTime: 2023-02-21 14:31:27
+ * @FilePath: \mbWaterService\src\views\mbsys\projectmanage\config.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 export const projectConfig = {
     //工单状态
     surveyResults: [
@@ -31,7 +39,7 @@ export const projectConfig = {
         },
         {
             value: 3,
-            label: "工程合同"
+            label: "工程施工合同"
         },
     ],
     //物资类型

+ 32 - 0
src/views/mbsys/projectmanage/projectmanage/contractapprove/acceptance.vue

@@ -91,6 +91,33 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="审计批复">
+              <el-select
+                v-model="form.isAudit"
+                size="small"
+                style="width: 100%"
+                :disabled="isOpt ? (optionType == 0 ? true : false) : true"
+              >
+                <el-option
+                  v-for="item in optionPro"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="审计后价格" prop="auditedPrice">
+              <el-input
+                v-model.number="form.auditedPrice"
+                :disabled="isOpt ? (optionType == 0 ? true : false) : true"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="16">
             <el-form-item label="问题说明">
               <el-input
@@ -269,6 +296,8 @@ export default {
         endTime: "", //实际完工时间
         finalDate: "", //最终验收日期
         opinionTwo: "", //问题说明
+        isAudit:'',    //是否审计批复
+        auditedPrice:'',//审计后价格
         remark: "", //备注
       },
       files: [], //上传附件
@@ -329,6 +358,9 @@ export default {
               processNodeVos[0].processJournalVO.dataState; //工程完工
             this.form["schedule"] = processNodeVos[0].processJournalVO.schedule; //实际工期
             this.form["typeOne"] = processNodeVos[0].typeOne; //是否遗留问题
+            this.form["isAudit"] = processNodeVos[0]?.isAudit; //是否审计批复
+            this.form["auditedPrice"] = processNodeVos[0]?.auditedPrice; //审计后价格
+
             this.form["opinionTwo"] = processNodeVos[0].opinionTwo; //问题说明
             this.form["startTime"] =
               processNodeVos[0].processJournalVO.startTime; //实际开工时间

+ 4 - 5
src/views/mbsys/projectmanage/projectmanage/contractapprove/surveyForm.vue

@@ -34,7 +34,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="合同编号" prop="contractNumber">
+            <el-form-item label="合同编号">
               <el-input
                 v-model="form.contractNumber"
                 size="small"
@@ -52,7 +52,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="合同开始时间" prop="startTime">
+            <el-form-item label="合同签订时间" prop="startTime">
               <el-date-picker
                 v-model="form.startTime"
                 type="date"
@@ -89,7 +89,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="用户签订人">
+            <el-form-item label="用户签订人或公司">
               <el-input
                 v-model="form.firstStaff"
                 size="small"
@@ -309,7 +309,7 @@ export default {
       rules: {
         contractType: [{ required: true, message: "请选择合同类型" }],
         contractName: [{ required: true, message: "请填写合同名称" }],
-        contractNumber: [{ required: true, message: "请填写合同编号" }],
+        // contractNumber: [{ required: true, message: "请填写合同编号" }],
         actualSum: [
           { required: true, message: "请填写合同金额" },
           { type: "number", message: "合同金额必须为数字值" },
@@ -526,7 +526,6 @@ export default {
     submitForm() {
       let flag = false;
       const examine = this.$refs["examine"].submitForm();
-      // console.log("5555555555", examine);
       if (examine.headleState === 1) {
         this.$refs["form"].validate((valid) => {
           flag = valid;

+ 20 - 3
src/views/mbsys/projectmanage/projectmanage/projectacceptance/registerForm.vue

@@ -83,7 +83,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="证件类型">
               <el-select
                 v-model="form.documentType"
@@ -102,8 +102,8 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          </el-col> -->
+          <!-- <el-col :span="8">
             <el-form-item label="证件号码">
               <el-input
                 v-model="form.idNumber"
@@ -111,6 +111,15 @@
                 :disabled="isOpt ? (optionType == 0 ? true : false) : true"
               ></el-input>
             </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="项目经理">
+              <el-input
+                v-model="form.idNumber"
+                size="small"
+                :disabled="isOpt ? (optionType == 0 ? true : false) : true"
+              ></el-input>
+            </el-form-item>
           </el-col>
           <!-- <el-col :span="8">
             <el-form-item label="资料上传">
@@ -328,6 +337,14 @@ export default {
           label: "维修",
           value: 1,
         },
+        {
+          label: "新建",
+          value: 2,
+        },
+        {
+          label: "续建",
+          value: 3,
+        },
       ],
       options3: [
         {

+ 2 - 2
src/views/zhpt/hiddendangermanage/hiddendangerReport/widget.vue

@@ -220,7 +220,7 @@ export default {
         pointLat: undefined,
         pointPlace: undefined, //隐患片区
         checkMan: "",
-        isbuild: true, //是否进入工地
+        isbuild: false, //是否进入工地
         buildId: "", //工地编号
         fileList: undefined
       },
@@ -773,7 +773,7 @@ export default {
       getHiddenDangerCheckMan({size:100000}).then(res => {
         // console.log("登录用户对应的审核人:"+JSON.stringify(res))
         // this.checkMen = res.result
-        this.checkMen = res.result.records
+        this.checkMen = res.result
       })
       // getHiddenDangerCheckMan().then(res => {
       //   // console.log("登录用户对应的审核人:"+JSON.stringify(res))

+ 96 - 70
src/views/zhpt/scada/scadaCraftMap/widget.vue

@@ -153,9 +153,9 @@ import { allConfig2, allConfig } from "./craftConfig";
 import siteIndex from "./siteIndex";
 import mxgraph from "mxgraph";
 import request from "@/utils/request"; // 请求
-import { parseTime } from '@/utils/index'
+import { parseTime } from "@/utils/index";
 import Echarts from "echarts";
-import { getScadaAlarmDataPage } from "@/api/mbsys/scada"
+import { getScadaAlarmDataPage } from "@/api/mbsys/scada";
 export default {
   name: "CraftMap2",
   components: { Echarts },
@@ -179,7 +179,7 @@ export default {
       isAlarm: false,
       dontShow: true,
       twinkle: null,
-      indexCodes:[],
+      indexCodes: [],
     };
   },
   watch: {
@@ -199,14 +199,14 @@ export default {
     },
   },
 
-  created(){
-    this.indexCodes = [] //存储配置的指标编码
-    for(var i=0;i<siteIndex.deviceValue.length;i++){
-      const deviceValue = siteIndex.deviceValue[i]
-      if(deviceValue){
-        deviceValue.value.map(item=>{
-          if(item.itnm && item.itnm!== '')this.indexCodes.push(item.itnm)
-        })
+  created() {
+    this.indexCodes = []; //存储配置的指标编码
+    for (var i = 0; i < siteIndex.deviceValue.length; i++) {
+      const deviceValue = siteIndex.deviceValue[i];
+      if (deviceValue) {
+        deviceValue.value.map((item) => {
+          if (item.itnm && item.itnm !== "") this.indexCodes.push(item.itnm);
+        });
       }
     }
   },
@@ -453,7 +453,8 @@ export default {
                     '<li class="tf-li" data="' +
                     (text.itnm || "") +
                     '"><div class="' +
-                    (node.class || "title") + " tfStyleTitle"+
+                    (node.class || "title") +
+                    " tfStyleTitle" +
                     '"><span>' +
                     text.name +
                     '</span></div><span class="value tfStyle">' +
@@ -761,7 +762,8 @@ export default {
                     '<li class="tf-li" data="' +
                     (text.itnm || "") +
                     '"><div class="' +
-                    (node.class || "title") + " tfStyleTitle" +
+                    (node.class || "title") +
+                    " tfStyleTitle" +
                     '"><span>' +
                     text.name +
                     '</span></div><span class="value tfStyle">' +
@@ -905,24 +907,27 @@ export default {
         }
       });
 
-      this.getAlarmData()
+      this.getAlarmData();
     },
 
-    getAlarmData(){
-      if(this.indexCodes.length < 1) return;
-      const frontHelfTime = parseTime(new Date(new Date().getTime() - 24 * 60 * 30 * 1000),'{y}-{m}-{d} {h}:{i}:{s}');
-      const nowTime = parseTime(new Date(),'{y}-{m}-{d} {h}:{i}:{s}');
+    getAlarmData() {
+      if (this.indexCodes.length < 1) return;
+      const frontHelfTime = parseTime(
+        new Date(new Date().getTime() - 24 * 60 * 30 * 1000),
+        "{y}-{m}-{d} {h}:{i}:{s}"
+      );
+      const nowTime = parseTime(new Date(), "{y}-{m}-{d} {h}:{i}:{s}");
       const params = {
-        codes:this.indexCodes.toString(),   //指标编码
-        status:0,   //处理状态未处理
-        start:frontHelfTime,
-        end:nowTime,
-        current:1,
-        size:20,
-      }
-      getScadaAlarmDataPage(params).then(res=>{
-
-      }).catch(ex=>{})
+        codes: this.indexCodes.toString(), //指标编码
+        status: 0, //处理状态未处理
+        start: frontHelfTime,
+        end: nowTime,
+        current: 1,
+        size: 20,
+      };
+      // getScadaAlarmDataPage(params)
+      //   .then((res) => {})
+      //   .catch((ex) => {});
     },
 
     setSide() {
@@ -954,45 +959,66 @@ export default {
           this.$nextTick(loadInfo);
         };
         var loadInfo = () => {
-          //this.loading = true;
-          request({
-            url: "/tofly-scada/scada/app/data",
-            method: "post",
-            data: {
-              type: 1,
-            },
-          }).then((res) => {
-            if (res.code == 1) {
-              res = res.result;
-              for (var item in res) {
-                var di = res[item];
-                if (di.allocations) {
-                  for (const i in di.allocations) {
-                    var t = di.allocations[i].variableCode;
-                    if (infos.hasOwnProperty(t)) {
-                      let n = di.allocations[i]
-                        ? di.allocations[i].scada.value
-                        : "null";
-                      if (n == "null") n = "-";
-                      if (t == "S7.300.1#F_POWER_FAULT") n = n == "1" ? "开" : "关";
-                      if (t == "S7.300.1#F_OPEN") n = n == "1" ? "开" : "关";
-                      if (t == "S7.300.2#F_OPEN") n = n == "1" ? "开" : "关";
-                      if (t == "S7.300.2#F_POWER_FAULT") n = n == "1" ? "开" : "关";
-                      if (t == "S7.300.CHU_SS") n = parseFloat(n).toFixed(3);
-                      if (t == "S7.300.CHU_CL") n = parseFloat(n).toFixed(3);
-                      if (t == "S7.300.CHU_FT") n = parseFloat(n).toFixed(3);
-                      if (t == "S7.300.1#QSYW") n = parseFloat(n).toFixed(3);
-                      if (t == "S7.300.2#QSYW") n = parseFloat(n).toFixed(3);
-                      infos[t].innerHTML = n;
+          try {
+            //this.loading = true;
+            request({
+              url: "/tofly-scada/scada/app/data",
+              method: "post",
+              data: {
+                type: 1,
+              },
+            })
+              .then((res) => {
+                if (res && res.code && res.code == 1) {
+                  res = res.result;
+                  for (var item in res) {
+                    var di = res[item];
+                    if (di.allocations) {
+                      for (const i in di.allocations) {
+                        var t = di.allocations[i].variableCode;
+                        if (infos.hasOwnProperty(t)) {
+                          let n = di.allocations[i]
+                            ? di.allocations[i].scada.value
+                            : "null";
+                          if (n == "null") n = "-";
+                          if (t == "S7.300.1#F_POWER_FAULT")
+                            n = n == "1" ? "开" : "关";
+                          if (t == "S7.300.1#F_OPEN")
+                            n = n == "1" ? "开" : "关";
+                          if (t == "S7.300.2#F_OPEN")
+                            n = n == "1" ? "开" : "关";
+                          if (t == "S7.300.2#F_POWER_FAULT")
+                            n = n == "1" ? "开" : "关";
+                          if (t == "S7.300.CHU_SS")
+                            n = parseFloat(n).toFixed(3);
+                          if (t == "S7.300.CHU_CL")
+                            n = parseFloat(n).toFixed(3);
+                          if (t == "S7.300.CHU_FT")
+                            n = parseFloat(n).toFixed(3);
+                          if (t == "S7.300.1#QSYW")
+                            n = parseFloat(n).toFixed(3);
+                          if (t == "S7.300.2#QSYW")
+                            n = parseFloat(n).toFixed(3);
+                          infos[t].innerHTML = n;
+                        }
+                      }
                     }
                   }
+                  this.nextDo = setTimeout(loadInfo, 1000 * 10); //1分钟一次
+                  this.setAlarm(res, infos);
+                } else {
+                  this.$message.error("获取指标失败:" + res.message);
+                  this.nextDo = setTimeout(loadInfo, 1000 * 10); //1分钟一次
                 }
-              }
-              this.nextDo = setTimeout(loadInfo, 1000 * 10); //1分钟一次
-              this.setAlarm(res, infos);
-            } else this.$message.error("获取指标失败:" + res.message);
-            //this.loading = false;
-          });
+                //this.loading = false;
+              })
+              .catch((ex) => {
+                this.$message.error("连接异常:" + ex);
+                this.nextDo = setTimeout(loadInfo, 1000 * 10); //1分钟一次
+              });
+          } catch (ex) {
+            this.nextDo = setTimeout(loadInfo, 1000 * 10); //1分钟一次
+          }
         };
         this.$nextTick(loadSite);
       }
@@ -1268,15 +1294,15 @@ export default {
   font-size: 17px;
 }
 
->>>.tfStyleTitle{
+>>> .tfStyleTitle {
   font-size: 24px !important;
-  margin-bottom:10px !important;
+  margin-bottom: 10px !important;
 }
->>>.tfStyle{
+>>> .tfStyle {
   font-size: 24px !important;
-  margin-bottom:10px !important;
+  margin-bottom: 10px !important;
 }
->>>.tf-li{
-  margin-bottom:16px !important;
+>>> .tf-li {
+  margin-bottom: 16px !important;
 }
 </style>