diff --git a/src/App.vue b/src/App.vue
index e5c8ca0..78e814b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -40,10 +40,6 @@ export default {
cd /usr/share/nginx/html/ggfw-dangan 移动到文件夹下
unzip ggfw-dangan.zip -d . 解压
-
-
-
-
*/
},
};
diff --git a/src/api/apparatus/index.js b/src/api/apparatus/index.js
index 5a4a703..a978e2b 100644
--- a/src/api/apparatus/index.js
+++ b/src/api/apparatus/index.js
@@ -32,6 +32,22 @@ export default {
params: query,
});
},
+ //药品特殊药品类型统计
+ tsypCount(query) {
+ return request({
+ url: "/pharmaceuticals/vRdgYpwhGxwz/tsypCount",
+ method: "GET",
+ params: query,
+ });
+ },
+ //药品剂型统计
+ jxCount(query) {
+ return request({
+ url: "/pharmaceuticals/vRdgYpwhGxwz/jxCount",
+ method: "GET",
+ params: query,
+ });
+ },
// 药品地图
vRdgYpwhGxwztareacount(query) {
return request({
diff --git a/src/main.js b/src/main.js
index 9a93cb1..9ced1fa 100644
--- a/src/main.js
+++ b/src/main.js
@@ -39,6 +39,7 @@ import router from "./router";
import directive from "./directive"; // directive
import plugins from "./plugins"; // plugins
import { download } from "@/utils/request";
+import { mygotohuaxiang } from "@/utils/request";
import "./assets/icons"; // icon
import "./permission"; // permission control
@@ -87,6 +88,7 @@ Vue.prototype.addDateRange = addDateRange;
Vue.prototype.selectDictLabel = selectDictLabel;
Vue.prototype.selectDictLabels = selectDictLabels;
Vue.prototype.download = download;
+Vue.prototype.mygotohuaxiang = mygotohuaxiang;
Vue.prototype.handleTree = handleTree;
Vue.prototype.dictList = dictList;
Vue.prototype.$api = API;
diff --git a/src/permission.js b/src/permission.js
index 936a40b..4794a00 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -33,6 +33,9 @@ router.beforeEach((to, from, next) => {
// }else{
// from.meta.keepAlive = true
// }
+ if(JSON.stringify(to.query) != '{}'){
+ store.commit('ADD_QUERY',to.query)
+ }
if (to.query.token) {
localStorage.setItem('MSSM-LIAONING__TOKEN', to.query.token)
}
diff --git a/src/store/modules/myselfPermission.js b/src/store/modules/myselfPermission.js
index dbf4023..2647745 100644
--- a/src/store/modules/myselfPermission.js
+++ b/src/store/modules/myselfPermission.js
@@ -54,9 +54,9 @@ const selfPermission = {
.then((res) => {
if (res.message == '未知的token,请重新登录！' || res.status == 40002) {
setTimeout(() => {
- // location.href = location.origin + "/login";
+ location.href = location.origin + "/login";
Message.error(res.message);
- }, 2000);
+ }, 4000);
}
let infoData = res.result;
// let query = {
diff --git a/src/store/modules/tags.js b/src/store/modules/tags.js
index da00943..313e4ba 100644
--- a/src/store/modules/tags.js
+++ b/src/store/modules/tags.js
@@ -9,12 +9,16 @@
const mapSate = {
state: {
list: [],
+ myquery:{}
},
mutations: {
ADD_ROUTER(state, view) {
state.list = view;
},
+ ADD_QUERY(state, view) {
+ state.myquery = view;
+ },
},
actions: {},
diff --git a/src/utils/request.js b/src/utils/request.js
index 2e3ead0..34014ed 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -210,5 +210,22 @@ export function download(url, params, filename, config) {
downloadLoadingInstance.close();
});
}
+export function mygotohuaxiang(row,type){
+ console.log(row,type);
+ if(type==1){
+ window.open(`${location.origin}/ggfw-jcphx/#/bgpage?code=${row.yppzwh}&name=${row.yptymc}&type=${type}`);
+
+ }
+ if(type==2){
+ window.open(`${location.origin}/ggfw-jcphx/#/bgpage?code=${row.zczh}&name=${row.cpmc}&type=${type}`);
+
+ }
+ if(type=='国产' || type=='进口普通'){
+ window.open(`${location.origin}/ggfw-jcphx/#/bgpage?code=${row.bah}&name=${row.cpmc}&type=${3}`);
+ }
+ if(type=='国产特殊' || type=='进口特殊'){
+ window.open(`${location.origin}/ggfw-jcphx/#/bgpage?code=${row.zczh}&name=${row.cpmc}&type=${3}`);
+ }
+}
export default service;
diff --git a/src/views/components/AdvancedSearch/dishi.vue b/src/views/components/AdvancedSearch/dishi.vue
new file mode 100644
index 0000000..05189ab
--- /dev/null
+++ b/src/views/components/AdvancedSearch/dishi.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/components/MapCars.vue b/src/views/components/MapCars.vue
index 80d00a7..8105fe8 100644
--- a/src/views/components/MapCars.vue
+++ b/src/views/components/MapCars.vue
@@ -94,6 +94,10 @@ export default {
mystortTow: null,
chartData: ["其他"],
chartDatatow: [10],
+ chartDataYao1: ["其他"],
+ chartDatatowYao1: [10],
+ chartDataYao2: ["其他"],
+ chartDatatowYao2: [10],
clickShow: true,
};
},
@@ -138,6 +142,10 @@ export default {
}
} else if (this.echartstitle == "药品") {
let msg1 = await this.$api.apparatus.vRdgYpwhGxwztypecount({ area: this.mystortTow });
+ //药品特殊药品类型统计
+ let msg2 = await this.$api.apparatus.tsypCount({ area: this.mystortTow });
+ //药品剂型统计
+ let msg3 = await this.$api.apparatus.jxCount({ area: this.mystortTow });
if (msg1.code == 200) {
msg1.data.forEach(item => {
if (item.ypfl && item.ypfl != 'null') {
@@ -146,6 +154,18 @@ export default {
}
})
+ msg2.data.forEach(item => {
+ if (item.ypfl && item.ypfl != 'null') {
+ this.chartDatatowYao1.push(item.count)
+ this.chartDataYao1.push(item.ypfl)
+ }
+ })
+ msg3.data.forEach(item => {
+ if (item.ypfl && item.ypfl != 'null') {
+ this.chartDatatowYao2.push(item.count)
+ this.chartDataYao2.push(item.ypfl)
+ }
+ })
this.clickShow = true
}
@@ -296,10 +316,84 @@ export default {
};
this.myChart.setOption(option, true);
- this.myChart2.setOption(option, true);
- this.myChart3.setOption(option, true);
+ if (this.echartstitle == '药品') {
+ this.Yaotongyi()
+ }
+
+ },
+ ops(chartData, chartDatatow,bzc) {
+ return {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ },
+ formatter: function (params) {
+ if (params && params.length > 0) {
+ return params[0].name + ' : ' + params[0].value;
+ }
+ return '';
+ }
+ },
+ grid: {
+ left: '5%',
+ right: '8%',
+ bottom: '10%',
+ containLabel: true
+ },
+ xAxis: [{
+ type: 'category',
+ data: chartData,
+ axisTick: {
+ alignWithLabel: true
+ },
+ axisLabel: {
+ formatter: function (value) {
+ return value.split('\n').join('\n'); // 使用换行符将标签内容分行
+ },
+ },
+ }],
+ yAxis: [{
+ type: 'value'
+ }],
+ series: [{
+ name: 'Direct',
+ type: 'bar',
+ barWidth: '20%', // 调整柱子宽度为 20%
+ data: chartDatatow,
+ label: {
+ show: true,
+ position: 'top',
+ },
+ }],
+ dataZoom: [
+ {
+ "show": true,
+ "height": 25,
+ "xAxisIndex": [
+ 0
+ ],
+ bottom: 0,
+ "start": 0,
+ "end": bzc,
+ zoomLock: true, // 锁定 dataZoom 区域大小
+ handleSize: '110%',
+ handleStyle: {
+ color: "#d3dee5",
+ },
+ textStyle: {
+ color: "#fff"
+ },
+ borderColor: "#90979c"
+ }
+ ],
+ };
+ },
+ Yaotongyi(data) {
+ this.myChart2.setOption(this.ops(this.chartDataYao1, this.chartDatatowYao1,15), true);
+ this.myChart3.setOption(this.ops(this.chartDataYao2, this.chartDatatowYao2,2), true);
},
initMap() {
this.globalMap = L.map("leafletMap", {
@@ -363,10 +457,11 @@ export default {
let that = this;
erd.listenTo(document.getElementById("echarts"), function (element) {
that.myChart.resize();
- that.myChart2.resize();
- that.myChart3.resize();
+ if (that.echartstitle == '药品') {
+ that.myChart2.resize();
+ that.myChart3.resize();
+ }
that.globalMap.fitBounds(that.mygeojson.getBounds());
-
})
},
showinitCityLayer() {
@@ -530,12 +625,14 @@ export default {
width: 45vw;
height: 60vh;
}
+
.echarts2 {
- width: 45vw;
+ width: 42vw;
height: 60vh;
}
+
.echarts3 {
- width: 45vw;
+ width: 42vw;
height: 60vh;
}
diff --git a/src/views/index.vue b/src/views/index.vue
index 555f2fc..9ee02bd 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -45,7 +45,6 @@
$router.currentRoute.meta.title }}
-
diff --git a/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue b/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue
index ebb9ae2..57d0dd8 100644
--- a/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue
+++ b/src/views/productsMsg/components/healthSon/QIxiehealthOne.vue
@@ -138,6 +138,7 @@
+
@@ -150,8 +151,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+