修改

config/dev.env.js

@@ -6,8 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API:'"http://localhost:9531"',
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API:'"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -19,8 +19,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host:'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/common/common.js

@@ -73,7 +73,36 @@ export function UpdateConfiguration(id, data) {
 export function DeleteConfiguration(id, params) {
   return request({
     url: 'com/api/deleteconfiguration?id=' + id,
+    method: 'delete',
+    params: params
+  })
+}
+
+export function getAllInspectionData(params) {
+  return request({
+    url: 'com/api/getallinspectiondata',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SaveCheckConfiguration(data) {
+  console.log('data', data)
+  return request({
+    url: '/com/api/savecheckconfiguration',
     method: 'post',
+    data: data
+  })
+}
+
+export function getAllCheckList(page, limit) {
+  const params = {
+    page: page,
+    limit: limit
+  }
+  return request({
+    url: '/com/api/getallchecklist',
+    method: 'get',
     params: params
   })
 }

src/xt_pages/qcd/checkStatistical.vue

@@ -25,28 +25,47 @@
             </template>
           </el-table-column>
         </el-table>
+
+          <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 20, 30, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
       </div>
 
       <el-dialog title="新增" :visible.sync="newDialog">
-        <el-form :model="form">
-          <el-form-item label="检查大项" :label-width="formLabelWidth">
-            <el-select v-model="form.region" placeholder="请选择检查大项">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
+        <el-form :model="form" ref="form" :rules="rules">
+          <el-form-item label="检查大项" :label-width="formLabelWidth" required prop="inspectionMajor">
+            <el-select v-model="form.inspectionMajor" placeholder="请选择活动区域" @change="changeInspectionMonior">
+                <el-option
+                  v-for="it in InspectionMajor"
+                  :key="it.project_id"
+                  :value="it.project_id"
+                  :label="it.project_name"
+                  >
+                </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="检查频次(天)" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.name"></el-input>
+          <el-form-item label="检查频次(天)" :label-width="formLabelWidth" required prop="frequency">
+            <el-input style="width:200px" v-model="form.frequency"></el-input>
           </el-form-item>
           <el-form-item label="排序" :label-width="formLabelWidth">
-            <el-input style="width:200px" v-model="form.name"></el-input>
+            <el-input style="width:200px" v-model="form.sort"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="newDialog = false">取 消</el-button>
-          <el-button type="primary" @click="newDialog = false">确 定</el-button>
+          <el-button type="primary" @click="SaveCheckConfiguration('form')">保存</el-button>
         </div>
       </el-dialog>
+
+
+
       <el-dialog title="编辑" :visible.sync="editDialog">
         <el-form :model="form">
           <el-form-item label="检查大项" :label-width="formLabelWidth">
@@ -78,6 +97,7 @@ import { GetOICData } from "@/api/qcd";
 import PieChart from "../qcd/components/BarChart";
 import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getAllInspectionData,SaveCheckConfiguration,getAllCheckList} from "@/api/common/common"
 export default {
   name: "dialysisTotal",
   data() {
@@ -114,18 +134,25 @@ export default {
       editDialog: false,
       formLabelWidth: "120px",
       form: {
-        name: "",
-        region: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: ""
-      }
+        inspectionMajor:"",
+        frequency:"",
+        sort:"",
+      },
+     InspectionMajor:[],
+     rules: {
+        inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
+        frequency: [{ required: true, message: "检查频次不能为空" }],
+      },
+      limit:10,
+      page:1,
+      total:0,
     };
   },
-  created() {},
+  created() {
+    //获取大项
+    this.getAllInspectionData(),
+    this.getAllCheckList()
+  },
   methods: {
     handleTabClick(tab, event) {
       if (this.tabActiveName == "control") {
@@ -134,6 +161,46 @@ export default {
     },
     handleEdit() {
       this.editDialog = true;
+    },
+    getAllInspectionData(){
+      getAllInspectionData().then(response=>{
+        if(response.data.state == 1){
+          var inspection =  response.data.data.inspection
+          console.log("列表",inspection)
+          this.InspectionMajor = inspection
+        }
+      })
+    },
+    //新增
+    SaveCheckConfiguration(formName){
+       this.$refs[formName].validate(valid=>{
+         if(valid){
+           SaveCheckConfiguration(this.form).then(response=>{
+              if(response.data.state === 1){
+                var configuration =  response.data.data.configuration
+                this.$message.success("保存成功")
+                this.newDialog = false
+                this.form.inspectionMajor = ""
+                this.form.frequency = ""
+                this.form.sort = ""
+              }else{
+                this.$message.error("检验检查项已存在,不能重复添加")
+              }
+           })
+         }
+       })
+    },
+    handleSizeChange(limit) {
+      this.limit = limit;
+     
+    },
+    handleCurrentChange(page) {
+      this.page = page;
+     
+    },
+    getAllCheckList(){
+      getAllCheckList(this.page,this.limit).then(response=>{
+      })
     }
   },
   components: {

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -33,7 +33,7 @@
           <el-table-column label="操作" width="180">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="handleEdit(scope.row.id)">编辑</el-button>
-              <el-button size="mini" type="danger" @click="handleDelete(scope.row.id)">删除</el-button>
+              <el-button size="mini" type="danger" @click="handleDelete(scope.row.id,scope.$index)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -317,7 +317,7 @@ export default {
         }
       })
     },
-   handleDelete(id) {
+   handleDelete(id,index) {
       this.$confirm(
         "确认要删除所选记录吗? <br>删除后,该信息将无法恢复",
         "删除提示",
@@ -328,9 +328,11 @@ export default {
           type: "warning"
         }
       ).then(() => {
-        DeleteConfiguration(id).then(response => {
+        DeleteConfiguration(id,index).then(response => {
           if (response.data.state === 1) {
-            
+           var msg =  response.data.data.msg
+           console.log("msg",msg)
+           this.configuraData.splice(index,1)
           }
         });
       });

src/xt_pages/user/patients.vue

@@ -79,8 +79,8 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue" @click="generateTxt(item)">点击</span>
-        <span>查看详情</span>
+        <span >点击</span>
+        <span style="color:blue" @click="generateTxt(item)">查看详情</span>
         <br/>
         <br/>
       </div>

src/xt_pages/workforce/appointment.vue

@@ -28,8 +28,8 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue" @click="generateTxt(item)">点击</span>
-        <span>查看详情</span>
+        <span >点击</span>
+        <span style="color:blue" @click="generateTxt(item)">查看详情</span>
         <br/>
         <br/>
       </div>
@@ -635,10 +635,10 @@
         let deviceNumber = []
 
         for (let i = 0; i < results.length; i++) {
-          if (results[i + 1] && results[i + 1]['区号'] != undefined) {
+          if (results[i + 1]) {
             zones.push(results[i + 1]['区号'])
           }
-          if (results[i + 1] && results[i + 1]['机号'] != undefined) {
+          if (results[i + 1]) {
             deviceNumber.push(results[i + 1]['机号'])
           }
 
@@ -656,6 +656,8 @@
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
+
+
         var total_zones = []
         var total_device_number = []
 
@@ -678,11 +680,11 @@
           }
         }
 
-        console.log(deviceNumber)
-        console.log(total_device_number)
+
 
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
+            console.log(deviceNumber[i])
             is_device_number = false
           }
         }

src/xt_pages/workforce/template.vue

@@ -29,8 +29,8 @@
         <br/>
         <br/>
         <span>{{getContent(item)}}</span>
-        <span style="color:blue"  @click="generateTxt(item)">点击</span>
-        <span>查看详情</span>
+        <span>点击</span>
+        <span  style="color:blue" @click="generateTxt(item)">查看详情</span>
         <br/>
         <br/>
       </div>
@@ -532,10 +532,10 @@
         let deviceNumber = []
 
         for (let i = 0; i < results.length; i++) {
-          if (results[i + 1] && results[i + 1]['区号'] != undefined) {
+          if (results[i + 1] ) {
             zones.push(results[i + 1]['区号'])
           }
-          if (results[i + 1] && results[i + 1]['机号'] != undefined) {
+          if (results[i + 1] ) {
             deviceNumber.push(results[i + 1]['机号'])
           }
 
@@ -552,6 +552,9 @@
           obj2[next] ? '' : obj2[next] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        console.log("1111111111")
+        console.log(deviceNumber)
+        console.log("1111111111")
 
         var total_zones = []
         var total_device_number = []