1

config/index.js

@@ -63,7 +63,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: '127.0.0.1', // can be overwritten by process.env.HOST
     port: 8088, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/closeProblem/index.js

@@ -102,7 +102,7 @@ export function saveStopLongSolution(object) {
 //  停机问题-获取需要解决问题数量
 export function getIssueUnFinished(object) {
   return request({
-    url: '/issue/getIssueUnFinished',
+    url: '/issue/getUnFinishedIssue',
     method: 'post',
     data: object,
     type: 'JSON'

src/api/dictionary/dictionary.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 import download from '@/utils/download'
+import {baseUrl} from '@/utils/allUrl'
 //  获取区域
 export function getRegion(object = {}) {
   return request({
@@ -18,6 +19,15 @@ export function getProjects(object = {}) {
     type: 'JSON'
   })
 }
+//  获取措施状态
+export function getSolutionStatusVo(object = {}) {
+  return request({
+    url: '/issue/getSolutionStatusVo',
+    method: 'post',
+    data: object,
+    type: 'JSON'
+  })
+}
 //  获取责任部门
 export function getDepts(object = {}) {
   return request({
@@ -129,7 +139,7 @@ export function getPrincipaIds4dept(object = {}) {
 //  文件上传
 export function uploadOne(object = {}) {
   return request({
-    url: 'http://81.70.84.72:30045/file/uploadOne',
+    url: baseUrl + ':30045/file/uploadOne',
     method: 'post',
     data: object,
     type: 'JSON'

src/router/index.js

@@ -6,7 +6,14 @@ Vue.use(Router)
  */
 
 export default new Router({
-  routes: [{
+  routes: [
+	// {
+	//     path: '/',
+	//     name: '',
+	//     // component: index,
+	//     redirect: '/qualityProblemList'
+	// },
+	{
     path: '/closeProblemList',
     name: '停机问题',
     component: () => import('@/views/closeProblem/list'),

src/utils/allUrl.js

@@ -0,0 +1,3 @@
+// export const baseUrl = "http://39.100.230.190"
+export const baseUrl = "http://81.70.84.72"
+// export const baseUrl = "http://172.18.0.24"

src/utils/request.js

@@ -5,7 +5,7 @@ import {
 } from 'vant';
 import Router from '../router'
 import store from '@/store'
-
+import {baseUrl} from '@/utils/allUrl'
 /**
  * 使用自定义配置新建一个 axios 实例
  * baseURL = 请求路径
@@ -13,7 +13,8 @@ import store from '@/store'
  */
 const request = axios.create({
   // baseURL: "http://81.70.84.72:40046/",
-  baseURL: "http://39.100.230.190:30046/",
+  baseURL: baseUrl+":30046/",
+  // baseURL: "http://172.18.0.24:30046/",
   timeout: process.env.TIME_OUT
 })
 let spinTime = 0

src/views/closeProblem/add.vue

@@ -102,7 +102,7 @@
           value-text-align="left"
         >
         </popup-picker>
-        <cell value-align="left" title="停机时长">
+        <cell value-align="left" title="停机时长" inline-desc="(分钟)">
           <van-stepper :min="1" button-size="20px" v-model="form.tjsc" />
         </cell>
         <x-input
@@ -337,14 +337,13 @@ export default {
     },
     asyncBeforeRead(file) {
       return new Promise((resolve, reject) => {
-        if (file.type !== "image/jpeg") {
+        if (file.type !== "image/png" &&  file.type !== "image/jpeg" ) {
           this.$toast("请上传 jpg 格式图片");
           reject();
         } else if (this.filesList.length == 9) {
           this.$toast("图片数量已到达上限");
           reject();
         } else {
-          console.log(file);
           let formdata = new FormData();
           formdata.append("file", file);
           console.log(formdata.get("file"));
@@ -485,7 +484,7 @@ export default {
         areaId: Number(this.form.area[0]),
         departmentId: Number(this.form.zrbm[0]),
         detail: this.form.wtms,
-        partId: Number(this.form.lj[0]),
+        partId: this.form.lj[0],
         projectId: Number(this.form.xm[0]),
         rankId: Number(this.form.rank[0]),
         sqpTypeId: Number(this.form.SQP[0]),

src/views/closeProblem/edit.vue

@@ -134,7 +134,7 @@
               v-model="form.wtms"
             >
             </x-input>
-            <cell value-align="left" title="停机时长">
+            <cell value-align="left" title="停机时长" inline-desc="(分钟)">
               <van-stepper
                 :disabled="permission != '0' || status != 0"
                 :min="1"
@@ -909,7 +909,7 @@ export default {
         areaId: Number(this.form.area[0]),
         departmentId: Number(this.form.zrbm[0]),
         detail: this.form.wtms,
-        partId: Number(this.form.lj[0]),
+        partId: this.form.lj[0],
         projectId: Number(this.form.xm[0]),
         rankId: Number(this.form.rank[0]),
         sqpTypeId: Number(this.form.SQP[0]),

src/views/closeProblem/list.vue

@@ -124,7 +124,7 @@
                   </div>
                   <div class="line">描述：{{ item.detail }}</div>
                   <!-- <div class="line">
-                    
+
                   </div> -->
                 </div>
                 <!-- <div class="listRight">
@@ -168,6 +168,20 @@
             我的任务
           </div>
         </div>
+        <p class="popTitle2">措施状态</p>
+        <div class="selectGroup">
+          <group gutter="0" style="margin-bottom: 10px; width: 100%">
+            <popup-picker
+              show-name
+              title=""
+              placeholder="请选择"
+              :data="csList"
+              v-model="filter.cs"
+              value-text-align="left"
+            >
+            </popup-picker>
+          </group>
+        </div>
         <p class="popTitle2">责任部门</p>
         <div class="selectGroup">
           <group gutter="0" style="margin-bottom: 10px; width: 100%">
@@ -320,6 +334,7 @@ export default {
         my: false,
         tjlx: [],
         tjfz: [],
+        cs: [],
         zrbm: [],
         qy: [],
         gw: [],
@@ -342,6 +357,14 @@ export default {
           },
         ],
       ],
+      csList: [
+       [
+         {
+           name: "无内容",
+           value: "0",
+         },
+       ],
+      ],
       zrbmList: [
         [
           {
@@ -394,13 +417,31 @@ export default {
     }
     this.api
       .getIssueUnFinished({
-        issueType: 0,
+        id: 0,
       })
       .then((res) => {
         if (res.status == 20000) {
           this.unFinish = res.data;
         }
       });
+    // 措施状态下拉列
+    this.api.getSolutionStatusVo().then((res) => {
+      if (res.status == 20000) {
+        if (res.data.length == 0) {
+          this.$set(this.csList, 0, [
+            {
+              name: "无内容",
+              value: "0",
+            },
+          ]);
+          return false;
+        }
+        for (let i in res.data) {
+          res.data[i].value = String(res.data[i].id);
+        }
+        this.$set(this.csList, 0, res.data);
+      }
+    })
     // 停机类型下拉列
     this.api.getStopType().then((res) => {
       if (res.status == 20000) {
@@ -532,6 +573,7 @@ export default {
     reset() {
       this.$set(this.filter, "gw", []);
       this.$set(this.filter, "qy", []);
+      this.$set(this.filter, "cs", []);
       this.$set(this.filter, "rank", []);
       this.$set(this.filter, "sqp", []);
       this.$set(this.filter, "tjfz", []);
@@ -652,6 +694,7 @@ export default {
               _this.$toast("删除成功");
               _this.onRefresh();
             } else {
+              _this.$toast(res.message);
             }
           });
         })
@@ -681,6 +724,7 @@ export default {
         stopGroupName: this.filter.tjfz[0],
         longtimeDepartmentId: this.filter.zrbm[0],
         shorttimeDepartmentId: this.filter.zrbm[0],
+        issueSolutionStatus: parseInt(this.filter.cs[0])
       };
       if (this.filter.my) {
         postData.myJob = 1;

src/views/qualityProblem/add.vue

@@ -278,6 +278,7 @@
       },
       //保存按钮点击
       addIssue() {
+        console.log(this.form.lj);
         for (let i in this.form) {
           if (this.form[i].length == 0 || !this.form[i]) {
             this.$toast('请将信息填写完整');
@@ -297,7 +298,7 @@
           detail: this.form.wtms,
           projectId: Number(this.form.xm[0]),
           longtimeDepartmentId: Number(this.form.cqzrbm[0]),
-          partId: Number(this.form.lj[0]),
+          partId: this.form.lj[0],
           processId: Number(this.form.gc[0]),
           shorttimeDepartmentId: Number(this.form.dqzrbm[0]),
           startTime: this.form.time + ":00",

src/views/qualityProblem/edit.vue

@@ -572,7 +572,7 @@
           longtimeDepartmentId: Number(this.form.cqzrbm[0]),
           shortTimeDepartmentId: Number(this.form.dqzrbm[0]),
           detail: this.form.wtms,
-          partId: Number(this.form.lj[0]),
+          partId: this.form.lj[0],
           projectId: Number(this.form.xm[0]),
           startTime: this.form.time + ":00",
           simpleFileInfos: files,

src/views/qualityProblem/list.vue

@@ -109,14 +109,32 @@
             </popup-picker>
           </group>
         </div>
-        <p class="popTitle2">责任部门</p>
+  <!--      <p class="popTitle2">责任部门</p>
         <div class="selectGroup">
           <group gutter="0" style="margin-bottom: 10px; width: 100%">
             <popup-picker show-name title="" placeholder="请选择" :data="zrbmList" v-model="filter.zrbm"
               value-text-align="left">
             </popup-picker>
           </group>
+        </div> -->
+        <!-- from zzp-->
+        <p class="popTitle2">长期责任部门</p>
+        <div class="selectGroup">
+          <group gutter="0" style="margin-bottom: 10px; width: 100%">
+            <popup-picker show-name title="" placeholder="请选择" :data="zrbmList" v-model="filter.cqzrbm"
+              value-text-align="left">
+            </popup-picker>
+          </group>
+        </div>
+        <p class="popTitle2">短期责任部门</p>
+        <div class="selectGroup">
+          <group gutter="0" style="margin-bottom: 10px; width: 100%">
+            <popup-picker show-name title="" placeholder="请选择" :data="zrbmList" v-model="filter.dqzrbm"
+              value-text-align="left">
+            </popup-picker>
+          </group>
         </div>
+        <!---->
         <p class="popTitle2">区域</p>
         <div class="selectGroup">
           <group gutter="0" style="margin-bottom: 10px; width: 100%">
@@ -125,14 +143,32 @@
             </popup-picker>
           </group>
         </div>
-        <p class="popTitle2">措施状态</p>
+   <!--     <p class="popTitle2">措施状态</p>
         <div class="selectGroup">
           <group gutter="0" style="margin-bottom: 10px; width: 100%">
             <popup-picker show-name title="" placeholder="请选择" :data="csztList" v-model="filter.cszt"
               value-text-align="left">
             </popup-picker>
           </group>
+        </div> -->
+        <!-- from zzp-->
+        <p class="popTitle2">长期措施状态</p>
+        <div class="selectGroup">
+          <group gutter="0" style="margin-bottom: 10px; width: 100%">
+            <popup-picker show-name title="" placeholder="请选择" :data="csztList" v-model="filter.cqcszt"
+              value-text-align="left">
+            </popup-picker>
+          </group>
         </div>
+        <p class="popTitle2">短期措施状态</p>
+        <div class="selectGroup">
+          <group gutter="0" style="margin-bottom: 10px; width: 100%">
+            <popup-picker show-name title="" placeholder="请选择" :data="csztList" v-model="filter.dqcszt"
+              value-text-align="left">
+            </popup-picker>
+          </group>
+        </div>
+        <!---->
         <p class="popTitle2">缺陷分类</p>
         <div class="selectGroup">
           <group gutter="0" style="margin-bottom: 10px; width: 100%">
@@ -184,8 +220,12 @@
           my: false,
           status: [],
           zrbm: [],
+          cqzrbm: [],
+          dqzrbm: [],
           qy: [],
           cszt: [],
+          cqcszt: [],
+          dqcszt: [],
           qxfl: []
         },
         statusList: [
@@ -244,7 +284,7 @@
         sessionStorage.setItem("id", this.$route.query.id)
       }
       this.api.getIssueUnFinished({
-        issueType: 0
+        id: 1
       }).then(res => {
         if (res.status == 20000) {
           this.unFinish = res.data
@@ -331,7 +371,7 @@
               _this.$toast('删除成功');
               _this.onRefresh();
             } else {
-
+               _this.$toast(res.message);
             }
           })
         }).catch(() => {
@@ -341,10 +381,14 @@
       //筛选 重置筛选
       reset() {
         this.$set(this.filter, 'cszt', [])
+        this.$set(this.filter, 'cqcszt', [])
+        this.$set(this.filter, 'dqcszt', [])
         this.$set(this.filter, 'qxfl', [])
         this.$set(this.filter, 'qy', [])
         this.$set(this.filter, 'status', [])
         this.$set(this.filter, 'zrbm', [])
+        this.$set(this.filter, 'cqzrbm', [])
+        this.$set(this.filter, 'dqzrbm', [])
         this.filter.my = false
         this.filterShow = false
         this.onRefresh()
@@ -363,13 +407,13 @@
           page: this.pageIndex,
           size: 10,
           issueStatus: this.filter.status[0],
-          longtimeDepartmentId: this.filter.zrbm[0],
-          shorttimeDepartmentId: this.filter.zrbm[0],
+          longtimeDepartmentId: this.filter.cqzrbm[0],
+          shorttimeDepartmentId: this.filter.dqzrbm[0],
           areaId: this.filter.qy[0],
           id: this.search,
           defecttype: this.filter.qxfl[0],
-          issueStatusLong: this.filter.cszt[0],
-          issueStatusShort: this.filter.cszt[0]
+          issueStatusLong: this.filter.cqcszt[0],
+          issueStatusShort: this.filter.dqcszt[0]
         }
         if (this.filter.my) {
           postData.myJob = 1